From 62dc49e818166ac6ecc35646e78f3dbf6fcd632a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 26 Sep 2022 22:41:43 +0900 Subject: [PATCH 001/622] Port to 1.19.2 --- .../ml/pkom/mcpitanlibarch/api/util/TextUtil.java | 12 ++++-------- fabric/src/main/resources/fabric.mod.json | 4 ++-- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 12 ++++++------ 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java index 4abbc5d7f..45dee9aba 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java @@ -4,18 +4,15 @@ public class TextUtil { public static MutableText literal(String string) { - //return Text.literal(string); - return new LiteralText(string); + return Text.literal(string); } public static MutableText translatable(String key) { - //return Text.translatable(key); - return new TranslatableText(key); + return Text.translatable(key); } public static MutableText translatable(String key, Object... args) { - //return Text.translatable(key, args); - return new TranslatableText(key, args); + return Text.translatable(key, args); } public static MutableText empty() { @@ -24,8 +21,7 @@ public static MutableText empty() { } public static MutableText keybind(String string) { - //return Text.keybind(string); - return new KeybindText(string); + return Text.keybind(string); } public static String txt2str(Text text) { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index b6234c75d..4979c63a8 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "mcpitanlibarch-common.mixins.json" ], "depends": { - "fabricloader": ">=0.14.9", - "minecraft": ">=1.18" + "fabricloader": "*", + "minecraft": ">=1.19" } } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index d222c9899..d9ee4dc6e 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -53,6 +53,6 @@ side = "BOTH" modId = "minecraft" mandatory = true # This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange = "[1.18,)" +versionRange = "[1.19,)" ordering = "NONE" side = "BOTH" diff --git a/gradle.properties b/gradle.properties index 0277f9edc..7330ee73c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.18.2 +minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.0 +mod_version=1.1.0 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=4.9.84 +architectury_version=6.2.46 # https://fabricmc.net/develop/ fabric_loader_version=0.14.9 -yarn_mappings=1.18.2+build.4 -fabric_api_version=0.58.0+1.18.2 +yarn_mappings=1.19.2+build.18 +fabric_api_version=0.62.0+1.19.2 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.18.2-40.1.80 +forge_version=1.19.2-43.1.27 From 3e63ce92824f6ac1a369a9433f0ab8c9f5df881c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 26 Sep 2022 22:45:56 +0900 Subject: [PATCH 002/622] update build.gradle --- fabric/build.gradle | 2 ++ forge/build.gradle | 2 ++ 2 files changed, 4 insertions(+) diff --git a/fabric/build.gradle b/fabric/build.gradle index efcb67ddc..f4d631232 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -31,6 +31,8 @@ processResources { filesMatching("fabric.mod.json") { expand "version": project.version } + + project.version = project.version + "-fabric" } shadowJar { diff --git a/forge/build.gradle b/forge/build.gradle index 01c52e51f..51a986ea1 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -29,6 +29,8 @@ processResources { filesMatching("META-INF/mods.toml") { expand "version": project.version } + + project.version = project.version + "-forge" } shadowJar { From 38c7a5568a63ca2988e7766d4a3dd126dfc8150b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 28 Sep 2022 00:12:34 +0900 Subject: [PATCH 003/622] Add API --- build.gradle | 3 + .../java/ml/pkom/easyapi/FileControl.java | 173 +++++++++++ .../java/ml/pkom/easyapi/config/Config.java | 273 ++++++++++++++++++ .../java/ml/pkom/easyapi/config/IConfig.java | 37 +++ .../ml/pkom/easyapi/config/JsonConfig.java | 96 ++++++ .../ml/pkom/easyapi/config/YamlConfig.java | 107 +++++++ .../ml/pkom/easyapi/config/package-info.java | 4 + .../mcpitanlibarch/api/entity/Player.java | 13 + .../api/registry/ArchRegistry.java | 25 ++ .../api/util/client/ScreenUtil.java | 20 ++ gradle.properties | 2 +- 11 files changed, 752 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/easyapi/FileControl.java create mode 100644 common/src/main/java/ml/pkom/easyapi/config/Config.java create mode 100644 common/src/main/java/ml/pkom/easyapi/config/IConfig.java create mode 100644 common/src/main/java/ml/pkom/easyapi/config/JsonConfig.java create mode 100644 common/src/main/java/ml/pkom/easyapi/config/YamlConfig.java create mode 100644 common/src/main/java/ml/pkom/easyapi/config/package-info.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java diff --git a/build.gradle b/build.gradle index fabeb0562..3573dd513 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,9 @@ subprojects { // mappings loom.officialMojangMappings() // The following line declares the yarn mappings you may select this one as well. mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" + + // https://mvnrepository.com/artifact/org.yaml/snakeyaml + implementation 'org.yaml:snakeyaml:1.8' } } diff --git a/common/src/main/java/ml/pkom/easyapi/FileControl.java b/common/src/main/java/ml/pkom/easyapi/FileControl.java new file mode 100644 index 000000000..7d19eaa04 --- /dev/null +++ b/common/src/main/java/ml/pkom/easyapi/FileControl.java @@ -0,0 +1,173 @@ +package ml.pkom.easyapi; + +import java.io.*; +import java.nio.channels.FileChannel; + +public class FileControl { + + public static boolean fileWriteContents(String pathName, String contents){ return fileWriteContents(new File(pathName), contents); } + + public static String fileReadContents(String pathName) { return fileReadContents(new File(pathName)); } + + public static boolean fileCopy(String inPathName, String outPathName) { return fileCopy(new File(inPathName), new File(outPathName)); } + + public static boolean fileExists(String pathName) { return fileExists(new File(pathName)); } + + public static long getFileTime(String pathName) { return getFileTime(new File(pathName)); } + + public static boolean setFileTime(String pathName, long time) { return setFileTime(new File(pathName), time); } + + public static boolean fileRename(String pathName, String renamedPathName) { return fileRename(new File(pathName), new File(renamedPathName)); } + + public static String basename(String pathName) { return basename(new File(pathName)); } + + public static String dirname(String pathName) { return dirname(new File(pathName)); } + + public static String dirname(String pathName, int levels) { return dirname(new File(pathName), levels); } + + /** + * ファイルにデータを書き込みます。 + * 失敗した場合falseを返します。 + * + * @param file ファイル + * @param contents データ + */ + public static boolean fileWriteContents(File file, String contents) { + try { + PrintWriter writer = new PrintWriter( + new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8"))); + writer.println(contents); + writer.close(); + return true; + } catch (IOException e) { + e.printStackTrace(); + return false; + } + } + + /** + * ファイルからデータを読み込みます。 + * 失敗した場合nullを返します。 + * + * @param file ファイル + * @return ファイルのデータ or null + */ + public static String fileReadContents(File file) { + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8")); + String line = ""; + String contents = ""; + while ((line = reader.readLine()) != null) { + contents += line + "\n"; + } + reader.close(); + return contents; + } catch (IOException e) { + e.printStackTrace(); + return null; + } + } + + /** + * ファイルからデータを読み込みます。 + * 失敗した場合falseを返します。 + * + * @param inFile コピー元ファイル + * @param outFile コピー先ファイル + */ + public static boolean fileCopy(File inFile, File outFile) { + try { + FileChannel inCh, outCh = null; + FileInputStream inStream = new FileInputStream(inFile); + FileOutputStream outStream = new FileOutputStream(outFile); + inCh = inStream.getChannel(); + outCh = outStream.getChannel(); + outCh.transferFrom(inCh, 0, inCh.size()); + inCh.close(); + outCh.close(); + inStream.close(); + outStream.close(); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * File.exists()のエイリアス関数です。 + * + * @param file 確認するファイル + */ + public static boolean fileExists(File file) { + return file.exists(); + } + + /** + * File.lastModified()のエイリアス関数です。 + * + * @param file 更新日時を取得するファイル + * @return ファイルの更新日時 + */ + public static long getFileTime(File file) { + return file.lastModified(); + } + + + /** + * File.setLastModified()のエイリアス関数です。 + * + * @param file 日時変更されるファイル + * @param time 変更後の更新日時 + */ + public static boolean setFileTime(File file, long time) { + return file.setLastModified(time); + } + + /** + * File.renameTo()のエイリアス関数です。 + * + * @param file 名前変更されるファイル + * @param renamedFile 名前変更後のファイル + */ + public static boolean fileRename(File file, File renamedFile) { + return file.renameTo(renamedFile); + } + + /** + * StringからFileへ変換します。 + * + * @param pathName ファイルのパス + * @return File + */ + public static File stringToFile(String pathName) { + return new File(pathName); + } + + public static String basename(File file) { + return file.getName(); + } + + public static String dirname(File file) { + return file.getParent(); + } + + public static String dirname(File file, int levels) { + for (int i = 0; i < levels; i++) { + file = dirfile(file); + } + return file.toString(); + } + + public static File dirfile(File file) { + return file.getParentFile(); + } + + public static File dirfile(File file, int count) { + for (int i = 0; i > count; i++) { + file = dirfile(file); + } + return file; + } + +} diff --git a/common/src/main/java/ml/pkom/easyapi/config/Config.java b/common/src/main/java/ml/pkom/easyapi/config/Config.java new file mode 100644 index 000000000..8d3e8e4ce --- /dev/null +++ b/common/src/main/java/ml/pkom/easyapi/config/Config.java @@ -0,0 +1,273 @@ +package ml.pkom.easyapi.config; + +import java.io.File; +import java.util.LinkedHashMap; +import java.util.Map; + +public class Config implements IConfig { + public Map configMap = new LinkedHashMap<>(); + + /** + * 任意ファイルを読み込み、Mapへ変換 + * + * @param file + */ + public Config(File file) { + load(file); + } + + /** + * 任意ファイルを読み込み、Mapへ変換 + * + * @param file + */ + public Config(String file) { + this(new File(file)); + } + + public Config() {}; + + /** + * Configの変換 + * + * @param config + */ + public Config(Config config) { + configMap = config.configMap; + }; + + /** + * マップのキーから値を取得 + * "."でパスを区切る + * + * @param key キー + * @return 取得した値 + */ + @SuppressWarnings("unchecked") + public Object get(String key) { + try { + key = key.replace("\\.", "$\$"); + String[] keyList = key.split("\\."); + if (keyList.length == 1) { + key = key.replace("$\$", "."); + return configMap.get(key); + } + int i = 0; + Map inMap = new LinkedHashMap<>(); + for (String k : keyList) { + i++; + k = k.replace("$\$", "."); + if (keyList.length == i) { + return inMap.get(k); + } + if (i == 1) { + inMap = (Map) configMap.get(k); + continue; + } + inMap = (Map) inMap.get(k); + } + return null; + } catch (Exception e) { + return null; + } + + } + + /** + * マップのキーから値(文字列)を取得 + * "."でパスを区切る + * + * @param key キー + * @return 取得した値 + */ + public String getString(String key) { + return (String) get(key); + } + + /** + * マップのキーから値(数値)を取得 + * "."でパスを区切る + * + * @param key キー + * @return 取得した値 + */ + public int getInt(String key) { + Object obj = get(key); + if (obj instanceof Double) { + return ((Double)obj).intValue(); + } + if (obj instanceof Short) { + return ((Short)obj).intValue(); + } + if (obj instanceof Long) { + return ((Long)obj).intValue(); + } + return (Integer) obj; + } + + public double getDouble(String key) { + return (Double) get(key); + } + + /** + * マップのキーから値(真偽値)を取得 + * "."でパスを区切る + * + * @param key キー + * @return 取得した値 + */ + public boolean getBoolean(String key) { + try { + return (Boolean) get(key); + } catch (Exception e) { + return false; + } + } + + /** + * マップのキーに値をセット + * "."でパスを区切る + * 失敗するとfalseを返す + * + * @param key キー + * @param value 値 + * @return 真偽値 + */ + @SuppressWarnings("unchecked") + public boolean set(String key, Object value) { + try { + key = key.replace("\\.", "$\$"); + String[] keyList = key.split("\\."); + if (keyList.length == 1) { + key = key.replace("$\$", "."); + configMap.put(key, value); + return true; + } + int i = 0; + Map inMap = new LinkedHashMap<>(); + for (String k : keyList) { + i++; + k = k.replace("$\$", "."); + if (keyList.length == i) { + inMap.put(k, value); + continue; + } + Map beforeInMap = inMap; + if (configMap.containsKey(k) && i == 1) { + inMap = (LinkedHashMap) configMap.get(k); + }else if (beforeInMap.containsKey(k)){ + inMap = (LinkedHashMap) beforeInMap.get(k); + }else { + inMap = new LinkedHashMap(); + } + if (i == 1) { + configMap.put(k, inMap); + continue; + } + beforeInMap.put(k, inMap); + } + return true; + } catch (Exception e) { + return false; + } + } + + /** + * マップのキーに値(文字列)をセット + * "."でパスを区切る + * 失敗するとfalseを返す + * + * @param key キー + * @param value 値 + * @return 真偽値 + */ + public boolean setString(String key, String value) { + return set(key, value); + } + + /** + * マップのキーに値(数値)をセット + * "."でパスを区切る + * 失敗するとfalseを返す + * + * @param key キー + * @param value 値 + * @return 真偽値 + */ + public boolean setInt(String key, int value) { + return set(key, value); + } + + public boolean setDouble(String key, double value) { + return set(key, value); + } + + /** + * マップのキーに値(真偽値)をセット + * "."でパスを区切る + * 失敗するとfalseを返す + * + * @param key キー + * @param value 値 + * @return 真偽値 + */ + public boolean setBoolean(String key, boolean value) { + return set(key, value); + } + + /** + * StringをFileにして読み込み、継承先で処理 + * + * @param file ファイル名 + */ + public boolean load(String file) { + return load(new File(file)); + } + + /** + * この関数は継承先で定義 + * + * @param file ファイル + */ + public boolean load(File file) { + return false; + } + + /** + * StringをFileにし、継承先で処理して保存 + * + * @param file ファイル名 + */ + public boolean save(String file) { + return save(new File(file)); + } + + /** + * ファイルを継承先で処理して保存 + * + * @param file ファイル + */ + public boolean save(File file) { + return save(file, true); + } + + /** + * ファイルを継承先で処理して保存 + * + * @param file ファイル名 + * @param pretty 整形 + */ + public boolean save(String file, boolean pretty) { + return save(new File(file), pretty); + } + + /** + * この関数は継承先で定義 + * + * @param file ファイル + * @param pretty 整形 + */ + public boolean save(File file, boolean pretty) { + return false; + } +} diff --git a/common/src/main/java/ml/pkom/easyapi/config/IConfig.java b/common/src/main/java/ml/pkom/easyapi/config/IConfig.java new file mode 100644 index 000000000..5a987aa9d --- /dev/null +++ b/common/src/main/java/ml/pkom/easyapi/config/IConfig.java @@ -0,0 +1,37 @@ +package ml.pkom.easyapi.config; + +import java.io.File; +import java.util.LinkedHashMap; +import java.util.Map; + +public interface IConfig { + Map configMap = new LinkedHashMap<>(); + + Object get(String key); + + String getString(String key); + + int getInt(String key); + + boolean getBoolean(String key); + + boolean set(String key, Object value); + + boolean setString(String key, String value); + + boolean setInt(String key, int value); + + boolean setBoolean(String key, boolean value); + + boolean load(String file); + + boolean load(File file); + + boolean save(String file); + + boolean save(File file); + + boolean save(String file, boolean pretty); + + boolean save(File file, boolean pretty); +} diff --git a/common/src/main/java/ml/pkom/easyapi/config/JsonConfig.java b/common/src/main/java/ml/pkom/easyapi/config/JsonConfig.java new file mode 100644 index 000000000..46583af5d --- /dev/null +++ b/common/src/main/java/ml/pkom/easyapi/config/JsonConfig.java @@ -0,0 +1,96 @@ +package ml.pkom.easyapi.config; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import ml.pkom.easyapi.FileControl; + +import java.io.File; +import java.lang.reflect.Type; +import java.util.LinkedHashMap; + +public class JsonConfig extends Config { + /** + * + * @param file ファイル + */ + public JsonConfig(File file) { + super(file); + } + + /** + * + * @param file ファイル名 + */ + public JsonConfig(String file) { + super(file); + } + + public JsonConfig() { + super(); + } + + /** + * Config→JsonConfigへ変換 + * + * @param config Config + */ + public JsonConfig(Config config) { + super(config); + } + + /** + * Jsonファイルを読み込んでMapへ変換 + * + * @param file ファイル + * @return 成功→true / 失敗→false + */ + public boolean load(File file) { + try { + String configData = FileControl.fileReadContents(file); + Gson gson = new Gson(); + Type jsonMap = new TypeToken>() { + }.getType(); + configMap = gson.fromJson(configData, jsonMap); + return true; + } catch (Exception e) { + return false; + } + } + + /** + * MapをJsonへ変換し、Jsonファイルとして保存 + * + * @param file ファイル + * @param pretty 整形 + * @return 成功→true / 失敗→false + */ + public boolean save(File file, boolean pretty) { + try { + String configData = this.toJson(pretty); + FileControl.fileWriteContents(file, configData); + return true; + } catch (Exception e) { + return false; + } + } + + /** + * MapをJsonへ変換 失敗した場合はnullを返す + * + * @param pretty 整形 + * @return Jsonの文字列 + */ + public String toJson(boolean pretty) { + try { + Gson gson = new Gson(); + if (pretty) { + gson = new GsonBuilder().setPrettyPrinting().create(); + } + String configData = gson.toJson(configMap); + return configData; + } catch (Exception e) { + return null; + } + } +} diff --git a/common/src/main/java/ml/pkom/easyapi/config/YamlConfig.java b/common/src/main/java/ml/pkom/easyapi/config/YamlConfig.java new file mode 100644 index 000000000..ea6adc344 --- /dev/null +++ b/common/src/main/java/ml/pkom/easyapi/config/YamlConfig.java @@ -0,0 +1,107 @@ +package ml.pkom.easyapi.config; + +import ml.pkom.easyapi.FileControl; +import org.yaml.snakeyaml.DumperOptions; +import org.yaml.snakeyaml.Yaml; + +import java.io.File; +import java.util.Map; + +public class YamlConfig extends Config { + + /** + * + * @param file ファイル + */ + public YamlConfig(File file) { + super(file); + } + + /** + * + * @param file ファイル名 + */ + public YamlConfig(String file) { + super(file); + } + + public YamlConfig() { + super(); + } + + /** + * Config→JsonConfigへ変換 + * + * @param config Config + */ + public YamlConfig(Config config) { + super(config); + } + + private DumperOptions.FlowStyle style = DumperOptions.FlowStyle.BLOCK; + + /** + * 出力するYamlのスタイルの設定 + * + * @param flowStyle FlowStyle + */ + public void setStyle(DumperOptions.FlowStyle flowStyle) { + style = flowStyle; + } + + /** + * Yamlファイルを読み込んでMapへ変換 + * + * @param file ファイル + * @return 成功→true / 失敗→false + */ + @SuppressWarnings("unchecked") + public boolean load(File file) { + try { + String configData = FileControl.fileReadContents(file); + Yaml yaml = new Yaml(); + configMap = (Map) yaml.load(configData); + return true; + } catch (Exception e) { + return false; + } + } + + /** + * MapをYamlへ変換し、Yamlファイルとして保存 + * + * @param file ファイル + * @param pretty 整形 + * @return 成功→true / 失敗→false + */ + public boolean save(File file, boolean pretty) { + try { + String configData = this.toYaml(pretty); + FileControl.fileWriteContents(file, configData); + return true; + } catch (Exception e) { + return false; + } + } + + /** + * MapをYamlへ変換 失敗した場合はnullを返す + * + * @param pretty 整形 + * @return Yamlの文字列 + */ + public String toYaml(boolean pretty) { + try { + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(style); + if (pretty) { + options.setPrettyFlow(true); + } + Yaml yaml = new Yaml(options); + String configData = yaml.dump(configMap); + return configData; + } catch (Exception e) { + return null; + } + } +} diff --git a/common/src/main/java/ml/pkom/easyapi/config/package-info.java b/common/src/main/java/ml/pkom/easyapi/config/package-info.java new file mode 100644 index 000000000..8bb53e1d3 --- /dev/null +++ b/common/src/main/java/ml/pkom/easyapi/config/package-info.java @@ -0,0 +1,4 @@ +/** + * Config関連のクラスが入っているパッケージ + */ +package ml.pkom.easyapi.config; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index 6f1a375f3..17b5f8a3f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.ScreenHandler; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -125,4 +126,16 @@ public PlayerAbilities getAbilities() { public boolean isCreative() { return getAbilities().creativeMode; } + + public World getWorld() { + return getEntity().world; + } + + public ScreenHandler getCurrentScreenHandler() { + return getEntity().currentScreenHandler; + } + + public boolean isSneaking() { + return getEntity().isSneaking(); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 04fbbc423..483a5e571 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -5,7 +5,10 @@ import dev.architectury.registry.registries.Registries; import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.EntityType; import net.minecraft.item.Item; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -17,12 +20,18 @@ public class ArchRegistry { public Registrar ITEMS; public Registrar BLOCKS; + public Registrar> SCREEN_HANDLER_TYPE; + public Registrar> BLOCK_ENTITY_TYPE; + public Registrar> ENTITY_TYPE; public ArchRegistry(String MOD_ID) { REGISTRIES = Suppliers.memoize(() -> Registries.get(MOD_ID)); ITEMS = REGISTRIES.get().get(Registry.ITEM_KEY); BLOCKS = REGISTRIES.get().get(Registry.BLOCK_KEY); + SCREEN_HANDLER_TYPE = REGISTRIES.get().get(Registry.MENU_KEY); + BLOCK_ENTITY_TYPE = REGISTRIES.get().get(Registry.BLOCK_ENTITY_TYPE_KEY); + ENTITY_TYPE = REGISTRIES.get().get(Registry.ENTITY_TYPE_KEY); } @@ -37,4 +46,20 @@ public RegistrySupplier registerItem(Identifier id, Supplier supplie public RegistrySupplier registerBlock(Identifier id, Supplier supplier) { return BLOCKS.register(id, supplier); } + + public RegistrySupplier> registerScreenHandlerType(Identifier id, Supplier> supplier) { + return SCREEN_HANDLER_TYPE.register(id, supplier); + } + + public RegistrySupplier> registerMenu(Identifier id, Supplier> supplier) { + return registerScreenHandlerType(id, supplier); + } + + public RegistrySupplier> registerBlockEntityType(Identifier id, Supplier> supplier) { + return BLOCK_ENTITY_TYPE.register(id, supplier); + } + + public RegistrySupplier> registerEntity(Identifier id, Supplier> supplier) { + return ENTITY_TYPE.register(id, supplier); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java new file mode 100644 index 000000000..be9ddcc98 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.util.client; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.util.Identifier; + +public class ScreenUtil { + public static void setBackground(Identifier GUI, float f, float g, float h, float i) { + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderColor(f, g, h, i); + RenderSystem.setShaderTexture(0, GUI); + + // GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + // MinecraftClient.getInstance().getTextureManager().bindTexture(GUI); + } + + public static void setBackground(Identifier GUI) { + setBackground(GUI, 1.0F, 1.0F, 1.0F, 1.0F); + } +} diff --git a/gradle.properties b/gradle.properties index 7330ee73c..8e4d6054f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.0 +mod_version=1.0.1-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From d95316a12d050498c0f72109bb02980a4dce20c4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 28 Sep 2022 01:18:54 +0900 Subject: [PATCH 004/622] add badge add icon --- fabric/src/main/resources/fabric.mod.json | 1 + 1 file changed, 1 insertion(+) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 4979c63a8..5f3a50e91 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -14,6 +14,7 @@ }, "license": "MIT", "icon": "icon.png", + "badges": ["library"], "environment": "*", "entrypoints": { "main": [ From f25533c19c4b02af86b151ce6cd7a7e6eb06787a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 28 Sep 2022 01:25:16 +0900 Subject: [PATCH 005/622] add badge add icon --- common/src/main/resources/icon.png | Bin 0 -> 31357 bytes fabric/src/main/resources/fabric.mod.json | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 common/src/main/resources/icon.png diff --git a/common/src/main/resources/icon.png b/common/src/main/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ee30da76cfb8f1e8b1d336ca50b7011afa1ac8 GIT binary patch literal 31357 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

7KoUGA9beKtdXX^n>aq2ip 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 literal 0 HcmV?d00001 diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5f3a50e91..69a8c0981 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -14,13 +14,17 @@ }, "license": "MIT", "icon": "icon.png", - "badges": ["library"], "environment": "*", "entrypoints": { "main": [ "ml.pkom.mcpitanlibarch.fabric.MCPitanLibarchFabric" ] }, + "custom": { + "modmenu": { + "badges": ["library"] + } + }, "mixins": [ "mcpitanlibarch.mixins.json", "mcpitanlibarch-common.mixins.json" From 7b24da68cfdb490cc7d1150405204cd864191968 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 28 Sep 2022 18:31:22 +0900 Subject: [PATCH 006/622] add API --- .../mcpitanlibarch/api/block/ExtendBlock.java | 24 +++++++++++++++++++ .../api/event/BlockScheduledTickEvent.java | 20 ++++++++++++++++ .../mcpitanlibarch/api/util/MathUtil.java | 14 +++++++++++ 3 files changed, 58 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockScheduledTickEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java new file mode 100644 index 000000000..affce1a2f --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -0,0 +1,24 @@ +package ml.pkom.mcpitanlibarch.api.block; + +import ml.pkom.mcpitanlibarch.api.event.BlockScheduledTickEvent; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; + +public class ExtendBlock extends Block { + public ExtendBlock(Settings settings) { + super(settings); + } + + public void scheduledTick(BlockScheduledTickEvent event) { + super.scheduledTick(event.state, event.world, event.pos, event.random); + } + + @Override + @Deprecated + public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { + scheduledTick(new BlockScheduledTickEvent(state, world, pos, random)); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockScheduledTickEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockScheduledTickEvent.java new file mode 100644 index 000000000..5289c9fa7 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockScheduledTickEvent.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import net.minecraft.block.BlockState; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; + +public class BlockScheduledTickEvent { + public BlockState state; + public ServerWorld world; + public BlockPos pos; + public Random random; + + public BlockScheduledTickEvent(BlockState state, ServerWorld world, BlockPos pos, Random random) { + this.state = state; + this.world = world; + this.pos = pos; + this.random = random; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java new file mode 100644 index 000000000..b9cbb40f6 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java @@ -0,0 +1,14 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.util.math.random.Random; + +public class MathUtil { + + public static Random createRandom(long seed) { + return Random.create(seed); + } + + public static Random createRandom() { + return Random.create(); + } +} From 84ea074cb591aa422fbd7ef1121879ecdec20293 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 28 Sep 2022 18:31:39 +0900 Subject: [PATCH 007/622] update info --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8e4d6054f..2be931ef9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.1-1.19 +mod_version=1.0.2-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 25e6c717fc1dc1f831099b896a8f0f7a1163a047 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 28 Sep 2022 23:11:04 +0900 Subject: [PATCH 008/622] add API --- .../mcpitanlibarch/api/block/ExtendBlock.java | 47 +++++++++++++++++++ .../api/event/BlockUseEvent.java | 27 +++++++++++ .../api/event/ScreenHandlerCreateEvent.java | 27 +++++++++++ 3 files changed, 101 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockUseEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ScreenHandlerCreateEvent.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index affce1a2f..0b082e2f5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -1,11 +1,25 @@ package ml.pkom.mcpitanlibarch.api.block; import ml.pkom.mcpitanlibarch.api.event.BlockScheduledTickEvent; +import ml.pkom.mcpitanlibarch.api.event.BlockUseEvent; +import ml.pkom.mcpitanlibarch.api.event.ScreenHandlerCreateEvent; +import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; +import net.minecraft.world.World; + +import javax.annotation.Nullable; public class ExtendBlock extends Block { public ExtendBlock(Settings settings) { @@ -21,4 +35,37 @@ public void scheduledTick(BlockScheduledTickEvent event) { public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { scheduledTick(new BlockScheduledTickEvent(state, world, pos, random)); } + + @Override + @Deprecated + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + return onRightClick(new BlockUseEvent(state, world, pos, player, hand, hit)); + } + + /** + * block right click event + * @param event ActionResultType + * @return BlockUseEvent + */ + public ActionResult onRightClick(BlockUseEvent event) { + return super.onUse(event.state, event.world, event.pos, event.player.getPlayerEntity(), event.hand, event.hit); + } + + @Nullable + @Override + public NamedScreenHandlerFactory createScreenHandlerFactory(BlockState state, World world, BlockPos pos) { + return new SimpleNamedScreenHandlerFactory((syncId, inventory, player) -> + createScreenHandler(new ScreenHandlerCreateEvent(state, world, pos, syncId, inventory, player)), getScreenTitle() + ); + } + + @Nullable + public ScreenHandler createScreenHandler(ScreenHandlerCreateEvent event) { + return null; + } + + @Nullable + public Text getScreenTitle() { + return TextUtil.literal(""); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockUseEvent.java new file mode 100644 index 000000000..3e385ed97 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockUseEvent.java @@ -0,0 +1,27 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockUseEvent { + public BlockState state; + public World world; + public BlockPos pos; + public Player player; + public Hand hand; + public BlockHitResult hit; + + public BlockUseEvent(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + this.state = state; + this.world = world; + this.pos = pos; + this.player = new Player(player); + this.hand = hand; + this.hit = hit; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ScreenHandlerCreateEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ScreenHandlerCreateEvent.java new file mode 100644 index 000000000..571961e9c --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ScreenHandlerCreateEvent.java @@ -0,0 +1,27 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class ScreenHandlerCreateEvent { + + public BlockState state; + public World world; + public BlockPos pos; + public int syncId; + public PlayerInventory inventory; + public Player player; + + public ScreenHandlerCreateEvent(BlockState state, World world, BlockPos pos, int syncId, PlayerInventory inventory, PlayerEntity player) { + this.state = state; + this.world = world; + this.pos = pos; + this.syncId = syncId; + this.inventory = inventory; + this.player = new Player(player); + } +} From df46011fdd5aad1afd6f786e998fb191310c3bfb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 28 Sep 2022 23:28:30 +0900 Subject: [PATCH 009/622] add API --- .../mcpitanlibarch/api/block/ExtendBlock.java | 6 +-- .../{ => block}/BlockScheduledTickEvent.java | 5 +- .../api/event/{ => block}/BlockUseEvent.java | 5 +- .../{ => block}/ScreenHandlerCreateEvent.java | 5 +- .../event/{ => block}/TileCreateEvent.java | 3 +- .../api/event/item/ItemUseEvent.java | 20 ++++++++ .../api/event/item/ItemUseOnBlockEvent.java | 41 ++++++++++++++++ .../mcpitanlibarch/api/item/ExtendItem.java | 49 +++++++++++++++++++ .../mixin/ItemUsageContextMixin.java | 12 +++++ .../mcpitanlibarch-common.mixins.json | 3 +- 10 files changed, 138 insertions(+), 11 deletions(-) rename common/src/main/java/ml/pkom/mcpitanlibarch/api/event/{ => block}/BlockScheduledTickEvent.java (76%) rename common/src/main/java/ml/pkom/mcpitanlibarch/api/event/{ => block}/BlockUseEvent.java (83%) rename common/src/main/java/ml/pkom/mcpitanlibarch/api/event/{ => block}/ScreenHandlerCreateEvent.java (83%) rename common/src/main/java/ml/pkom/mcpitanlibarch/api/event/{ => block}/TileCreateEvent.java (93%) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemUsageContextMixin.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index 0b082e2f5..36e8fe18b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -1,8 +1,8 @@ package ml.pkom.mcpitanlibarch.api.block; -import ml.pkom.mcpitanlibarch.api.event.BlockScheduledTickEvent; -import ml.pkom.mcpitanlibarch.api.event.BlockUseEvent; -import ml.pkom.mcpitanlibarch.api.event.ScreenHandlerCreateEvent; +import ml.pkom.mcpitanlibarch.api.event.block.BlockScheduledTickEvent; +import ml.pkom.mcpitanlibarch.api.event.block.BlockUseEvent; +import ml.pkom.mcpitanlibarch.api.event.block.ScreenHandlerCreateEvent; import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockScheduledTickEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java similarity index 76% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockScheduledTickEvent.java rename to common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java index 5289c9fa7..b2ae4cc63 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockScheduledTickEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java @@ -1,11 +1,12 @@ -package ml.pkom.mcpitanlibarch.api.event; +package ml.pkom.mcpitanlibarch.api.event.block; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; -public class BlockScheduledTickEvent { +public class BlockScheduledTickEvent extends BaseEvent { public BlockState state; public ServerWorld world; public BlockPos pos; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java similarity index 83% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockUseEvent.java rename to common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java index 3e385ed97..71b78bc9c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BlockUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java @@ -1,6 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event; +package ml.pkom.mcpitanlibarch.api.event.block; import ml.pkom.mcpitanlibarch.api.entity.Player; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Hand; @@ -8,7 +9,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class BlockUseEvent { +public class BlockUseEvent extends BaseEvent { public BlockState state; public World world; public BlockPos pos; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ScreenHandlerCreateEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/ScreenHandlerCreateEvent.java similarity index 83% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ScreenHandlerCreateEvent.java rename to common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/ScreenHandlerCreateEvent.java index 571961e9c..ec129d2a2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ScreenHandlerCreateEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/ScreenHandlerCreateEvent.java @@ -1,13 +1,14 @@ -package ml.pkom.mcpitanlibarch.api.event; +package ml.pkom.mcpitanlibarch.api.event.block; import ml.pkom.mcpitanlibarch.api.entity.Player; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class ScreenHandlerCreateEvent { +public class ScreenHandlerCreateEvent extends BaseEvent { public BlockState state; public World world; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/TileCreateEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/TileCreateEvent.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/TileCreateEvent.java rename to common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/TileCreateEvent.java index 56bc84c61..1e96b73e0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/TileCreateEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/TileCreateEvent.java @@ -1,5 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event; +package ml.pkom.mcpitanlibarch.api.event.block; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java new file mode 100644 index 000000000..b99647d33 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.event.item; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.Hand; +import net.minecraft.world.World; + +public class ItemUseEvent extends BaseEvent { + + public World world; + public Player user; + public Hand hand; + + public ItemUseEvent(World world, PlayerEntity user, Hand hand) { + this.world = world; + this.user = new Player(user); + this.hand = hand; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java new file mode 100644 index 000000000..590a61877 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java @@ -0,0 +1,41 @@ +package ml.pkom.mcpitanlibarch.api.event.item; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.world.World; + +import javax.annotation.Nullable; + +public class ItemUseOnBlockEvent extends BaseEvent { + public Player player; + public Hand hand; + public BlockHitResult hit; + public ItemStack stack; + public World world; + + public ItemUseOnBlockEvent(PlayerEntity player, Hand hand, BlockHitResult hit) { + this(player.world, player, hand, player.getStackInHand(hand), hit); + } + + public ItemUseOnBlockEvent(World world, @Nullable PlayerEntity player, Hand hand, ItemStack stack, BlockHitResult hit) { + if (player != null) + this.player = new Player(player); + this.hand = hand; + this.hit = hit; + this.stack = stack; + this.world = world; + } + + public ItemUsageContext toIUC() { + return new ItemUsageContext(player.getPlayerEntity(), hand, hit); + } + + public boolean isClient() { + return world.isClient(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java new file mode 100644 index 000000000..a0fe64754 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java @@ -0,0 +1,49 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; +import ml.pkom.mcpitanlibarch.api.event.item.ItemUseOnBlockEvent; +import ml.pkom.mcpitanlibarch.mixin.ItemUsageContextMixin; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; + +public class ExtendItem extends Item { + public ExtendItem(Settings settings) { + super(settings); + } + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + return onRightClick(new ItemUseEvent(world, user, hand)); + } + + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; + return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); + } + + /** + * item right click event + * + * @param event ItemUseEvent + * @return ActionResultType + */ + public TypedActionResult onRightClick(ItemUseEvent event) { + return super.use(event.world, event.user.getPlayerEntity(), event.hand); + } + + /** + * item right click event on block + * @param event ItemUseOnBlockEvent + * @return ActionResultType + */ + public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { + return super.useOnBlock(event.toIUC()); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemUsageContextMixin.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemUsageContextMixin.java new file mode 100644 index 000000000..118f8be36 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemUsageContextMixin.java @@ -0,0 +1,12 @@ +package ml.pkom.mcpitanlibarch.mixin; + +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.hit.BlockHitResult; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(ItemUsageContext.class) +public interface ItemUsageContextMixin { + @Accessor + public BlockHitResult getHit(); +} \ No newline at end of file diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlibarch-common.mixins.json index 72d6fe3ab..f9672133e 100644 --- a/common/src/main/resources/mcpitanlibarch-common.mixins.json +++ b/common/src/main/resources/mcpitanlibarch-common.mixins.json @@ -1,9 +1,10 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.mixin.forge", + "package": "ml.pkom.mcpitanlibarch.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ + "ItemUsageContextMixin" ], "client": [ ], From 7552744ceb5558ea9aa0febdb6c2ab474132a83e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 29 Sep 2022 23:14:24 +0900 Subject: [PATCH 010/622] add API --- .../java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index 85b43c07c..5d735decf 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -22,4 +22,12 @@ public static AbstractBlock.Settings breakByTool(AbstractBlock.Settings settings return settings; } + + public static AbstractBlock.Settings dropsNothing(AbstractBlock.Settings settings) { + return settings.dropsNothing(); + } + + public static AbstractBlock.Settings requiresTool(AbstractBlock.Settings settings) { + return settings.requiresTool(); + } } From 4f22f7bb74d8f1f573a3219f74bded033e78c7b6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 29 Sep 2022 23:31:19 +0900 Subject: [PATCH 011/622] info --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2be931ef9..11ef07395 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.2-1.19 +mod_version=1.0.3-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 8e48f85f904fa1e18d2028db8d30661f3260f2fe Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 30 Sep 2022 17:16:34 +0900 Subject: [PATCH 012/622] mixin compatibilityLevel JAVA_8 --- common/src/main/resources/mcpitanlibarch-common.mixins.json | 2 +- fabric/src/main/resources/mcpitanlibarch.mixins.json | 2 +- forge/src/main/resources/mcpitanlibarch.mixins.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlibarch-common.mixins.json index f9672133e..cad714586 100644 --- a/common/src/main/resources/mcpitanlibarch-common.mixins.json +++ b/common/src/main/resources/mcpitanlibarch-common.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "ml.pkom.mcpitanlibarch.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_8", "mixins": [ "ItemUsageContextMixin" ], diff --git a/fabric/src/main/resources/mcpitanlibarch.mixins.json b/fabric/src/main/resources/mcpitanlibarch.mixins.json index 4be53d8ed..5ff32912f 100644 --- a/fabric/src/main/resources/mcpitanlibarch.mixins.json +++ b/fabric/src/main/resources/mcpitanlibarch.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "ml.pkom.mcpitanlibarch.mixin.fabric", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_8", "mixins": [ ], "client": [ diff --git a/forge/src/main/resources/mcpitanlibarch.mixins.json b/forge/src/main/resources/mcpitanlibarch.mixins.json index 72d6fe3ab..e3ae4ab50 100644 --- a/forge/src/main/resources/mcpitanlibarch.mixins.json +++ b/forge/src/main/resources/mcpitanlibarch.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "ml.pkom.mcpitanlibarch.mixin.forge", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_8", "mixins": [ ], "client": [ From 21825cd8ccb93d778d0b4d7de8db30b58554ac11 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 30 Sep 2022 17:19:11 +0900 Subject: [PATCH 013/622] modinfo --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 11ef07395..db57c8f0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.3-1.19 +mod_version=1.0.4-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From c25dadf09cb5508f7b5abcdedee94607b9bef04e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 30 Sep 2022 22:47:11 +0900 Subject: [PATCH 014/622] Add API --- .../api/event/registry/RegistryEvent.java | 23 +++++++++++ .../api/registry/ArchRegistry.java | 39 ++++++++++++------- 2 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java new file mode 100644 index 000000000..2a6c3628b --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java @@ -0,0 +1,23 @@ +package ml.pkom.mcpitanlibarch.api.event.registry; + +import dev.architectury.registry.registries.RegistrySupplier; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; + +import javax.annotation.Nullable; + +public class RegistryEvent extends BaseEvent { + public RegistrySupplier supplier; + + public RegistryEvent(RegistrySupplier supplier) { + this.supplier = supplier; + } + + public T get() { + return supplier.get(); + } + + @Nullable + public T getOrNull() { + return supplier.getOrNull(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 483a5e571..3091ef6ca 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -3,12 +3,14 @@ import com.google.common.base.Suppliers; import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.Registries; -import dev.architectury.registry.registries.RegistrySupplier; +import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -23,6 +25,8 @@ public class ArchRegistry { public Registrar> SCREEN_HANDLER_TYPE; public Registrar> BLOCK_ENTITY_TYPE; public Registrar> ENTITY_TYPE; + public Registrar SOUND_EVENT; + public Registrar FLUID; public ArchRegistry(String MOD_ID) { REGISTRIES = Suppliers.memoize(() -> Registries.get(MOD_ID)); @@ -32,34 +36,43 @@ public ArchRegistry(String MOD_ID) { SCREEN_HANDLER_TYPE = REGISTRIES.get().get(Registry.MENU_KEY); BLOCK_ENTITY_TYPE = REGISTRIES.get().get(Registry.BLOCK_ENTITY_TYPE_KEY); ENTITY_TYPE = REGISTRIES.get().get(Registry.ENTITY_TYPE_KEY); - + SOUND_EVENT = REGISTRIES.get().get(Registry.SOUND_EVENT_KEY); + FLUID = REGISTRIES.get().get(Registry.FLUID_KEY); } public static ArchRegistry createRegistry(String MOD_ID) { return new ArchRegistry(MOD_ID); } - public RegistrySupplier registerItem(Identifier id, Supplier supplier) { - return ITEMS.register(id, supplier); + public RegistryEvent registerItem(Identifier id, Supplier supplier) { + return new RegistryEvent<>(ITEMS.register(id, supplier)); } - public RegistrySupplier registerBlock(Identifier id, Supplier supplier) { - return BLOCKS.register(id, supplier); + public RegistryEvent registerBlock(Identifier id, Supplier supplier) { + return new RegistryEvent<>(BLOCKS.register(id, supplier)); } - public RegistrySupplier> registerScreenHandlerType(Identifier id, Supplier> supplier) { - return SCREEN_HANDLER_TYPE.register(id, supplier); + public RegistryEvent> registerScreenHandlerType(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(SCREEN_HANDLER_TYPE.register(id, supplier)); } - public RegistrySupplier> registerMenu(Identifier id, Supplier> supplier) { + public RegistryEvent> registerMenu(Identifier id, Supplier> supplier) { return registerScreenHandlerType(id, supplier); } - public RegistrySupplier> registerBlockEntityType(Identifier id, Supplier> supplier) { - return BLOCK_ENTITY_TYPE.register(id, supplier); + public RegistryEvent> registerBlockEntityType(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(BLOCK_ENTITY_TYPE.register(id, supplier)); + } + + public RegistryEvent> registerEntity(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(ENTITY_TYPE.register(id, supplier)); + } + + public RegistryEvent registerSoundEvent(Identifier id, Supplier supplier) { + return new RegistryEvent<>(SOUND_EVENT.register(id, supplier)); } - public RegistrySupplier> registerEntity(Identifier id, Supplier> supplier) { - return ENTITY_TYPE.register(id, supplier); + public RegistryEvent registerFluid(Identifier id, Supplier supplier) { + return new RegistryEvent<>(FLUID.register(id, supplier)); } } From 43be65c3f1298fe6c09900a47593dccb3db32e7c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 30 Sep 2022 22:47:37 +0900 Subject: [PATCH 015/622] version info --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index db57c8f0c..c63e8c844 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.4-1.19 +mod_version=1.0.5-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 35f9fd5d4fbfca01ef27fa873b058b28f0cdfc4e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Oct 2022 11:31:05 +0900 Subject: [PATCH 016/622] Add API Add Example --- .../pkom/mcpitanlibarch/MCPitanLibarch.java | 7 ++- .../mcpitanlibarch/api/util/PlatformUtil.java | 54 +++++++++++++++++++ .../pkom/mcpitanlibarch/test/ExampleMod.java | 37 +++++++++++++ 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index 4ba33fd9f..2c1120b00 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -1,9 +1,14 @@ package ml.pkom.mcpitanlibarch; +import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; +import ml.pkom.mcpitanlibarch.test.ExampleMod; + public class MCPitanLibarch { public static final String MOD_ID = "mcpitanlibarch"; public static void init() { - + if (PlatformUtil.isDevelopmentEnvironment()) { + ExampleMod.init(); + } } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java new file mode 100644 index 000000000..913301aa1 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java @@ -0,0 +1,54 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import me.shedaniel.architectury.platform.Platform; +import me.shedaniel.architectury.utils.Env; +import net.fabricmc.api.EnvType; + +import java.nio.file.Path; +import java.util.Collection; + +public class PlatformUtil { + public static boolean isDevelopmentEnvironment() { + return Platform.isDevelopmentEnvironment(); + } + + public static boolean isFabric() { + return Platform.isFabric(); + } + + public static boolean isForge() { + return Platform.isForge(); + } + + public static boolean isModLoaded(String id) { + return Platform.isModLoaded(id); + } + + public static boolean isClient() { + return Platform.getEnvironment() == Env.CLIENT; + } + + public static boolean isServer() { + return Platform.getEnvironment() == Env.SERVER; + } + + public static Path getConfigFolder() { + return Platform.getConfigFolder(); + } + + public static Path getGameFolder() { + return Platform.getGameFolder(); + } + + public static Path getModsFolder() { + return Platform.getModsFolder(); + } + + public static Collection getModIds() { + return Platform.getModIds(); + } + + public static EnvType getEnv() { + return Platform.getEnv(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java new file mode 100644 index 000000000..588b13a35 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -0,0 +1,37 @@ +package ml.pkom.mcpitanlibarch.test; + +import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; +import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.Material; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.util.Identifier; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class ExampleMod { + public static final String MOD_ID = "examplemod"; + public static final String MOD_NAME = "ExampleMod"; + + public static Logger LOGGER = LogManager.getLogger(); + public static void log(Level level, String message){ + LOGGER.log(level, "[" + MOD_NAME + "] " + message); + } + + public static Identifier id(String id) { + return new Identifier(MOD_ID, id); + } + + public static ArchRegistry registry = ArchRegistry.createRegistry(MOD_ID); + + public static void init() { + registry.registerItem(id("example_item"), () -> new Item(new Item.Settings().group(ItemGroup.MISC))); + RegistryEvent EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new Block(AbstractBlock.Settings.of(Material.STONE))); + registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); + registry.allRegister(); + } +} From c5845c73bf45dd4e6439213a6d06b9bee4e0e5da Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Oct 2022 11:40:17 +0900 Subject: [PATCH 017/622] Add API --- .../ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java | 4 ++++ .../java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 3091ef6ca..3b198d5cd 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -75,4 +75,8 @@ public RegistryEvent registerSoundEvent(Identifier id, Supplier registerFluid(Identifier id, Supplier supplier) { return new RegistryEvent<>(FLUID.register(id, supplier)); } + + public void allRegister() { + // 1.16 Register + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java index 913301aa1..14bf63556 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java @@ -1,7 +1,7 @@ package ml.pkom.mcpitanlibarch.api.util; -import me.shedaniel.architectury.platform.Platform; -import me.shedaniel.architectury.utils.Env; +import dev.architectury.platform.Platform; +import dev.architectury.utils.Env; import net.fabricmc.api.EnvType; import java.nio.file.Path; From 3f8d12f114d987cc9d31ee53750d7bd402bde0a4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Oct 2022 13:18:29 +0900 Subject: [PATCH 018/622] Add API --- .../api/client/SimpleHandledScreen.java | 24 +++++++++++++++++++ .../mcpitanlibarch/api/entity/Player.java | 8 +++++++ .../api/util/client/ScreenUtil.java | 3 +++ .../forge/MCPitanLibarchForge.java | 5 ++++ 4 files changed, 40 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java new file mode 100644 index 000000000..bd02fde81 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -0,0 +1,24 @@ +package ml.pkom.mcpitanlibarch.api.client; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; + +@Environment(EnvType.CLIENT) +public abstract class SimpleHandledScreen extends HandledScreen { + public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + @Override + protected T addDrawableChild(T drawableElement) { + return super.addDrawableChild(drawableElement); + // addButton + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index 17b5f8a3f..e6e199ed6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -104,6 +104,10 @@ public void insertStack(int slot, ItemStack stack) { getInv().insertStack(slot, stack); } + public void offerOrDrop(ItemStack itemStack) { + getInv().offerOrDrop(itemStack); + } + public void giveStack(ItemStack stack) { getEntity().giveItemStack(stack); } @@ -138,4 +142,8 @@ public ScreenHandler getCurrentScreenHandler() { public boolean isSneaking() { return getEntity().isSneaking(); } + + public ItemStack getCursorStack() { + return getCurrentScreenHandler().getCursorStack(); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index be9ddcc98..ef22862d1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -1,9 +1,12 @@ package ml.pkom.mcpitanlibarch.api.util.client; import com.mojang.blaze3d.systems.RenderSystem; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.client.render.GameRenderer; import net.minecraft.util.Identifier; +@Environment(EnvType.CLIENT) public class ScreenUtil { public static void setBackground(Identifier GUI, float f, float g, float h, float i) { RenderSystem.setShader(GameRenderer::getPositionTexShader); diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java index 0e5012e9a..a88692ebc 100644 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java +++ b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java @@ -2,6 +2,8 @@ import dev.architectury.platform.forge.EventBuses; import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; +import ml.pkom.mcpitanlibarch.test.ExampleMod; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -10,6 +12,9 @@ public class MCPitanLibarchForge { public MCPitanLibarchForge() { // Submit our event bus to let architectury register our content on the right time EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + if (PlatformUtil.isDevelopmentEnvironment()) { + EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + } MCPitanLibarch.init(); } } \ No newline at end of file From 34e4fed6e4c170d6af8621702bda818e3cae4d83 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Oct 2022 13:18:58 +0900 Subject: [PATCH 019/622] version info --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c63e8c844..7ccc04b4b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.5-1.19 +mod_version=1.0.6-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 80a7c8a88cafbf38474d6bab5eef00387b808fff Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Oct 2022 14:10:04 +0900 Subject: [PATCH 020/622] version info --- .../ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index bd02fde81..4793a4520 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -16,8 +16,7 @@ public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Tex super(handler, inventory, title); } - @Override - protected T addDrawableChild(T drawableElement) { + protected T addDrawableChild_compatibility(T drawableElement) { return super.addDrawableChild(drawableElement); // addButton } From d93a8ac9d3b3a8be4b17df94ea2bb112ed774eee Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Oct 2022 15:38:54 +0900 Subject: [PATCH 021/622] Add API --- .../mcpitanlibarch/api/util/ScreenHandlerUtil.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java new file mode 100644 index 000000000..145931558 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java @@ -0,0 +1,11 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.minecraft.util.collection.DefaultedList; + +public class ScreenHandlerUtil { + public static DefaultedList getSlots(ScreenHandler screenHandler) { + return screenHandler.slots; + } +} From 56e508a894319fe2eacbd09b4ba6b63ccf0df6cf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Oct 2022 15:39:51 +0900 Subject: [PATCH 022/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7ccc04b4b..d09e78c22 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.6-1.19 +mod_version=1.0.7-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From b002116a76c1de20f575de868a39c757e15a6998 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 4 Oct 2022 00:34:12 +0900 Subject: [PATCH 023/622] Add API --- .../pkom/mcpitanlibarch/api/tag/TagKey.java | 41 +++++++++++++++++++ .../mcpitanlibarch/api/util/ItemUtil.java | 18 ++++++++ 2 files changed, 59 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java new file mode 100644 index 000000000..e736ab96a --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java @@ -0,0 +1,41 @@ +package ml.pkom.mcpitanlibarch.api.tag; + +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryEntry; + +public class TagKey { + private final net.minecraft.tag.TagKey tagKey; + + @Deprecated + public TagKey(net.minecraft.tag.TagKey tagKey) { + this.tagKey = tagKey; + } + + public static TagKey create(Type type, Identifier identifier) { + switch (type) { + case BLOCK: + new TagKey<>(net.minecraft.tag.TagKey.of(Registry.BLOCK_KEY, identifier)); + case ITEM: + new TagKey<>(net.minecraft.tag.TagKey.of(Registry.ITEM_KEY, identifier)); + case FLUID: + new TagKey<>(net.minecraft.tag.TagKey.of(Registry.FLUID_KEY, identifier)); + } + return null; + } + + @Deprecated + public net.minecraft.tag.TagKey getTagKey() { + return tagKey; + } + + public enum Type { + BLOCK, + ITEM, + FLUID, + } + + public boolean isOf(T value) { + return RegistryEntry.of(value).isIn(tagKey); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index 44bea4a44..9947e7529 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -1,6 +1,8 @@ package ml.pkom.mcpitanlibarch.api.util; +import ml.pkom.mcpitanlibarch.api.tag.TagKey; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; @@ -8,4 +10,20 @@ public class ItemUtil { public static Item item(Identifier id) { return Registry.ITEM.get(id); } + + public static boolean isEqual(Item item, Item item2) { + return item == item2; + } + + public static boolean isOf(ItemStack stack, Item item) { + return stack.isOf(item); + } + + public static boolean isIn(ItemStack stack, TagKey tagKey) { + return isIn(stack.getItem(), tagKey); + } + + public static boolean isIn(Item item, TagKey tagKey) { + return tagKey.isOf(item); + } } From a7253aeda1fcd3f2455437b4dc8b28d1ad99a0ae Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 4 Oct 2022 17:38:14 +0900 Subject: [PATCH 024/622] Add API --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d09e78c22..c45973e48 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.7-1.19 +mod_version=1.0.8-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From ee136ea341812d5d2e963b2efb5d5ffac891e55d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 4 Oct 2022 17:53:32 +0900 Subject: [PATCH 025/622] fix --- .../ml/pkom/mcpitanlibarch/api/tag/TagKey.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java index e736ab96a..91a023981 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java @@ -13,15 +13,11 @@ public TagKey(net.minecraft.tag.TagKey tagKey) { } public static TagKey create(Type type, Identifier identifier) { - switch (type) { - case BLOCK: - new TagKey<>(net.minecraft.tag.TagKey.of(Registry.BLOCK_KEY, identifier)); - case ITEM: - new TagKey<>(net.minecraft.tag.TagKey.of(Registry.ITEM_KEY, identifier)); - case FLUID: - new TagKey<>(net.minecraft.tag.TagKey.of(Registry.FLUID_KEY, identifier)); - } - return null; + return switch (type) { + case BLOCK -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.BLOCK_KEY, identifier)); + case ITEM -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.ITEM_KEY, identifier)); + case FLUID -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.FLUID_KEY, identifier)); + }; } @Deprecated From 75704e7bb45c01fd79bf0f548157b0d31f0d35bf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 4 Oct 2022 17:54:26 +0900 Subject: [PATCH 026/622] fix --- common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java index 91a023981..3ee2dea21 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java @@ -17,6 +17,7 @@ public static TagKey create(Type type, Identifier identifier) { case BLOCK -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.BLOCK_KEY, identifier)); case ITEM -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.ITEM_KEY, identifier)); case FLUID -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.FLUID_KEY, identifier)); + case ENTITY_TYPE -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.ENTITY_TYPE_KEY, identifier)); }; } @@ -29,6 +30,7 @@ public enum Type { BLOCK, ITEM, FLUID, + ENTITY_TYPE, } public boolean isOf(T value) { From 473cdb9d42f31c2bebd9837b7ec9bab614bf0284 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 31 Oct 2022 23:56:35 +0900 Subject: [PATCH 027/622] 1.0.10 --- .../api/client/SimpleHandledScreen.java | 11 +++- .../mcpitanlibarch/test/ExampleGuiBlock.java | 31 ++++++++++ .../mcpitanlibarch/test/ExampleGuiItem.java | 28 +++++++++ .../pkom/mcpitanlibarch/test/ExampleMod.java | 13 ++++ .../mcpitanlibarch/test/ExampleModClient.java | 9 +++ .../mcpitanlibarch/test/ExampleScreen.java | 53 ++++++++++++++++ .../test/ExampleScreenHandler.java | 18 ++++++ .../fabric/MCPitanLibarchFabric.java | 6 ++ .../forge/MCPitanLibarchForge.java | 9 ++- .../client/MCPitanLibarchForgeClient.java | 12 ++++ gradle.properties | 10 ++-- upload_maven.php | 60 +++++++++++++++++++ 12 files changed, 250 insertions(+), 10 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiBlock.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiItem.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java create mode 100644 forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java create mode 100644 upload_maven.php diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 4793a4520..77ab09d6b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -1,16 +1,14 @@ package ml.pkom.mcpitanlibarch.api.client; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -@Environment(EnvType.CLIENT) public abstract class SimpleHandledScreen extends HandledScreen { public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); @@ -20,4 +18,11 @@ protected T addDrawableChild_compati return super.addDrawableChild(drawableElement); // addButton } + + @Override + protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int mouseY) { + drawBackgroundOverride(matrices, delta, mouseX, mouseY); + } + + public abstract void drawBackgroundOverride(MatrixStack matrices, float delta, int mouseX, int mouseY); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiBlock.java new file mode 100644 index 000000000..d05211327 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiBlock.java @@ -0,0 +1,31 @@ +package ml.pkom.mcpitanlibarch.test; + +import ml.pkom.mcpitanlibarch.api.block.ExtendBlock; +import ml.pkom.mcpitanlibarch.api.event.block.BlockUseEvent; +import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.minecraft.block.BlockState; +import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.SimpleNamedScreenHandlerFactory; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class ExampleGuiBlock extends ExtendBlock { + + public ExampleGuiBlock(Settings settings) { + super(settings); + } + + @Override + public ActionResult onRightClick(BlockUseEvent e) { + if (e.world.isClient) { + e.player.openGuiScreen(e.world, e.state, e.pos); + } + return ActionResult.SUCCESS; + } + + @Override + public NamedScreenHandlerFactory createScreenHandlerFactory(BlockState state, World world, BlockPos pos) { + return new SimpleNamedScreenHandlerFactory((i, playerInventory, playerEntity) -> new ExampleScreenHandler(i, playerInventory), TextUtil.literal("Example Title")); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiItem.java new file mode 100644 index 000000000..82870a54f --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiItem.java @@ -0,0 +1,28 @@ +package ml.pkom.mcpitanlibarch.test; + +import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; +import ml.pkom.mcpitanlibarch.api.item.ExtendItem; +import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.SimpleNamedScreenHandlerFactory; +import net.minecraft.util.TypedActionResult; + +public class ExampleGuiItem extends ExtendItem { + + public ExampleGuiItem(Settings settings) { + super(settings); + } + + @Override + public TypedActionResult onRightClick(ItemUseEvent event) { + if (!event.world.isClient()) { + event.user.openGuiScreen(getFactory()); + } + return super.onRightClick(event); + } + + public static NamedScreenHandlerFactory getFactory() { + return new SimpleNamedScreenHandlerFactory((i, playerInventory, playerEntity) -> new ExampleScreenHandler(i, playerInventory), TextUtil.literal("Example Title")); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java index 588b13a35..1cb36856e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -8,6 +8,7 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -28,10 +29,22 @@ public static Identifier id(String id) { public static ArchRegistry registry = ArchRegistry.createRegistry(MOD_ID); + public static RegistryEvent> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new ScreenHandlerType<>(ExampleScreenHandler::new));; + public static void init() { registry.registerItem(id("example_item"), () -> new Item(new Item.Settings().group(ItemGroup.MISC))); RegistryEvent EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new Block(AbstractBlock.Settings.of(Material.STONE))); registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); + + + + registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new Item.Settings().group(ItemGroup.MISC))); + + + + RegistryEvent EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(AbstractBlock.Settings.of(Material.STONE))); + registry.registerItem(id("example_gui_block"), () -> new BlockItem(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); + registry.allRegister(); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java new file mode 100644 index 000000000..6e727b788 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java @@ -0,0 +1,9 @@ +package ml.pkom.mcpitanlibarch.test; + +import dev.architectury.registry.menu.MenuRegistry; + +public class ExampleModClient { + public static void init() { + MenuRegistry.registerScreenFactory(ExampleMod.supplierEXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java new file mode 100644 index 000000000..0696ee689 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java @@ -0,0 +1,53 @@ +package ml.pkom.mcpitanlibarch.test; + +import ml.pkom.mcpitanlibarch.api.client.SimpleHandledScreen; +import ml.pkom.mcpitanlibarch.api.util.client.ScreenUtil; +import net.minecraft.client.gui.widget.TexturedButtonWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class ExampleScreen extends SimpleHandledScreen { + + public static Identifier GUI = new Identifier("textures/gui/container/blast_furnace.png"); + + public ExampleScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + @Override + protected void init() { + super.init(); + this.backgroundWidth = 176; + this.backgroundHeight = 166; + int x = (width - backgroundWidth) / 2; + int y = (height - backgroundHeight) / 2; + System.out.println("hogehogehoge1111"); + this.addDrawableChild_compatibility(new TexturedButtonWidget(0, 0, 30, 30, 0, 0, 16, GUI, (buttonWidget) -> { + System.out.println("hogehoge"); + })); + } + + @Override + public void drawBackgroundOverride(MatrixStack matrices, float delta, int mouseX, int mouseY) { + int x = (this.width - this.backgroundWidth) / 2; + int y = (this.height - this.backgroundHeight) / 2; + + ScreenUtil.setBackground(GUI); + drawTexture(matrices, x, y, 0, 0, this.backgroundWidth, this.backgroundHeight); + } + + @Override + protected void drawForeground(MatrixStack matrices, int mouseX, int mouseY) { + super.drawForeground(matrices, mouseX, mouseY); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.renderBackground(matrices); + super.render(matrices, mouseX, mouseY, delta); + this.drawMouseoverTooltip(matrices, mouseX, mouseY); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java new file mode 100644 index 000000000..ef10e2f3d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java @@ -0,0 +1,18 @@ +package ml.pkom.mcpitanlibarch.test; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; + +public class ExampleScreenHandler extends ScreenHandler { + + public ExampleScreenHandler(int i, PlayerInventory playerInventory) { + super(ExampleMod.supplierEXAMPLE_SCREENHANDLER.getOrNull(), i); + + } + + @Override + public boolean canUse(PlayerEntity player) { + return true; + } +} diff --git a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java index 9a7e82d3b..43c91610b 100644 --- a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java +++ b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java @@ -1,11 +1,17 @@ package ml.pkom.mcpitanlibarch.fabric; import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import ml.pkom.mcpitanlibarch.test.ExampleModClient; +import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.FabricLoader; public class MCPitanLibarchFabric implements ModInitializer { @Override public void onInitialize() { MCPitanLibarch.init(); + if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) + if (FabricLoader.getInstance().isDevelopmentEnvironment()) + ExampleModClient.init(); } } \ No newline at end of file diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java index a88692ebc..bcc7e2447 100644 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java +++ b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java @@ -1,8 +1,10 @@ package ml.pkom.mcpitanlibarch.forge; +import dev.architectury.platform.Platform; import dev.architectury.platform.forge.EventBuses; import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; +import ml.pkom.mcpitanlibarch.forge.client.MCPitanLibarchForgeClient; import ml.pkom.mcpitanlibarch.test.ExampleMod; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -12,9 +14,12 @@ public class MCPitanLibarchForge { public MCPitanLibarchForge() { // Submit our event bus to let architectury register our content on the right time EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - if (PlatformUtil.isDevelopmentEnvironment()) { + if (PlatformUtil.isDevelopmentEnvironment()) EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - } + MCPitanLibarch.init(); + + if (Platform.getEnv().isClient()) + FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchForgeClient::clientInit); } } \ No newline at end of file diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java new file mode 100644 index 000000000..547a4b49c --- /dev/null +++ b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java @@ -0,0 +1,12 @@ +package ml.pkom.mcpitanlibarch.forge.client; + +import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; +import ml.pkom.mcpitanlibarch.test.ExampleModClient; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; + +public class MCPitanLibarchForgeClient { + public static void clientInit(FMLClientSetupEvent event) { + if (PlatformUtil.isDevelopmentEnvironment()) + ExampleModClient.init(); + } +} diff --git a/gradle.properties b/gradle.properties index c45973e48..33449f13b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,16 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.8-1.19 +mod_version=1.0.10-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=6.2.46 +architectury_version=6.3.49 # https://fabricmc.net/develop/ -fabric_loader_version=0.14.9 -yarn_mappings=1.19.2+build.18 -fabric_api_version=0.62.0+1.19.2 +fabric_loader_version=0.14.10 +yarn_mappings=1.19.2+build.28 +fabric_api_version=0.64.0+1.19.2 # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.19.2-43.1.27 diff --git a/upload_maven.php b/upload_maven.php new file mode 100644 index 000000000..8765daf3d --- /dev/null +++ b/upload_maven.php @@ -0,0 +1,60 @@ + './common/build/libs/', + 'fabric' => './fabric/build/libs/', + 'forge' => './forge/build/libs/', +)); + +define('GAME_VERSIONS', array( + //'1.16.5' => '1.16', + //'1.17' => '1.17', + '1.18' => '1.18', + //'1.19' => '1.19', +)); + +define('PLATFORM_FILE_MARK', array( + 'common' => '', + 'fabric' => '-fabric', + 'forge' => '-forge', +)); + +foreach (DIRS as $type => $dir) { + + foreach (GAME_VERSIONS as $file_ver => $ver) { + + $postData = array(); + + $postData['group_id'] = 'ml.pkom'; + $postData['artifact_id'] = 'mcpitanlibarch-' . $type . '+' . $ver; + $postData['version'] = VERSION; + + $files = array( + $dir . 'mcpitanlibarch-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '.jar', + $dir . 'mcpitanlibarch-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '-sources.jar', + ); + + foreach ($files as $index => $file) { + $postData['upload[' . $index . ']'] = curl_file_create( + realpath($file), + mime_content_type($file), + basename($file) + ); + echo "Uploading '" . $file . "'\n"; + } + + $request = curl_init('http://localhost/maven/maven.php'); + curl_setopt($request, CURLOPT_POST, true); + curl_setopt($request, CURLOPT_POSTFIELDS, $postData); + curl_setopt($request, CURLOPT_RETURNTRANSFER, true); + $result = curl_exec($request); + + if ($result === false) { + error_log(curl_error($request)); + } + curl_close($request); + } +} + + From efd6eff40cdc010d5a0d6d88c5d52931e12e63f5 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 1 Nov 2022 00:01:39 +0900 Subject: [PATCH 028/622] 1.0.10 --- .../ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java index ef10e2f3d..4de89b1c6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java @@ -2,6 +2,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; public class ExampleScreenHandler extends ScreenHandler { @@ -11,6 +12,11 @@ public ExampleScreenHandler(int i, PlayerInventory playerInventory) { } + @Override + public ItemStack transferSlot(PlayerEntity player, int index) { + return null; + } + @Override public boolean canUse(PlayerEntity player) { return true; From da8e1949470783e468473d99ab2835b7a12d662a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 2 Nov 2022 23:08:53 +0900 Subject: [PATCH 029/622] 1.1.0 --- .../api/client/SimpleHandledScreen.java | 40 +++++++++++++++++++ gradle.properties | 2 +- upload_maven.php | 2 +- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 77ab09d6b..ec0e34d10 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -1,5 +1,6 @@ package ml.pkom.mcpitanlibarch.api.client; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; @@ -25,4 +26,43 @@ protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int } public abstract void drawBackgroundOverride(MatrixStack matrices, float delta, int mouseX, int mouseY); + + public void callDrawTexture(MatrixStack matrices, int x, int y, int u, int v, int width, int height) { + super.drawTexture(matrices, x, y, u, v, width, height); + } + + public void callRenderBackground(MatrixStack matrices) { + super.renderBackground(matrices); + } + + public void callDrawMouseoverTooltip(MatrixStack matrices, int x, int y) { + super.drawMouseoverTooltip(matrices, x, y); + } + + public void renderOverride(MatrixStack matrices, int mouseX, int mouseY, float delta) { + super.render(matrices, mouseX, mouseY, delta); + } + + public void resizeOverride(MinecraftClient client, int width, int height) { + super.resize(client, width, height); + } + + public void initOverride() { + super.init(); + } + + @Override + protected void init() { + initOverride(); + } + + @Override + public void resize(MinecraftClient client, int width, int height) { + resizeOverride(client, width, height); + } + + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + renderOverride(matrices, mouseX, mouseY, delta); + } } diff --git a/gradle.properties b/gradle.properties index 33449f13b..46e8b7816 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.0.10-1.19 +mod_version=1.1.0-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api diff --git a/upload_maven.php b/upload_maven.php index 8765daf3d..b7d229f15 100644 --- a/upload_maven.php +++ b/upload_maven.php @@ -1,5 +1,5 @@ './common/build/libs/', From 3d3ef7979be4bae61202c48ff6cada794627d74c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 7 Nov 2022 00:17:27 +0900 Subject: [PATCH 030/622] 1.1.1 --- .../api/client/SimpleHandledScreen.java | 34 ++++ .../mcpitanlibarch/api/entity/Player.java | 27 ++++ .../api/gui/SimpleScreenHandler.java | 149 ++++++++++++++++++ .../mcpitanlibarch/api/util/BlockUtil.java | 12 ++ .../mcpitanlibarch/api/util/ItemUtil.java | 11 ++ .../mcpitanlibarch/test/ExampleScreen.java | 26 +-- gradle.properties | 2 +- upload_maven.php | 8 +- 8 files changed, 245 insertions(+), 24 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index ec0e34d10..30694938c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -1,18 +1,33 @@ package ml.pkom.mcpitanlibarch.api.client; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; public abstract class SimpleHandledScreen extends HandledScreen { + + public int width, height, backgroundWidth, backgroundHeight, x, y; + public ScreenHandler handler; + public TextRenderer textRenderer; + public ItemRenderer itemRenderer; + public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); + this.width = MinecraftClient.getInstance().getWindow().getScaledWidth(); + this.height = MinecraftClient.getInstance().getWindow().getScaledHeight(); + this.backgroundWidth = 176; + this.backgroundHeight = 166; + this.x = (this.width - this.backgroundWidth) / 2; + this.y = (this.height - this.backgroundHeight) / 2; + this.handler = handler; } protected T addDrawableChild_compatibility(T drawableElement) { @@ -27,6 +42,15 @@ protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int public abstract void drawBackgroundOverride(MatrixStack matrices, float delta, int mouseX, int mouseY); + @Override + protected void drawForeground(MatrixStack matrices, int mouseX, int mouseY) { + drawForegroundOverride(matrices, mouseX, mouseY); + } + + protected void drawForegroundOverride(MatrixStack matrices, int mouseX, int mouseY) { + super.drawForeground(matrices, mouseX, mouseY); + } + public void callDrawTexture(MatrixStack matrices, int x, int y, int u, int v, int width, int height) { super.drawTexture(matrices, x, y, u, v, width, height); } @@ -49,6 +73,8 @@ public void resizeOverride(MinecraftClient client, int width, int height) { public void initOverride() { super.init(); + this.textRenderer = super.textRenderer; + this.itemRenderer = super.itemRenderer; } @Override @@ -59,6 +85,14 @@ protected void init() { @Override public void resize(MinecraftClient client, int width, int height) { resizeOverride(client, width, height); + fixScreen(); + } + + public void fixScreen() { + this.width = MinecraftClient.getInstance().getWindow().getScaledWidth(); + this.height = MinecraftClient.getInstance().getWindow().getScaledHeight(); + this.x = (this.width - this.backgroundWidth) / 2; + this.y = (this.height - this.backgroundHeight) / 2; } @Override diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index e6e199ed6..20f5ba37d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -1,12 +1,15 @@ package ml.pkom.mcpitanlibarch.api.entity; import net.minecraft.block.BlockState; +import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerAbilities; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -146,4 +149,28 @@ public boolean isSneaking() { public ItemStack getCursorStack() { return getCurrentScreenHandler().getCursorStack(); } + + public boolean isClient() { + return getWorld().isClient(); + } + + public void readCustomDataFromNbt(NbtCompound nbt) { + getEntity().readCustomDataFromNbt(nbt); + } + + public void writeCustomDataToNbt(NbtCompound nbt) { + getEntity().writeCustomDataToNbt(nbt); + } + + public void sendMessage(Text text) { + getEntity().sendMessage(text, false); + } + + public void sendActionBar(Text text) { + getEntity().sendMessage(text, true); + } + + public void equipStack(EquipmentSlot slot, ItemStack stack) { + getEntity().equipStack(slot, stack); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java new file mode 100644 index 000000000..2b104c42f --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java @@ -0,0 +1,149 @@ +package ml.pkom.mcpitanlibarch.api.gui; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.screen.slot.Slot; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public class SimpleScreenHandler extends ScreenHandler { + protected SimpleScreenHandler(@Nullable ScreenHandlerType type, int syncId) { + super(type, syncId); + } + + @Deprecated + @Override + public boolean canUse(PlayerEntity player) { + return canUse(new Player(player)); + } + + public boolean canUse(Player player) { + return true; + } + + protected Slot addNormalSlot(Inventory inventory, int index, int x, int y) { + Slot slot = new Slot(inventory, index, x, y); + return this.addSlot(slot); + } + + public static final int DEFAULT_SLOT_SIZE = 18; + + /** + * Add player main inventory slots + * @param inventory target player inventory + * @param x start x + * @param y start y + */ + protected List addPlayerMainInventorySlots(PlayerInventory inventory, int x, int y) { + return this.addSlots(inventory, 9, x, y, DEFAULT_SLOT_SIZE, 9, 3); + } + + /** + * Add player hotbar slots + * @param inventory target player inventory + * @param x start x + * @param y start y + */ + protected List addPlayerHotbarSlots(PlayerInventory inventory, int x, int y) { + return this.addSlotsX(inventory, 0, x, y, DEFAULT_SLOT_SIZE, 9); + } + + /** + * 一括でスロットを設置する + * @param inventory target inventory + * @param firstIndex fisrt index + * @param firstX first x + * @param firstY first y + * @param size a slot size (if this is -1, set 18 to this) + * @param maxAmountX x line slot max amount + * @param maxAmountY y line slot max amount + * @return Slot list + */ + protected List addSlots(Inventory inventory, int firstIndex, int firstX, int firstY, int size, int maxAmountX, int maxAmountY) { + if (size < 0) size = DEFAULT_SLOT_SIZE; + List slots = new ArrayList<>(); + for (int y = 0; y < maxAmountY; ++y) { + List xSlots = this.addSlotsX(inventory, firstIndex + (y * maxAmountX), firstX, firstY + (y * size), size, maxAmountX); + slots.addAll(xSlots); + } + return slots; + } + + /** + * 一括で横にスロットを設置する + * @param inventory target inventory + * @param firstIndex first index + * @param firstX first x + * @param y y + * @param size a slot size (if this is -1, set 18 to this) + * @param amount slot amount + * @return Slot list + */ + protected List addSlotsX(Inventory inventory, int firstIndex, int firstX, int y, int size, int amount) { + if (size < 0) size = DEFAULT_SLOT_SIZE; + List slots = new ArrayList<>(); + for (int x = 0; x < amount; ++x) { + Slot slot = this.addNormalSlot(inventory, firstIndex + x, firstX + (x * size), y); + slots.add(slot); + } + return slots; + } + + /** + * 一括で縦にスロットを設置する + * @param inventory target inventory + * @param firstIndex first index + * @param x x + * @param firstY first y + * @param size a slot size (if this is -1, set 18 to this) + * @param amount slot amount + * @return Slot list + */ + protected List addSlotsY(Inventory inventory, int firstIndex, int x, int firstY, int size, int amount) { + if (size < 0) size = DEFAULT_SLOT_SIZE; + List slots = new ArrayList<>(); + for (int y = 0; y < amount; ++y) { + Slot slot = this.addNormalSlot(inventory, firstIndex + x, x, firstY + (y * size)); + slots.add(slot); + } + return slots; + } + + @Override + public ItemStack transferSlot(PlayerEntity player, int index) { + ItemStack itemStack = ItemStack.EMPTY; + Slot slot = this.slots.get(index); + if (slot.hasStack()) { + ItemStack itemStack2 = slot.getStack(); + itemStack = itemStack2.copy(); + if (index < 9) { + if (!this.insertItem(itemStack2, 9, 36, true)) { + return ItemStack.EMPTY; + } + } else if (!this.insertItem(itemStack2, 0, 9, false)) { + return ItemStack.EMPTY; + } + + if (itemStack2.isEmpty()) { + slot.setStack(ItemStack.EMPTY); + } else { + slot.markDirty(); + } + + if (itemStack2.getCount() == itemStack.getCount()) { + return ItemStack.EMPTY; + } + + slot.onTakeItem(player, itemStack2); + } + + return itemStack; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index 5d735decf..f618e4bb5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -30,4 +30,16 @@ public static AbstractBlock.Settings dropsNothing(AbstractBlock.Settings setting public static AbstractBlock.Settings requiresTool(AbstractBlock.Settings settings) { return settings.requiresTool(); } + + public static boolean isExist(Identifier identifier) { + return Registry.BLOCK.containsId(identifier); + } + + public static Identifier toID(Block block) { + return Registry.BLOCK.getId(block); + } + + public static Block fromId(Identifier identifier) { + return Registry.BLOCK.get(identifier); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index 9947e7529..a34effd88 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -26,4 +26,15 @@ public static boolean isIn(ItemStack stack, TagKey tagKey) { public static boolean isIn(Item item, TagKey tagKey) { return tagKey.isOf(item); } + + public static boolean isExist(Identifier identifier) { + return Registry.ITEM.containsId(identifier); + } + public static Identifier toID(Item item) { + return Registry.ITEM.getId(item); + } + + public static Item fromId(Identifier identifier) { + return Registry.ITEM.get(identifier); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java index 0696ee689..320974312 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java @@ -18,12 +18,8 @@ public ExampleScreen(ScreenHandler handler, PlayerInventory inventory, Text titl } @Override - protected void init() { - super.init(); - this.backgroundWidth = 176; - this.backgroundHeight = 166; - int x = (width - backgroundWidth) / 2; - int y = (height - backgroundHeight) / 2; + public void initOverride() { + super.initOverride(); System.out.println("hogehogehoge1111"); this.addDrawableChild_compatibility(new TexturedButtonWidget(0, 0, 30, 30, 0, 0, 16, GUI, (buttonWidget) -> { System.out.println("hogehoge"); @@ -32,22 +28,14 @@ protected void init() { @Override public void drawBackgroundOverride(MatrixStack matrices, float delta, int mouseX, int mouseY) { - int x = (this.width - this.backgroundWidth) / 2; - int y = (this.height - this.backgroundHeight) / 2; - ScreenUtil.setBackground(GUI); - drawTexture(matrices, x, y, 0, 0, this.backgroundWidth, this.backgroundHeight); - } - - @Override - protected void drawForeground(MatrixStack matrices, int mouseX, int mouseY) { - super.drawForeground(matrices, mouseX, mouseY); + callDrawTexture(matrices, x, y, 0, 0, this.backgroundWidth, this.backgroundHeight); } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.renderBackground(matrices); - super.render(matrices, mouseX, mouseY, delta); - this.drawMouseoverTooltip(matrices, mouseX, mouseY); + public void renderOverride(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.callRenderBackground(matrices); + super.renderOverride(matrices, mouseX, mouseY, delta); + this.callDrawMouseoverTooltip(matrices, mouseX, mouseY); } } diff --git a/gradle.properties b/gradle.properties index 46e8b7816..94a4278d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.0-1.19 +mod_version=1.1.1-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api diff --git a/upload_maven.php b/upload_maven.php index b7d229f15..76fc3112b 100644 --- a/upload_maven.php +++ b/upload_maven.php @@ -1,5 +1,5 @@ './common/build/libs/', @@ -8,10 +8,10 @@ )); define('GAME_VERSIONS', array( - //'1.16.5' => '1.16', - //'1.17' => '1.17', + '1.16.5' => '1.16', + '1.17' => '1.17', '1.18' => '1.18', - //'1.19' => '1.19', + '1.19' => '1.19', )); define('PLATFORM_FILE_MARK', array( From d9fc0b4ff9a718e0e5c5bafc53461f88dba1d04a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 7 Nov 2022 17:56:17 +0900 Subject: [PATCH 031/622] 1.1.2 --- .../api/client/SimpleHandledScreen.java | 17 +++++++++++------ gradle.properties | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 30694938c..13116f534 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -21,12 +21,7 @@ public abstract class SimpleHandledScreen extends HandledScreen { public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); - this.width = MinecraftClient.getInstance().getWindow().getScaledWidth(); - this.height = MinecraftClient.getInstance().getWindow().getScaledHeight(); - this.backgroundWidth = 176; - this.backgroundHeight = 166; - this.x = (this.width - this.backgroundWidth) / 2; - this.y = (this.height - this.backgroundHeight) / 2; + fixScreen(); this.handler = handler; } @@ -91,10 +86,20 @@ public void resize(MinecraftClient client, int width, int height) { public void fixScreen() { this.width = MinecraftClient.getInstance().getWindow().getScaledWidth(); this.height = MinecraftClient.getInstance().getWindow().getScaledHeight(); + this.backgroundWidth = getBackgroundWidth(); + this.backgroundHeight = getBackgroundHeight(); this.x = (this.width - this.backgroundWidth) / 2; this.y = (this.height - this.backgroundHeight) / 2; } + public int getBackgroundWidth() { + return 176; + } + + public int getBackgroundHeight() { + return 166; + } + @Override public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { renderOverride(matrices, mouseX, mouseY, delta); diff --git a/gradle.properties b/gradle.properties index 94a4278d9..a7671a407 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.1-1.19 +mod_version=1.1.2-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From edd532f03a32f0d24d020d66eecdb104df1d6649 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 8 Nov 2022 00:57:10 +0900 Subject: [PATCH 032/622] 1.1.3 --- .../api/client/SimpleHandledScreen.java | 17 +++++++++-------- gradle.properties | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 13116f534..5b6b6d811 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -68,13 +68,12 @@ public void resizeOverride(MinecraftClient client, int width, int height) { public void initOverride() { super.init(); - this.textRenderer = super.textRenderer; - this.itemRenderer = super.itemRenderer; } @Override protected void init() { initOverride(); + fixScreen(); } @Override @@ -84,20 +83,22 @@ public void resize(MinecraftClient client, int width, int height) { } public void fixScreen() { - this.width = MinecraftClient.getInstance().getWindow().getScaledWidth(); - this.height = MinecraftClient.getInstance().getWindow().getScaledHeight(); this.backgroundWidth = getBackgroundWidth(); this.backgroundHeight = getBackgroundHeight(); - this.x = (this.width - this.backgroundWidth) / 2; - this.y = (this.height - this.backgroundHeight) / 2; + this.x = super.x; //(this.width - this.backgroundWidth) / 2; + this.y = super.y; //(this.height - this.backgroundHeight) / 2; + this.textRenderer = super.textRenderer; + this.itemRenderer = super.itemRenderer; + this.width = super.width; + this.height = super.height; } public int getBackgroundWidth() { - return 176; + return super.backgroundWidth; } public int getBackgroundHeight() { - return 166; + return super.backgroundHeight; } @Override diff --git a/gradle.properties b/gradle.properties index a7671a407..01f79c8db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.2-1.19 +mod_version=1.1.3-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From c4e1a7104767873c00e6d7f4c95cc0c97b704090 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 10 Nov 2022 22:05:53 +0900 Subject: [PATCH 033/622] 1.1.4 --- .../api/client/SimpleHandledScreen.java | 44 ++++++++++++++++++- gradle.properties | 2 +- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 5b6b6d811..46c9f5516 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -72,14 +72,14 @@ public void initOverride() { @Override protected void init() { - initOverride(); fixScreen(); + initOverride(); } @Override public void resize(MinecraftClient client, int width, int height) { - resizeOverride(client, width, height); fixScreen(); + resizeOverride(client, width, height); } public void fixScreen() { @@ -93,6 +93,46 @@ public void fixScreen() { this.height = super.height; } + public void setX(int x) { + this.x = x; + super.x = x; + } + + public void setY(int y) { + this.y = y; + super.y = y; + } + + public void setTextRenderer(TextRenderer textRenderer) { + this.textRenderer = textRenderer; + super.textRenderer = textRenderer; + } + + public void setItemRenderer(ItemRenderer itemRenderer) { + this.itemRenderer = itemRenderer; + super.itemRenderer = itemRenderer; + } + + public void setWidth(int width) { + this.width = width; + super.width = width; + } + + public void setBackgroundWidth(int backgroundWidth) { + this.backgroundWidth = backgroundWidth; + super.backgroundWidth = backgroundWidth; + } + + public void setBackgroundHeight(int backgroundHeight) { + this.backgroundHeight = backgroundHeight; + super.backgroundHeight = backgroundHeight; + } + + public void setHeight(int height) { + this.height = height; + super.height = height; + } + public int getBackgroundWidth() { return super.backgroundWidth; } diff --git a/gradle.properties b/gradle.properties index 01f79c8db..ce96e1398 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.3-1.19 +mod_version=1.1.4-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From bf1b27355d9c1d4c5a6619ca23d7209c674216e8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 10 Nov 2022 22:27:40 +0900 Subject: [PATCH 034/622] 1.1.5 --- .../api/client/SimpleHandledScreen.java | 4 +- gradle.properties | 2 +- upload_curseforge.php | 145 ++++++++++++++++++ upload_maven.php | 2 +- 4 files changed, 149 insertions(+), 4 deletions(-) create mode 100644 upload_curseforge.php diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 46c9f5516..389f770d0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -63,21 +63,21 @@ public void renderOverride(MatrixStack matrices, int mouseX, int mouseY, float d } public void resizeOverride(MinecraftClient client, int width, int height) { - super.resize(client, width, height); } public void initOverride() { - super.init(); } @Override protected void init() { + super.init(); fixScreen(); initOverride(); } @Override public void resize(MinecraftClient client, int width, int height) { + super.resize(client, width, height); fixScreen(); resizeOverride(client, width, height); } diff --git a/gradle.properties b/gradle.properties index ce96e1398..4b8018692 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.4-1.19 +mod_version=1.1.5-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api diff --git a/upload_curseforge.php b/upload_curseforge.php new file mode 100644 index 000000000..560db389d --- /dev/null +++ b/upload_curseforge.php @@ -0,0 +1,145 @@ + './common/build/libs/', + 'fabric' => './fabric/build/libs/', + 'forge' => './forge/build/libs/', +)); + +define('GAME_VERSIONS', array( + '1.16.5' => '1.16', + '1.17' => '1.17', + '1.18' => '1.18', + '1.19' => '1.19', +)); + +define('PLATFORM_FILE_MARK', array( +// 'common' => '', + 'fabric' => '-fabric', + 'forge' => '-forge', +)); + +$postData = array(); + +$ch = curl_init('https://minecraft.curseforge.com/api/game/version-types'); + +curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET'); +curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); +curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); +curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json', 'X-Api-Token: 788ae0f4-ae9a-405f-be51-7988574a533a')); +curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); +$result = curl_exec($ch); + +$game_version_types_data = json_decode($result, true); + +curl_close($ch); + +//file_put_contents('curse_forge_game_version_types.json', json_encode($game_version_json, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); + + +$postData = array(); + +$ch = curl_init('https://minecraft.curseforge.com/api/game/versions'); + +curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET'); +curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); +curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); +curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json', 'X-Api-Token: 788ae0f4-ae9a-405f-be51-7988574a533a')); +curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); +$result = curl_exec($ch); + +$game_versions_data = json_decode($result, true); + +curl_close($ch); + +//file_put_contents('curse_forge_game_versions.json', json_encode($game_version_json, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); + +$CHANGE_LOG = CHANGE_LOG; + +foreach (DIRS as $type => $dir) { + + foreach (GAME_VERSIONS as $file_ver => $ver) { + $typeId = 0; + foreach ($game_version_types_data as $data) { + if ($data['name'] == 'Minecraft ' . $ver) { + $typeId = $data['id']; + } + } + + $version_id_list = array(); + foreach ($game_versions_data as $data) { + if ($data['gameVersionTypeID'] == $typeId) { + if (!str_ends_with($data['slug'], 'snapshot')) { + $version_id_list[] = $data['id']; + } + } + } + + $postData = array(); + + $releaseType = ($type === "fabric" ? 'release' : 'beta'); + $fabric_api = ''; + if ($type == 'fabric') { +$fabric_api = << './common/build/libs/', From 3ea41d426af3e87db908557d0cdb4ac8a95d45f5 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 16 Nov 2022 16:41:20 +0900 Subject: [PATCH 035/622] 1.1.6 --- .../api/command/AbstractCommand.java | 35 ++++++++++ .../api/command/CommandRegistry.java | 42 ++++++++++++ .../api/event/ServerCommandEvent.java | 68 +++++++++++++++++++ .../mcpitanlibarch/test/ExampleCommand.java | 33 +++++++++ .../pkom/mcpitanlibarch/test/ExampleMod.java | 26 ++++--- gradle.properties | 2 +- 6 files changed, 195 insertions(+), 11 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java new file mode 100644 index 000000000..c4427a6f9 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java @@ -0,0 +1,35 @@ +package ml.pkom.mcpitanlibarch.api.command; + +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; + +import java.util.*; + +public abstract class AbstractCommand { + + private Map argumentCommands = new HashMap<>(); + public int isSuccess = 1; + + abstract public void init(); + + abstract public void execute(ServerCommandEvent event); + + public void success() { + isSuccess = 1; + } + + public void failure() { + isSuccess = 0; + } + + public Map getArgumentCommands() { + return argumentCommands; + } + + public void setArgumentCommands(Map argumentCommands) { + this.argumentCommands = argumentCommands; + } + + public void addArgumentCommand(String name, AbstractCommand command) { + getArgumentCommands().put(name, command); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java new file mode 100644 index 000000000..37300af29 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java @@ -0,0 +1,42 @@ +package ml.pkom.mcpitanlibarch.api.command; + +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import dev.architectury.event.events.common.CommandRegistrationEvent; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.server.command.ServerCommandSource; + +import java.util.Map; + +public class CommandRegistry { + public static void register(String name, AbstractCommand command) { + command.init(); + LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal(name) + .executes(context -> { + ServerCommandEvent event = new ServerCommandEvent(); + event.setContext(context); + command.execute(event); + return command.isSuccess; + }); + + forArgsCmd(command, builder); + + CommandRegistrationEvent.EVENT.register((dispatcher, environment) -> + dispatcher.register(builder) + ); + } + + private static void forArgsCmd(AbstractCommand command, LiteralArgumentBuilder builder) { + if (!command.getArgumentCommands().isEmpty()) { + for (Map.Entry argCmd : command.getArgumentCommands().entrySet()) { + argCmd.getValue().init(); + LiteralArgumentBuilder builder2 = builder.then(LiteralArgumentBuilder.literal(argCmd.getKey()).executes(context -> { + ServerCommandEvent event = new ServerCommandEvent(); + event.setContext(context); + argCmd.getValue().execute(event); + return argCmd.getValue().isSuccess; + })); + forArgsCmd(argCmd.getValue(), builder2); + } + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java new file mode 100644 index 000000000..bd69d38da --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java @@ -0,0 +1,68 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.context.StringRange; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.text.Text; +import net.minecraft.world.World; + +public class ServerCommandEvent { + public CommandContext context; + + public CommandContext getContext() { + return context; + } + + public void setContext(CommandContext context) { + this.context = context; + } + + public PlayerEntity getPlayerEntity() throws CommandSyntaxException { + return context.getSource().getPlayer(); + } + + public Player getPlayer() throws CommandSyntaxException { + return new Player(getPlayerEntity()); + } + + public World getWorld() { + return context.getSource().getWorld(); + } + + public Entity getEntity() { + return context.getSource().getEntity(); + } + + public String getInput() { + return context.getInput(); + } + + public Command getCommand() { + return context.getCommand(); + } + + public CommandContext getChild() { + return context.getChild(); + } + + public CommandContext getLastChild() { + return context.getLastChild(); + } + + public StringRange getRange() { + return context.getRange(); + } + + public void sendSuccess(Text message, boolean broadcastToOps) { + context.getSource().sendFeedback(message, broadcastToOps); + } + + public void sendFailure(Text message) { + context.getSource().sendError(message); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java new file mode 100644 index 000000000..8436808f0 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java @@ -0,0 +1,33 @@ +package ml.pkom.mcpitanlibarch.test; + +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.item.ItemStack; + +public class ExampleCommand extends AbstractCommand { + + @Override + public void init() { + addArgumentCommand("item", new AbstractCommand() { + @Override + public void init() { + + } + + @Override + public void execute(ServerCommandEvent event) { + try { + event.getPlayer().offerOrDrop(new ItemStack(ExampleMod.EXAMPLE_ITEM_SUPPLIER.getOrNull())); + } catch (CommandSyntaxException e) { + + } + } + }); + } + + @Override + public void execute(ServerCommandEvent event) { + System.out.println(event.getInput()); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java index 1cb36856e..9b6069a9e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -1,5 +1,6 @@ package ml.pkom.mcpitanlibarch.test; +import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; import net.minecraft.block.AbstractBlock; @@ -31,20 +32,25 @@ public static Identifier id(String id) { public static RegistryEvent> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new ScreenHandlerType<>(ExampleScreenHandler::new));; - public static void init() { - registry.registerItem(id("example_item"), () -> new Item(new Item.Settings().group(ItemGroup.MISC))); - RegistryEvent EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new Block(AbstractBlock.Settings.of(Material.STONE))); - registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); - - - - registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new Item.Settings().group(ItemGroup.MISC))); + public static RegistryEvent EXAMPLE_ITEM_SUPPLIER; + public static RegistryEvent EXAMPLE_BLOCK_SUPPLIER; + public static RegistryEvent EXAMPLE_BLOCK_ITEM_SUPPLIER; + public static RegistryEvent EXAMPLE_GUI_ITEM_SUPPLIER; + public static RegistryEvent EXAMPLE_GUI_BLOCK_SUPPLIER; + public static RegistryEvent EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER; + public static void init() { + EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new Item(new Item.Settings().group(ItemGroup.MISC))); + EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new Block(AbstractBlock.Settings.of(Material.STONE))); + EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); + EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new Item.Settings().group(ItemGroup.MISC))); - RegistryEvent EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(AbstractBlock.Settings.of(Material.STONE))); - registry.registerItem(id("example_gui_block"), () -> new BlockItem(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); + EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(AbstractBlock.Settings.of(Material.STONE))); + EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> new BlockItem(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); registry.allRegister(); + + CommandRegistry.register("mpla", new ExampleCommand()); } } diff --git a/gradle.properties b/gradle.properties index 4b8018692..38c22fdc6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.5-1.19 +mod_version=1.1.6-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 5ccf80b3f215e8a83fd5645fc5c21bd57bec968f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 16 Nov 2022 16:46:09 +0900 Subject: [PATCH 036/622] 1.1.6 --- .../ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java index 37300af29..e25ef95e7 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java @@ -20,7 +20,7 @@ public static void register(String name, AbstractCommand command) { forArgsCmd(command, builder); - CommandRegistrationEvent.EVENT.register((dispatcher, environment) -> + CommandRegistrationEvent.EVENT.register((dispatcher, registryAccess, environment) -> dispatcher.register(builder) ); } From 792065a54a10a01e7a9ceff0d56f56a5b2df5234 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 16 Nov 2022 23:18:05 +0900 Subject: [PATCH 037/622] add BlockEntity API --- .../api/block/ExtendBlockEntityProvider.java | 18 ++++++++++++++++++ .../api/tile/ExtendBlockEntity.java | 17 +++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java new file mode 100644 index 000000000..ab5fb7778 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java @@ -0,0 +1,18 @@ +package ml.pkom.mcpitanlibarch.api.block; + +import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; +import net.minecraft.block.BlockEntityProvider; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.Nullable; + +public interface ExtendBlockEntityProvider extends BlockEntityProvider { + @Nullable + default BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return createBlockEntity(new TileCreateEvent(pos, state)); + } + + @Nullable + BlockEntity createBlockEntity(TileCreateEvent event); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java new file mode 100644 index 000000000..640e945e1 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java @@ -0,0 +1,17 @@ +package ml.pkom.mcpitanlibarch.api.tile; + +import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; + +public class ExtendBlockEntity extends BlockEntity { + public ExtendBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + public ExtendBlockEntity(BlockEntityType type, TileCreateEvent event) { + this(type, event.getBlockPos(), event.getBlockState()); + } +} From 13f2e1cd532445302eaaf43c441bb95229ea84f9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 16 Nov 2022 23:19:57 +0900 Subject: [PATCH 038/622] 1.1.7 --- .gitignore | 1 + gradle.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3c37caf38..824cffc2b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ atlassian-ide-plugin.xml *.zip *.tar.gz *.rar +*.php # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/gradle.properties b/gradle.properties index 38c22fdc6..505523f91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.6-1.19 +mod_version=1.1.7-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 93c64927907798e5a73c8c9ca82c22f9e50278bd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 16 Nov 2022 23:20:05 +0900 Subject: [PATCH 039/622] 1.1.7 --- php/upload_modrinth.bat | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 php/upload_modrinth.bat diff --git a/php/upload_modrinth.bat b/php/upload_modrinth.bat new file mode 100644 index 000000000..9b351ae75 --- /dev/null +++ b/php/upload_modrinth.bat @@ -0,0 +1,2 @@ +php upload_modrinth.php +pause \ No newline at end of file From d9a9a5b1e40ca6af57e2332a7d8b03b9981efd94 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Nov 2022 01:55:30 +0900 Subject: [PATCH 040/622] 1.1.8 --- .../api/tile/ExtendBlockEntity.java | 9 ++++ .../api/util/InventoryUtil.java | 42 ++++++++++++++++ .../mcpitanlibarch/api/util/WorldUtil.java | 39 +++++++++++++++ .../mcpitanlibarch/api/world/ExtendWorld.java | 48 +++++++++++++++++++ gradle.properties | 2 +- 5 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/world/ExtendWorld.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java index 640e945e1..38cb78416 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java @@ -1,12 +1,15 @@ package ml.pkom.mcpitanlibarch.api.tile; import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; +import ml.pkom.mcpitanlibarch.api.world.ExtendWorld; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class ExtendBlockEntity extends BlockEntity { + public ExtendWorld world; public ExtendBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); } @@ -14,4 +17,10 @@ public ExtendBlockEntity(BlockEntityType type, BlockPos pos, BlockState state public ExtendBlockEntity(BlockEntityType type, TileCreateEvent event) { this(type, event.getBlockPos(), event.getBlockState()); } + + @Override + public void setWorld(World world) { + super.setWorld(world); + this.world = new ExtendWorld(world); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java new file mode 100644 index 000000000..97d6fceb5 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java @@ -0,0 +1,42 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; + +public class InventoryUtil { + public static boolean insertItem(ItemStack insertStack, DefaultedList inventory) { + return insertItem(insertStack, inventory, false); + } + + public static boolean insertItem(ItemStack insertStack, DefaultedList inventory, boolean test) { + boolean isInserted = false; + for (int i = 0; i < inventory.size(); i++) { + ItemStack stack = inventory.get(i); + if (stack.isEmpty()) { + if (!test) inventory.set(i, insertStack); + isInserted = true; + break; + } else if (canMergeItems(stack, insertStack)) { + int j = insertStack.getCount(); + if (!test) stack.increment(j); + isInserted = j > 0; + break; + } + } + return isInserted; + + } + + public static boolean canMergeItems(ItemStack first, ItemStack second) { + if (!first.isOf(second.getItem())) { + return false; + } + if (first.getDamage() != second.getDamage()) { + return false; + } + if (first.getCount() + second.getCount() > first.getMaxCount()) { + return false; + } + return ItemStack.areNbtEqual(first, second); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java new file mode 100644 index 000000000..bf7d21a3e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -0,0 +1,39 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class WorldUtil { + public static boolean hasSkyLight(World world) { + return world.getDimension().hasSkyLight(); + } + + public static boolean isThundering(World world) { + return world.isThundering(); + } + + public static boolean isRaining(World world) { + return world.isRaining(); + } + + public static boolean isNight(World world) { + return world.isNight(); + } + + public static boolean isDay(World world) { + return world.isDay(); + } + + public static boolean isSkyVisible(World world, BlockPos pos) { + return world.isSkyVisible(pos); + } + + public static boolean isClient(World world) { + return world.isClient(); + } + + public static boolean isServer(World world) { + return !isClient(world); + } + +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/ExtendWorld.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/ExtendWorld.java new file mode 100644 index 000000000..4d74d03a8 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/ExtendWorld.java @@ -0,0 +1,48 @@ +package ml.pkom.mcpitanlibarch.api.world; + +import ml.pkom.mcpitanlibarch.api.util.WorldUtil; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class ExtendWorld { + public World world; + public ExtendWorld(World world) { + this.world = world; + } + + public boolean isDay() { + return WorldUtil.isDay(world); + } + + public boolean isThundering() { + return WorldUtil.isThundering(world); + } + + public boolean isSkyVisible(BlockPos pos) { + return WorldUtil.isSkyVisible(world, pos); + } + + public boolean isRaining() { + return WorldUtil.isRaining(world); + } + + public boolean hasSkyLight() { + return WorldUtil.hasSkyLight(world); + } + + public boolean isNight() { + return WorldUtil.isNight(world); + } + + public boolean isClient() { + return WorldUtil.isClient(world); + } + + public boolean isServer() { + return WorldUtil.isServer(world); + } + + public World getMinecraftWorld() { + return world; + } +} diff --git a/gradle.properties b/gradle.properties index 505523f91..53ec00810 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.2 archives_base_name=mcpitanlibarch -mod_version=1.1.7-1.19 +mod_version=1.1.8-1.19 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 339f5799b0aa9fb96f45909d21d785ab8d256562 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 8 Dec 2022 13:48:50 +0900 Subject: [PATCH 041/622] temporarily remove Forge 1.19.3-pre --- common/build.gradle | 2 +- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 13 +++++++------ settings.gradle | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 22df1ed86..91343bdc5 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,7 +7,7 @@ dependencies { } architectury { - common() + common(forgeEnabled.toBoolean()) } publishing { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 69a8c0981..39db68a73 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -31,6 +31,6 @@ ], "depends": { "fabricloader": "*", - "minecraft": ">=1.19" + "minecraft": ">1.19.2" } } diff --git a/gradle.properties b/gradle.properties index 53ec00810..68c865ed2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,18 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.19.2 +minecraft_version=1.19.3-rc3 archives_base_name=mcpitanlibarch -mod_version=1.1.8-1.19 +mod_version=1.1.8-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=6.3.49 +architectury_version=7.0.59 # https://fabricmc.net/develop/ -fabric_loader_version=0.14.10 -yarn_mappings=1.19.2+build.28 -fabric_api_version=0.64.0+1.19.2 +fabric_loader_version=0.14.11 +yarn_mappings=1.19.3-rc3+build.1 +fabric_api_version=0.68.1+1.19.3 # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.19.2-43.1.27 +forgeEnabled=false \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 06a89e44e..dad7c8b8c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,4 +9,5 @@ pluginManagement { include("common") include("fabric") -include("forge") \ No newline at end of file +if (forgeEnabled.toBoolean()) + include("forge") \ No newline at end of file From c9cbcca91abaa1bf34739790dfbece923cf79aff Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 8 Dec 2022 14:33:31 +0900 Subject: [PATCH 042/622] Port to 1.19.3 --- .../api/entity/ExtendEntity.java | 3 ++- .../api/registry/ArchRegistry.java | 24 +++++++++---------- .../pkom/mcpitanlibarch/api/tag/TagKey.java | 18 +++++++------- .../mcpitanlibarch/api/util/BlockUtil.java | 10 ++++---- .../mcpitanlibarch/api/util/ItemUtil.java | 10 ++++---- .../api/util/client/ScreenUtil.java | 2 +- 6 files changed, 34 insertions(+), 33 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java index e4e7126c2..a5431c660 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java @@ -5,6 +5,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.Packet; +import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.world.World; public class ExtendEntity extends Entity { @@ -23,7 +24,7 @@ public void writeCustomDataToNbt(NbtCompound nbt) { } - public Packet createSpawnPacket() { + public Packet createSpawnPacket() { return null; } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 3b198d5cd..49b7fcfa3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -2,23 +2,23 @@ import com.google.common.base.Suppliers; import dev.architectury.registry.registries.Registrar; -import dev.architectury.registry.registries.Registries; +import dev.architectury.registry.registries.RegistrarManager; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; +import net.minecraft.registry.RegistryKeys; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import java.util.function.Supplier; public class ArchRegistry { - public Supplier REGISTRIES; + public Supplier REGISTRIES; public Registrar ITEMS; public Registrar BLOCKS; @@ -29,15 +29,15 @@ public class ArchRegistry { public Registrar FLUID; public ArchRegistry(String MOD_ID) { - REGISTRIES = Suppliers.memoize(() -> Registries.get(MOD_ID)); - - ITEMS = REGISTRIES.get().get(Registry.ITEM_KEY); - BLOCKS = REGISTRIES.get().get(Registry.BLOCK_KEY); - SCREEN_HANDLER_TYPE = REGISTRIES.get().get(Registry.MENU_KEY); - BLOCK_ENTITY_TYPE = REGISTRIES.get().get(Registry.BLOCK_ENTITY_TYPE_KEY); - ENTITY_TYPE = REGISTRIES.get().get(Registry.ENTITY_TYPE_KEY); - SOUND_EVENT = REGISTRIES.get().get(Registry.SOUND_EVENT_KEY); - FLUID = REGISTRIES.get().get(Registry.FLUID_KEY); + REGISTRIES = Suppliers.memoize(() -> RegistrarManager.get(MOD_ID)); + + ITEMS = REGISTRIES.get().get(RegistryKeys.ITEM); + BLOCKS = REGISTRIES.get().get(RegistryKeys.BLOCK); + SCREEN_HANDLER_TYPE = REGISTRIES.get().get(RegistryKeys.SCREEN_HANDLER); + BLOCK_ENTITY_TYPE = REGISTRIES.get().get(RegistryKeys.BLOCK_ENTITY_TYPE); + ENTITY_TYPE = REGISTRIES.get().get(RegistryKeys.ENTITY_TYPE); + SOUND_EVENT = REGISTRIES.get().get(RegistryKeys.SOUND_EVENT); + FLUID = REGISTRIES.get().get(RegistryKeys.FLUID); } public static ArchRegistry createRegistry(String MOD_ID) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java index 3ee2dea21..a634c4dac 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java @@ -1,28 +1,28 @@ package ml.pkom.mcpitanlibarch.api.tag; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryEntry; public class TagKey { - private final net.minecraft.tag.TagKey tagKey; + private final net.minecraft.registry.tag.TagKey tagKey; @Deprecated - public TagKey(net.minecraft.tag.TagKey tagKey) { + public TagKey(net.minecraft.registry.tag.TagKey tagKey) { this.tagKey = tagKey; } public static TagKey create(Type type, Identifier identifier) { return switch (type) { - case BLOCK -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.BLOCK_KEY, identifier)); - case ITEM -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.ITEM_KEY, identifier)); - case FLUID -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.FLUID_KEY, identifier)); - case ENTITY_TYPE -> new TagKey<>(net.minecraft.tag.TagKey.of(Registry.ENTITY_TYPE_KEY, identifier)); + case BLOCK -> new TagKey<>(net.minecraft.registry.tag.TagKey.of(RegistryKeys.BLOCK, identifier)); + case ITEM -> new TagKey<>(net.minecraft.registry.tag.TagKey.of(RegistryKeys.ITEM, identifier)); + case FLUID -> new TagKey<>(net.minecraft.registry.tag.TagKey.of(RegistryKeys.FLUID, identifier)); + case ENTITY_TYPE -> new TagKey<>(net.minecraft.registry.tag.TagKey.of(RegistryKeys.ENTITY_TYPE, identifier)); }; } @Deprecated - public net.minecraft.tag.TagKey getTagKey() { + public net.minecraft.registry.tag.TagKey getTagKey() { return tagKey; } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index f618e4bb5..7ff2c4b83 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -3,12 +3,12 @@ import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; public class BlockUtil { public static Block block(Identifier id) { - return Registry.BLOCK.get(id); + return Registries.BLOCK.get(id); } /** @@ -32,14 +32,14 @@ public static AbstractBlock.Settings requiresTool(AbstractBlock.Settings setting } public static boolean isExist(Identifier identifier) { - return Registry.BLOCK.containsId(identifier); + return Registries.BLOCK.containsId(identifier); } public static Identifier toID(Block block) { - return Registry.BLOCK.getId(block); + return Registries.BLOCK.getId(block); } public static Block fromId(Identifier identifier) { - return Registry.BLOCK.get(identifier); + return Registries.BLOCK.get(identifier); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index a34effd88..7c9eb5706 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -3,12 +3,12 @@ import ml.pkom.mcpitanlibarch.api.tag.TagKey; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; public class ItemUtil { public static Item item(Identifier id) { - return Registry.ITEM.get(id); + return Registries.ITEM.get(id); } public static boolean isEqual(Item item, Item item2) { @@ -28,13 +28,13 @@ public static boolean isIn(Item item, TagKey tagKey) { } public static boolean isExist(Identifier identifier) { - return Registry.ITEM.containsId(identifier); + return Registries.ITEM.containsId(identifier); } public static Identifier toID(Item item) { - return Registry.ITEM.getId(item); + return Registries.ITEM.getId(item); } public static Item fromId(Identifier identifier) { - return Registry.ITEM.get(identifier); + return Registries.ITEM.get(identifier); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index ef22862d1..efb449867 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -9,7 +9,7 @@ @Environment(EnvType.CLIENT) public class ScreenUtil { public static void setBackground(Identifier GUI, float f, float g, float h, float i) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderColor(f, g, h, i); RenderSystem.setShaderTexture(0, GUI); From f884572cac48dbeb063e44424ff94487448f6dcb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 8 Dec 2022 14:33:45 +0900 Subject: [PATCH 043/622] Port to 1.19.3 & Add API --- .../api/gui/SimpleScreenHandler.java | 8 +++++-- .../api/item/DefaultItemGroups.java | 21 +++++++++++++++++++ .../api/item/ExtendSettings.java | 20 ++++++++++++++++++ .../pkom/mcpitanlibarch/test/ExampleMod.java | 11 ++++++---- .../test/ExampleScreenHandler.java | 5 +++-- 5 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java index 2b104c42f..b00e10ef2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java @@ -116,8 +116,7 @@ protected List addSlotsY(Inventory inventory, int firstIndex, int x, int f return slots; } - @Override - public ItemStack transferSlot(PlayerEntity player, int index) { + public ItemStack quickMoveOverride(PlayerEntity player, int index) { ItemStack itemStack = ItemStack.EMPTY; Slot slot = this.slots.get(index); if (slot.hasStack()) { @@ -146,4 +145,9 @@ public ItemStack transferSlot(PlayerEntity player, int index) { return itemStack; } + + @Override + public ItemStack quickMove(PlayerEntity player, int slot) { + return quickMoveOverride(player, slot); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java new file mode 100644 index 000000000..884a7b991 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java @@ -0,0 +1,21 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemGroups; + +public class DefaultItemGroups { + public static final ItemGroup BUILDING_BLOCKS = ItemGroups.getGroups().get(0); + public static final ItemGroup COLORED_BLOCKS = ItemGroups.getGroups().get(1); + public static final ItemGroup NATURAL = ItemGroups.getGroups().get(2); + public static final ItemGroup FUNCTIONAL = ItemGroups.getGroups().get(3); + public static final ItemGroup REDSTONE = ItemGroups.getGroups().get(4); + public static final ItemGroup HOTBAR = ItemGroups.getGroups().get(5); + public static final ItemGroup SEARCH = ItemGroups.getGroups().get(6); + public static final ItemGroup TOOLS = ItemGroups.getGroups().get(7); + public static final ItemGroup COMBAT = ItemGroups.getGroups().get(8); + public static final ItemGroup FOOD_AND_DRINK = ItemGroups.getGroups().get(9); + public static final ItemGroup INGREDIENTS = ItemGroups.getGroups().get(10); + public static final ItemGroup SPAWN_EGGS = ItemGroups.getGroups().get(11); + public static final ItemGroup OPERATOR = ItemGroups.getGroups().get(12); + public static final ItemGroup INVENTORY = ItemGroups.getGroups().get(13); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java new file mode 100644 index 000000000..2e5ecf900 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import dev.architectury.registry.CreativeTabRegistry; +import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.util.Identifier; + +public class ExtendSettings extends Item.Settings { + public ExtendSettings addGroup(ItemGroup itemGroup) { + return this; + } + + // Support 1.19.3～ + // identifier: Item ID + public ExtendSettings addGroup(ItemGroup itemGroup, Identifier identifier) { + CreativeTabRegistry.append(itemGroup, ItemUtil.fromId(identifier)); + return this; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java index 9b6069a9e..e706cd78e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -2,6 +2,8 @@ import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; +import ml.pkom.mcpitanlibarch.api.item.DefaultItemGroups; +import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; @@ -9,6 +11,7 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemGroups; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; import org.apache.logging.log4j.Level; @@ -40,14 +43,14 @@ public static Identifier id(String id) { public static RegistryEvent EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER; public static void init() { - EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new Item(new Item.Settings().group(ItemGroup.MISC))); + EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new Item(new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS, id("example_item")))); EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new Block(AbstractBlock.Settings.of(Material.STONE))); - EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); + EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); - EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new Item.Settings().group(ItemGroup.MISC))); + EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(AbstractBlock.Settings.of(Material.STONE))); - EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> new BlockItem(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new Item.Settings().group(ItemGroup.MISC))); + EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> new BlockItem(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); registry.allRegister(); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java index 4de89b1c6..66a688d6e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java @@ -1,11 +1,12 @@ package ml.pkom.mcpitanlibarch.test; +import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandler; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; -public class ExampleScreenHandler extends ScreenHandler { +public class ExampleScreenHandler extends SimpleScreenHandler { public ExampleScreenHandler(int i, PlayerInventory playerInventory) { super(ExampleMod.supplierEXAMPLE_SCREENHANDLER.getOrNull(), i); @@ -13,7 +14,7 @@ public ExampleScreenHandler(int i, PlayerInventory playerInventory) { } @Override - public ItemStack transferSlot(PlayerEntity player, int index) { + public ItemStack quickMoveOverride(PlayerEntity player, int slot) { return null; } From 208f0e746fb4be30cab2804a59510f509db6a35e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 8 Dec 2022 14:54:15 +0900 Subject: [PATCH 044/622] version info --- .../api/item/DefaultItemGroups.java | 22 ++++++++++++------- gradle.properties | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java index 884a7b991..db529f75f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java @@ -5,17 +5,23 @@ public class DefaultItemGroups { public static final ItemGroup BUILDING_BLOCKS = ItemGroups.getGroups().get(0); - public static final ItemGroup COLORED_BLOCKS = ItemGroups.getGroups().get(1); - public static final ItemGroup NATURAL = ItemGroups.getGroups().get(2); - public static final ItemGroup FUNCTIONAL = ItemGroups.getGroups().get(3); + public static final ItemGroup COLORED_BLOCKS = ItemGroups.getGroups().get(1); // if 1.19.2 and below, BUILDING_BLOCKS + public static final ItemGroup NATURAL = ItemGroups.getGroups().get(2); // if 1.19.2 and below, DECORATIONS + public static final ItemGroup FUNCTIONAL = ItemGroups.getGroups().get(3); // if 1.19.2 and below, TRANSPORTATION public static final ItemGroup REDSTONE = ItemGroups.getGroups().get(4); public static final ItemGroup HOTBAR = ItemGroups.getGroups().get(5); public static final ItemGroup SEARCH = ItemGroups.getGroups().get(6); public static final ItemGroup TOOLS = ItemGroups.getGroups().get(7); public static final ItemGroup COMBAT = ItemGroups.getGroups().get(8); - public static final ItemGroup FOOD_AND_DRINK = ItemGroups.getGroups().get(9); - public static final ItemGroup INGREDIENTS = ItemGroups.getGroups().get(10); - public static final ItemGroup SPAWN_EGGS = ItemGroups.getGroups().get(11); - public static final ItemGroup OPERATOR = ItemGroups.getGroups().get(12); + public static final ItemGroup FOOD_AND_DRINK = ItemGroups.getGroups().get(9); // if 1.19.2 and below, FOOD + public static final ItemGroup INGREDIENTS = ItemGroups.getGroups().get(10); // if 1.19.2 and below, MISC + public static final ItemGroup SPAWN_EGGS = ItemGroups.getGroups().get(11); // if 1.19.2 and below, MISC + public static final ItemGroup OPERATOR = ItemGroups.getGroups().get(12); // if 1.19.2 and below, MISC public static final ItemGroup INVENTORY = ItemGroups.getGroups().get(13); -} + + // ～1.19.2 Item Group + public static final ItemGroup BREWING = FOOD_AND_DRINK; + public static final ItemGroup TRANSPORTATION = FUNCTIONAL; + public static final ItemGroup DECORATIONS = NATURAL; + public static final ItemGroup MISC = INGREDIENTS; +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 68c865ed2..9e113d781 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3-rc3 archives_base_name=mcpitanlibarch -mod_version=1.1.8-1.19.3 +mod_version=1.2.0-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 4fac4581db724d3ec9512351e97f29d3fd624375 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 9 Dec 2022 13:05:40 +0900 Subject: [PATCH 045/622] a --- .../api/item/CreativeTabManager.java | 47 +++++++++++++++++++ .../api/item/ExtendSettings.java | 8 +++- .../api/registry/ArchRegistry.java | 6 ++- gradle.properties | 4 +- php/upload_curseforge.bat | 2 + php/upload_maven.bat | 2 + 6 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java create mode 100644 php/upload_curseforge.bat create mode 100644 php/upload_maven.bat diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java new file mode 100644 index 000000000..8601411f8 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -0,0 +1,47 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import dev.architectury.registry.CreativeTabRegistry; +import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.minecraft.item.ItemGroup; +import net.minecraft.util.Identifier; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class CreativeTabManager { + private static final List bookingItems = new ArrayList<>(); + + // グループ予約済みアイテム + public static class BookingItem { + public ItemGroup itemGroup; + public Identifier identifier; + private BookingItem(ItemGroup itemGroup, Identifier identifier) { + this.itemGroup = itemGroup; + this.identifier = identifier; + } + } + + public static void allRegister() { + if (bookingItems.isEmpty()) return; + for (BookingItem bookingItem : bookingItems) { + CreativeTabRegistry.append(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); + bookingItems.remove(bookingItem); + } + } + + public static void register(Identifier identifier) { + if (bookingItems.isEmpty()) return; + for (BookingItem bookingItem : bookingItems) { + if (!bookingItem.identifier.toString().equals(identifier.toString())) continue; + CreativeTabRegistry.append(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); + bookingItems.remove(bookingItem); + break; + } + } + + public static void addItem(ItemGroup itemGroup, Identifier identifier) { + bookingItems.add(new BookingItem(itemGroup, identifier)); + + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java index 2e5ecf900..30834b35f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java @@ -6,7 +6,11 @@ import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; +import java.util.ArrayList; +import java.util.List; + public class ExtendSettings extends Item.Settings { + public ExtendSettings addGroup(ItemGroup itemGroup) { return this; } @@ -14,7 +18,9 @@ public ExtendSettings addGroup(ItemGroup itemGroup) { // Support 1.19.3～ // identifier: Item ID public ExtendSettings addGroup(ItemGroup itemGroup, Identifier identifier) { - CreativeTabRegistry.append(itemGroup, ItemUtil.fromId(identifier)); + CreativeTabManager.addItem(itemGroup, identifier); return this; } + + } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 49b7fcfa3..6c2aaf374 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -3,7 +3,9 @@ import com.google.common.base.Suppliers; import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrarManager; +import dev.architectury.registry.registries.RegistrySupplier; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; +import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; @@ -45,7 +47,9 @@ public static ArchRegistry createRegistry(String MOD_ID) { } public RegistryEvent registerItem(Identifier id, Supplier supplier) { - return new RegistryEvent<>(ITEMS.register(id, supplier)); + RegistrySupplier registrySupplier = ITEMS.register(id, supplier); + CreativeTabManager.register(id); + return new RegistryEvent<>(registrySupplier); } public RegistryEvent registerBlock(Identifier id, Supplier supplier) { diff --git a/gradle.properties b/gradle.properties index 9e113d781..1accfc0ba 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.19.3-rc3 +minecraft_version=1.19.3 archives_base_name=mcpitanlibarch mod_version=1.2.0-1.19.3 maven_group=ml.pkom @@ -10,7 +10,7 @@ architectury_version=7.0.59 # https://fabricmc.net/develop/ fabric_loader_version=0.14.11 -yarn_mappings=1.19.3-rc3+build.1 +yarn_mappings=1.19.3+build.2 fabric_api_version=0.68.1+1.19.3 # https://files.minecraftforge.net/net/minecraftforge/forge/ diff --git a/php/upload_curseforge.bat b/php/upload_curseforge.bat new file mode 100644 index 000000000..668dab2c9 --- /dev/null +++ b/php/upload_curseforge.bat @@ -0,0 +1,2 @@ +php upload_curseforge.php +pause \ No newline at end of file diff --git a/php/upload_maven.bat b/php/upload_maven.bat new file mode 100644 index 000000000..34860da53 --- /dev/null +++ b/php/upload_maven.bat @@ -0,0 +1,2 @@ +php upload_maven.php +pause \ No newline at end of file From 3421c6b9cf914bb5406085f6b8b0d41e7c648606 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 9 Dec 2022 13:09:49 +0900 Subject: [PATCH 046/622] a --- fabric/src/main/resources/fabric.mod.json | 3 ++- gradle.properties | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 39db68a73..ae2840788 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -30,7 +30,8 @@ "mcpitanlibarch-common.mixins.json" ], "depends": { + "minecraft": ">1.19.2", "fabricloader": "*", - "minecraft": ">1.19.2" + "architectury": "*" } } diff --git a/gradle.properties b/gradle.properties index 1accfc0ba..06b118ea2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,11 +2,11 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.0-1.19.3 +mod_version=1.2.1-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=7.0.59 +architectury_version=7.0.64 # https://fabricmc.net/develop/ fabric_loader_version=0.14.11 @@ -14,5 +14,5 @@ yarn_mappings=1.19.3+build.2 fabric_api_version=0.68.1+1.19.3 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.19.2-43.1.27 -forgeEnabled=false \ No newline at end of file +forge_version=1.19.3-44.0.1 +forgeEnabled=true \ No newline at end of file From 74ee71ef3211a2f82dc4c6ca0b5d234782f00acb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 9 Dec 2022 16:33:08 +0900 Subject: [PATCH 047/622] Add API1193 --- .../api/item/CreativeTabBuilder.java | 74 +++++++++++++++++++ .../api/item/CreativeTabManager.java | 1 - .../api/item/ExtendSettings.java | 3 +- .../api/registry/ArchRegistry.java | 9 +++ 4 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java new file mode 100644 index 000000000..635a405e1 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java @@ -0,0 +1,74 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import dev.architectury.registry.CreativeTabRegistry; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +import java.util.function.Supplier; + +public class CreativeTabBuilder { + + private final Identifier identifier; + private Text displayName = null; + private Supplier iconSupplier = null; + private boolean noRenderedName = false; + private boolean noScrollbar = false; + private boolean special = false; + private String texture; + + public CreativeTabBuilder(Identifier identifier) { + this.identifier = identifier; + } + + public CreativeTabBuilder create(Identifier identifier) { + return new CreativeTabBuilder(identifier); + } + + public CreativeTabBuilder setDisplayName(Text text) { + this.displayName = text; + return this; + } + + public CreativeTabBuilder setIcon(Supplier iconSupplier) { + this.iconSupplier = iconSupplier; + return this; + } + + public CreativeTabBuilder setIcon(Item item) { + return setIcon(() -> new ItemStack(item)); + } + + public void noRenderedName() { + this.noRenderedName = true; + } + + public void noScrollbar() { + this.noScrollbar = true; + } + + public void special() { + this.special = true; + } + + public void setTexture(String texture) { + this.texture = texture; + } + + public ItemGroup build() { + CreativeTabRegistry.TabSupplier tabSupplier = CreativeTabRegistry.create(identifier, (builder -> { + if (displayName != null) builder.displayName(displayName); + if (iconSupplier != null) builder.icon(iconSupplier); + if (noRenderedName) builder.noRenderedName(); + if (noScrollbar) builder.noScrollbar(); + if (special) builder.special(); + if (texture != null) builder.texture(texture); + builder.build(); + })); + return tabSupplier.get(); + } + + +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java index 8601411f8..ab1637a22 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Objects; public class CreativeTabManager { private static final List bookingItems = new ArrayList<>(); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java index 30834b35f..74edb916f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java @@ -11,11 +11,12 @@ public class ExtendSettings extends Item.Settings { + // ～1.19.2 public ExtendSettings addGroup(ItemGroup itemGroup) { return this; } - // Support 1.19.3～ + // 1.19.3～ // identifier: Item ID public ExtendSettings addGroup(ItemGroup itemGroup, Identifier identifier) { CreativeTabManager.addItem(itemGroup, identifier); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 6c2aaf374..bcc16ec0b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -72,10 +72,19 @@ public RegistryEvent> registerEntity(Identifier id, Supplier(ENTITY_TYPE.register(id, supplier)); } + @Deprecated public RegistryEvent registerSoundEvent(Identifier id, Supplier supplier) { return new RegistryEvent<>(SOUND_EVENT.register(id, supplier)); } + public RegistryEvent registerSoundEvent(Identifier id) { + return registerSoundEvent(id, () -> SoundEvent.of(id)); + } + + public RegistryEvent registerSoundEvent(Identifier id, float distanceToTravel) { + return registerSoundEvent(id, () -> SoundEvent.of(id, distanceToTravel)); + } + public RegistryEvent registerFluid(Identifier id, Supplier supplier) { return new RegistryEvent<>(FLUID.register(id, supplier)); } From d1c3da64a928a21dacded784009a84b05f20fcaf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 9 Dec 2022 16:33:40 +0900 Subject: [PATCH 048/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 06b118ea2..f7c0a9823 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.1-1.19.3 +mod_version=1.2.2-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 8c04965180e9bb6e136cb2ca675d4fa472d1f1e7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 9 Dec 2022 17:35:36 +0900 Subject: [PATCH 049/622] add APIs --- .../mcpitanlibarch/api/item/CreativeTabBuilder.java | 1 - .../ml/pkom/mcpitanlibarch/api/util/BlockUtil.java | 11 +++++++++++ .../ml/pkom/mcpitanlibarch/api/util/ItemUtil.java | 11 +++++++++++ .../pkom/mcpitanlibarch/api/util/PlatformUtil.java | 4 ++++ .../mcpitanlibarch/api/util/ScreenHandlerUtil.java | 13 +++++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java index 635a405e1..7834c8273 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java @@ -65,7 +65,6 @@ public ItemGroup build() { if (noScrollbar) builder.noScrollbar(); if (special) builder.special(); if (texture != null) builder.texture(texture); - builder.build(); })); return tabSupplier.get(); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index 7ff2c4b83..2c0f2239f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -6,6 +6,9 @@ import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; +import java.util.ArrayList; +import java.util.List; + public class BlockUtil { public static Block block(Identifier id) { return Registries.BLOCK.get(id); @@ -42,4 +45,12 @@ public static Identifier toID(Block block) { public static Block fromId(Identifier identifier) { return Registries.BLOCK.get(identifier); } + + public static List getAllBlocks() { + List blocks = new ArrayList<>(); + for (Block block : Registries.BLOCK) { + blocks.add(block); + } + return blocks; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index 7c9eb5706..85a1eb042 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -6,6 +6,9 @@ import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; +import java.util.ArrayList; +import java.util.List; + public class ItemUtil { public static Item item(Identifier id) { return Registries.ITEM.get(id); @@ -37,4 +40,12 @@ public static Identifier toID(Item item) { public static Item fromId(Identifier identifier) { return Registries.ITEM.get(identifier); } + + public static List getAllItems() { + List items = new ArrayList<>(); + for (Item item : Registries.ITEM) { + items.add(item); + } + return items; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java index 14bf63556..975164401 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java @@ -51,4 +51,8 @@ public static Collection getModIds() { public static EnvType getEnv() { return Platform.getEnv(); } + + public static String getGameVersion() { + return Platform.getMinecraftVersion(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java index 145931558..db7bd1ebe 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java @@ -1,11 +1,24 @@ package ml.pkom.mcpitanlibarch.api.util; +import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; import net.minecraft.util.collection.DefaultedList; +import java.util.ArrayList; +import java.util.List; + public class ScreenHandlerUtil { public static DefaultedList getSlots(ScreenHandler screenHandler) { return screenHandler.slots; } + + public static List> getAllScreenHandlerTypes() { + List> screenHandlerTypes = new ArrayList<>(); + for (ScreenHandlerType screenHandler : Registries.SCREEN_HANDLER) { + screenHandlerTypes.add(screenHandler); + } + return screenHandlerTypes; + } } From e2ff349db748d7718fbd1e970cd44189e380eb2e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 9 Dec 2022 17:35:43 +0900 Subject: [PATCH 050/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f7c0a9823..33fcaf9c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.2-1.19.3 +mod_version=1.2.3-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 0e4f2f7b96c2bcd05d90be266f60ad9ba97375e7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 14:29:38 +0900 Subject: [PATCH 051/622] Change Command API --- .../api/command/AbstractCommand.java | 20 ++++--- .../api/command/CommandRegistry.java | 54 ++++++++++++++----- .../api/command/CommandSettings.java | 4 ++ .../api/command/LiteralCommand.java | 6 +++ .../api/command/RequiredCommand.java | 9 ++++ .../api/event/CommandEvent.java | 24 +++++++++ .../api/event/ServerCommandEvent.java | 3 +- .../mcpitanlibarch/test/ExampleCommand.java | 5 +- 8 files changed, 102 insertions(+), 23 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java index c4427a6f9..f1f326a03 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java @@ -4,14 +4,20 @@ import java.util.*; -public abstract class AbstractCommand { +public abstract class AbstractCommand { - private Map argumentCommands = new HashMap<>(); + private Map> argumentCommands = new HashMap<>(); public int isSuccess = 1; - abstract public void init(); + public void init() { - abstract public void execute(ServerCommandEvent event); + } + + public void init(CommandSettings settings) { + init(); + } + + abstract public void execute(T event); public void success() { isSuccess = 1; @@ -21,15 +27,15 @@ public void failure() { isSuccess = 0; } - public Map getArgumentCommands() { + public Map> getArgumentCommands() { return argumentCommands; } - public void setArgumentCommands(Map argumentCommands) { + public void setArgumentCommands(Map> argumentCommands) { this.argumentCommands = argumentCommands; } - public void addArgumentCommand(String name, AbstractCommand command) { + public void addArgumentCommand(String name, AbstractCommand command) { getArgumentCommands().put(name, command); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java index e25ef95e7..209d86523 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java @@ -1,14 +1,20 @@ package ml.pkom.mcpitanlibarch.api.command; +import com.mojang.brigadier.arguments.ArgumentType; +import com.mojang.brigadier.arguments.StringArgumentType; +import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.builder.RequiredArgumentBuilder; import dev.architectury.event.events.common.CommandRegistrationEvent; +import ml.pkom.mcpitanlibarch.api.event.CommandEvent; import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.command.argument.ArgumentTypes; import net.minecraft.server.command.ServerCommandSource; import java.util.Map; public class CommandRegistry { - public static void register(String name, AbstractCommand command) { + public static void register(String name, LiteralCommand command) { command.init(); LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal(name) .executes(context -> { @@ -25,18 +31,42 @@ public static void register(String name, AbstractCommand command) { ); } - private static void forArgsCmd(AbstractCommand command, LiteralArgumentBuilder builder) { - if (!command.getArgumentCommands().isEmpty()) { - for (Map.Entry argCmd : command.getArgumentCommands().entrySet()) { - argCmd.getValue().init(); - LiteralArgumentBuilder builder2 = builder.then(LiteralArgumentBuilder.literal(argCmd.getKey()).executes(context -> { - ServerCommandEvent event = new ServerCommandEvent(); - event.setContext(context); - argCmd.getValue().execute(event); - return argCmd.getValue().isSuccess; - })); - forArgsCmd(argCmd.getValue(), builder2); + private static void forArgsCmd(AbstractCommand absCmd, ArgumentBuilder builder) { + + if (!absCmd.getArgumentCommands().isEmpty()) { + // 引数コマンド + for (Map.Entry> argCmd : absCmd.getArgumentCommands().entrySet()) { + argCmd.getValue().init(new CommandSettings()); + + if (argCmd.getValue() instanceof RequiredCommand) { + RequiredCommand command = (RequiredCommand) argCmd.getValue(); + RequiredArgumentBuilder builder2 = ((RequiredArgumentBuilder) builder).then(RequiredArgumentBuilder.argument(command.getArgumentName(), command.getArgumentType()) + .executes(context -> { + ServerCommandEvent event = new ServerCommandEvent(); + event.setContext(context); + command.execute(event); + return command.isSuccess; + } + )); + forArgsCmd(command, builder2); + continue; + } + if (argCmd.getValue() instanceof LiteralCommand) { + LiteralCommand command = (LiteralCommand) argCmd.getValue(); + LiteralArgumentBuilder builder2 = ((LiteralArgumentBuilder) builder).then(LiteralArgumentBuilder.literal(argCmd.getKey()) + .executes(context -> { + ServerCommandEvent event = new ServerCommandEvent(); + event.setContext(context); + command.execute(event); + return command.isSuccess; + } + )); + forArgsCmd(command, builder2); + } } } + + + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java new file mode 100644 index 000000000..67af43000 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java @@ -0,0 +1,4 @@ +package ml.pkom.mcpitanlibarch.api.command; + +public class CommandSettings { +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java new file mode 100644 index 000000000..1b3d4cb9c --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java @@ -0,0 +1,6 @@ +package ml.pkom.mcpitanlibarch.api.command; + +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; + +public abstract class LiteralCommand extends AbstractCommand { +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java new file mode 100644 index 000000000..02effff7b --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java @@ -0,0 +1,9 @@ +package ml.pkom.mcpitanlibarch.api.command; + +import com.mojang.brigadier.arguments.ArgumentType; + +public abstract class RequiredCommand extends AbstractCommand { + public abstract String getArgumentName(); + + public abstract ArgumentType getArgumentType(); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java new file mode 100644 index 000000000..ca0ddd4da --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java @@ -0,0 +1,24 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.context.CommandContext; +import com.mojang.brigadier.context.StringRange; + +public class CommandEvent { + public CommandContext context; + + public CommandContext getContext() { + return context; + } + + public void setContext(CommandContext context) { + this.context = context; + } + + public String getInput() { + return context.getInput(); + } + + public StringRange getRange() { + return context.getRange(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java index bd69d38da..f6a733e6d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java @@ -11,8 +11,7 @@ import net.minecraft.text.Text; import net.minecraft.world.World; -public class ServerCommandEvent { - public CommandContext context; +public class ServerCommandEvent extends CommandEvent { public CommandContext getContext() { return context; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java index 8436808f0..cf6f04a94 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java @@ -2,14 +2,15 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; +import ml.pkom.mcpitanlibarch.api.command.LiteralCommand; import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; import net.minecraft.item.ItemStack; -public class ExampleCommand extends AbstractCommand { +public class ExampleCommand extends LiteralCommand { @Override public void init() { - addArgumentCommand("item", new AbstractCommand() { + addArgumentCommand("item", new LiteralCommand() { @Override public void init() { From be478dd04e0ca8d5114fe3abeca564b8807facba Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 14:33:32 +0900 Subject: [PATCH 052/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 33fcaf9c4..fab8877c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.3-1.19.3 +mod_version=1.2.4-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From bc34d1f42aa73e922ad1046f0da6826cc839cd68 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 16:56:53 +0900 Subject: [PATCH 053/622] Change Command API 1.19 --- .../api/command/AbstractCommand.java | 20 +++-- .../api/command/CommandRegistry.java | 82 +++++++++++++------ .../api/command/CommandSettings.java | 29 +++++++ .../api/command/LiteralCommand.java | 1 + .../api/command/RequiredCommand.java | 9 -- .../api/command/argument/EntitiesCommand.java | 20 +++++ .../api/command/argument/EntityCommand.java | 20 +++++ .../command/argument/GreedyStringCommand.java | 12 +++ .../api/command/argument/IntegerCommand.java | 19 +++++ .../api/command/argument/ItemCommand.java | 21 +++++ .../api/command/argument/PlayerCommand.java | 20 +++++ .../api/command/argument/PlayersCommand.java | 21 +++++ .../api/command/argument/RequiredCommand.java | 11 +++ .../api/command/argument/StringCommand.java | 19 +++++ .../api/event/CommandEvent.java | 10 +++ .../api/event/EntitiesCommandEvent.java | 16 ++++ .../api/event/EntityCommandEvent.java | 16 ++++ .../api/event/IntegerCommandEvent.java | 10 +++ .../api/event/ItemCommandEvent.java | 11 +++ .../api/event/PlayerCommandEvent.java | 16 ++++ .../api/event/PlayersCommandEvent.java | 16 ++++ .../api/event/RequiredCommandEvent.java | 5 ++ .../api/event/ServerCommandEvent.java | 2 +- .../api/event/StringCommandEvent.java | 10 +++ .../mcpitanlibarch/test/ExampleCommand.java | 23 +++++- 25 files changed, 395 insertions(+), 44 deletions(-) delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntitiesCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntityCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/GreedyStringCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/IntegerCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/ItemCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayerCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayersCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/RequiredCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/StringCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntitiesCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntityCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/IntegerCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ItemCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayerCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayersCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/RequiredCommandEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/StringCommandEvent.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java index f1f326a03..3d464fd72 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java @@ -1,12 +1,14 @@ package ml.pkom.mcpitanlibarch.api.command; +import ml.pkom.mcpitanlibarch.api.command.argument.RequiredCommand; import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; -import java.util.*; +import java.util.HashMap; +import java.util.Map; public abstract class AbstractCommand { - private Map> argumentCommands = new HashMap<>(); + private Map> argumentCommands = new HashMap<>(); public int isSuccess = 1; public void init() { @@ -17,8 +19,6 @@ public void init(CommandSettings settings) { init(); } - abstract public void execute(T event); - public void success() { isSuccess = 1; } @@ -27,15 +27,21 @@ public void failure() { isSuccess = 0; } - public Map> getArgumentCommands() { + public Map> getArgumentCommands() { return argumentCommands; } - public void setArgumentCommands(Map> argumentCommands) { + public void setArgumentCommands(Map> argumentCommands) { this.argumentCommands = argumentCommands; } - public void addArgumentCommand(String name, AbstractCommand command) { + public void addArgumentCommand(String name, AbstractCommand command) { getArgumentCommands().put(name, command); } + + public void addArgumentCommand(RequiredCommand command) { + getArgumentCommands().put(command.getArgumentName(), command); + } + + public abstract void execute(ServerCommandEvent event); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java index 209d86523..aac57f9f8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java @@ -1,22 +1,27 @@ package ml.pkom.mcpitanlibarch.api.command; -import com.mojang.brigadier.arguments.ArgumentType; -import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.RequiredArgumentBuilder; import dev.architectury.event.events.common.CommandRegistrationEvent; -import ml.pkom.mcpitanlibarch.api.event.CommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; -import net.minecraft.command.argument.ArgumentTypes; +import ml.pkom.mcpitanlibarch.api.command.argument.*; +import ml.pkom.mcpitanlibarch.api.event.*; +import net.minecraft.command.CommandRegistryAccess; +import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import java.util.Map; public class CommandRegistry { + + @Deprecated + public static CommandRegistryAccess latestCommandRegistryAccess; + public static void register(String name, LiteralCommand command) { - command.init(); - LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal(name) + CommandSettings settings = new CommandSettings(); + command.init(settings); + + LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal(name).requires(settings::requires) .executes(context -> { ServerCommandEvent event = new ServerCommandEvent(); event.setContext(context); @@ -26,8 +31,14 @@ public static void register(String name, LiteralCommand command) { forArgsCmd(command, builder); - CommandRegistrationEvent.EVENT.register((dispatcher, registryAccess, environment) -> - dispatcher.register(builder) + register(builder); + } + + public static void register(LiteralArgumentBuilder builder) { + CommandRegistrationEvent.EVENT.register((dispatcher, registry, environment) -> { + latestCommandRegistryAccess = registry; + dispatcher.register(builder); + } ); } @@ -36,37 +47,60 @@ private static void forArgsCmd(AbstractCommand absCmd, ArgumentBuilder> argCmd : absCmd.getArgumentCommands().entrySet()) { + ArgumentBuilder nextBuilder = null; argCmd.getValue().init(new CommandSettings()); - if (argCmd.getValue() instanceof RequiredCommand) { - RequiredCommand command = (RequiredCommand) argCmd.getValue(); - RequiredArgumentBuilder builder2 = ((RequiredArgumentBuilder) builder).then(RequiredArgumentBuilder.argument(command.getArgumentName(), command.getArgumentType()) + if (argCmd.getValue() instanceof LiteralCommand) { + LiteralCommand command = (LiteralCommand) argCmd.getValue(); + nextBuilder = CommandManager.literal(argCmd.getKey()) .executes(context -> { ServerCommandEvent event = new ServerCommandEvent(); event.setContext(context); + event.setCommand(command); command.execute(event); return command.isSuccess; } - )); - forArgsCmd(command, builder2); - continue; + ); } - if (argCmd.getValue() instanceof LiteralCommand) { - LiteralCommand command = (LiteralCommand) argCmd.getValue(); - LiteralArgumentBuilder builder2 = ((LiteralArgumentBuilder) builder).then(LiteralArgumentBuilder.literal(argCmd.getKey()) + + if (argCmd.getValue() instanceof RequiredCommand) { + RequiredCommand command = (RequiredCommand) argCmd.getValue(); + + nextBuilder = CommandManager.argument(argCmd.getKey(), command.getArgumentType()) .executes(context -> { ServerCommandEvent event = new ServerCommandEvent(); + if (command instanceof IntegerCommand) { + event = new IntegerCommandEvent(); + } + if (command instanceof StringCommand) { + event = new StringCommandEvent(); + } + if (command instanceof EntityCommand) { + event = new EntityCommandEvent(); + } + if (command instanceof EntitiesCommand) { + event = new EntitiesCommandEvent(); + } + if (command instanceof PlayerCommand) { + event = new PlayerCommandEvent(); + } + if (command instanceof PlayersCommand) { + event = new PlayersCommandEvent(); + } + if (command instanceof ItemCommand) { + event = new ItemCommandEvent(); + } + event.setContext(context); + event.setCommand(command); command.execute(event); return command.isSuccess; } - )); - forArgsCmd(command, builder2); + ); } + forArgsCmd(argCmd.getValue(), nextBuilder); + ((LiteralArgumentBuilder) builder).then(nextBuilder); } } - - - } -} +} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java index 67af43000..69676a52f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java @@ -1,4 +1,33 @@ package ml.pkom.mcpitanlibarch.api.command; +import net.minecraft.server.command.ServerCommandSource; + public class CommandSettings { + private int permissionLevel = -1; + private ICustom iCustom = null; + + public boolean requires(ServerCommandSource source) { + + return customRequires(source) && (permissionLevel == -1 || source.hasPermissionLevel(permissionLevel)); + } + + private boolean customRequires(ServerCommandSource source) { + if (iCustom == null) return true; + return iCustom.custom(source); + } + + public CommandSettings permissionLevel(int level) { + this.permissionLevel = level; + return this; + } + + public CommandSettings custom(ICustom iCustom) { + this.iCustom = iCustom; + return this; + } + + @FunctionalInterface + public interface ICustom { + boolean custom(ServerCommandSource source); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java index 1b3d4cb9c..c0510c381 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java @@ -3,4 +3,5 @@ import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; public abstract class LiteralCommand extends AbstractCommand { + } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java deleted file mode 100644 index 02effff7b..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/RequiredCommand.java +++ /dev/null @@ -1,9 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.command; - -import com.mojang.brigadier.arguments.ArgumentType; - -public abstract class RequiredCommand extends AbstractCommand { - public abstract String getArgumentName(); - - public abstract ArgumentType getArgumentType(); -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntitiesCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntitiesCommand.java new file mode 100644 index 000000000..23f823ed8 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntitiesCommand.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import ml.pkom.mcpitanlibarch.api.event.EntitiesCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public abstract class EntitiesCommand extends RequiredCommand { + @Override + public EntityArgumentType getArgumentType() { + return EntityArgumentType.entities(); + } + + public abstract void execute(EntitiesCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((EntitiesCommandEvent) event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntityCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntityCommand.java new file mode 100644 index 000000000..fa098416e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntityCommand.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import ml.pkom.mcpitanlibarch.api.event.EntityCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public abstract class EntityCommand extends RequiredCommand { + @Override + public EntityArgumentType getArgumentType() { + return EntityArgumentType.entity(); + } + + public abstract void execute(EntityCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((EntityCommandEvent) event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/GreedyStringCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/GreedyStringCommand.java new file mode 100644 index 000000000..3be923519 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/GreedyStringCommand.java @@ -0,0 +1,12 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import com.mojang.brigadier.arguments.StringArgumentType; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.StringCommandEvent; + +public abstract class GreedyStringCommand extends StringCommand { + @Override + public StringArgumentType getArgumentType() { + return StringArgumentType.greedyString(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/IntegerCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/IntegerCommand.java new file mode 100644 index 000000000..b20f8b2d3 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/IntegerCommand.java @@ -0,0 +1,19 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import com.mojang.brigadier.arguments.IntegerArgumentType; +import ml.pkom.mcpitanlibarch.api.event.IntegerCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; + +public abstract class IntegerCommand extends RequiredCommand { + @Override + public IntegerArgumentType getArgumentType() { + return IntegerArgumentType.integer(); + } + + public abstract void execute(IntegerCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((IntegerCommandEvent) event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/ItemCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/ItemCommand.java new file mode 100644 index 000000000..02aea9182 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/ItemCommand.java @@ -0,0 +1,21 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; +import ml.pkom.mcpitanlibarch.api.event.ItemCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.command.argument.ItemStackArgumentType; +import net.minecraft.entity.Entity; + +public abstract class ItemCommand extends RequiredCommand { + @Override + public ItemStackArgumentType getArgumentType() { + return ItemStackArgumentType.itemStack(CommandRegistry.latestCommandRegistryAccess); + } + + public abstract void execute(ItemCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((ItemCommandEvent) event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayerCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayerCommand.java new file mode 100644 index 000000000..26c2353ca --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayerCommand.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import ml.pkom.mcpitanlibarch.api.event.PlayerCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public abstract class PlayerCommand extends RequiredCommand { + @Override + public EntityArgumentType getArgumentType() { + return EntityArgumentType.player(); + } + + public abstract void execute(PlayerCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((PlayerCommandEvent) event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayersCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayersCommand.java new file mode 100644 index 000000000..1d798f9de --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayersCommand.java @@ -0,0 +1,21 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import ml.pkom.mcpitanlibarch.api.event.EntityCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.PlayersCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public abstract class PlayersCommand extends RequiredCommand { + @Override + public EntityArgumentType getArgumentType() { + return EntityArgumentType.players(); + } + + public abstract void execute(PlayersCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((PlayersCommandEvent) event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/RequiredCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/RequiredCommand.java new file mode 100644 index 000000000..daca91561 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/RequiredCommand.java @@ -0,0 +1,11 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import com.mojang.brigadier.arguments.ArgumentType; +import com.mojang.brigadier.arguments.IntegerArgumentType; +import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; + +public abstract class RequiredCommand extends AbstractCommand { + public abstract String getArgumentName(); + + public abstract ArgumentType getArgumentType(); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/StringCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/StringCommand.java new file mode 100644 index 000000000..68f6d5989 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/StringCommand.java @@ -0,0 +1,19 @@ +package ml.pkom.mcpitanlibarch.api.command.argument; + +import com.mojang.brigadier.arguments.StringArgumentType; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.StringCommandEvent; + +public abstract class StringCommand extends RequiredCommand { + @Override + public StringArgumentType getArgumentType() { + return StringArgumentType.string(); + } + + public abstract void execute(StringCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((StringCommandEvent) event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java index ca0ddd4da..36b944fb0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java @@ -2,9 +2,11 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.StringRange; +import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; public class CommandEvent { public CommandContext context; + public AbstractCommand command; public CommandContext getContext() { return context; @@ -21,4 +23,12 @@ public String getInput() { public StringRange getRange() { return context.getRange(); } + + public void setCommand(AbstractCommand command) { + this.command = command; + } + + public AbstractCommand getCommand() { + return command; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntitiesCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntitiesCommandEvent.java new file mode 100644 index 000000000..d4c71c1f6 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntitiesCommandEvent.java @@ -0,0 +1,16 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import ml.pkom.mcpitanlibarch.api.command.argument.EntitiesCommand; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public class EntitiesCommandEvent extends RequiredCommandEvent { + public Entity getValue() { + try { + return EntityArgumentType.getEntity(context, ((EntitiesCommand) getCommand()).getArgumentName()); + } catch (CommandSyntaxException e) { + throw new RuntimeException(e); + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntityCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntityCommandEvent.java new file mode 100644 index 000000000..fadf3e096 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntityCommandEvent.java @@ -0,0 +1,16 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import ml.pkom.mcpitanlibarch.api.command.argument.EntityCommand; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public class EntityCommandEvent extends RequiredCommandEvent { + public Entity getValue() { + try { + return EntityArgumentType.getEntity(context, ((EntityCommand) getCommand()).getArgumentName()); + } catch (CommandSyntaxException e) { + throw new RuntimeException(e); + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/IntegerCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/IntegerCommandEvent.java new file mode 100644 index 000000000..8bb2ed715 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/IntegerCommandEvent.java @@ -0,0 +1,10 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.arguments.IntegerArgumentType; +import ml.pkom.mcpitanlibarch.api.command.argument.IntegerCommand; + +public class IntegerCommandEvent extends RequiredCommandEvent { + public Integer getValue() { + return IntegerArgumentType.getInteger(context, ((IntegerCommand) getCommand()).getArgumentName()); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ItemCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ItemCommandEvent.java new file mode 100644 index 000000000..3e835b698 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ItemCommandEvent.java @@ -0,0 +1,11 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import ml.pkom.mcpitanlibarch.api.command.argument.ItemCommand; +import net.minecraft.command.argument.ItemStackArgumentType; +import net.minecraft.item.Item; + +public class ItemCommandEvent extends RequiredCommandEvent { + public Item getValue() { + return ItemStackArgumentType.getItemStackArgument(context, ((ItemCommand) getCommand()).getArgumentName()).getItem(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayerCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayerCommandEvent.java new file mode 100644 index 000000000..49e85f5d6 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayerCommandEvent.java @@ -0,0 +1,16 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import ml.pkom.mcpitanlibarch.api.command.argument.PlayerCommand; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public class PlayerCommandEvent extends RequiredCommandEvent { + public Entity getValue() { + try { + return EntityArgumentType.getPlayer(context, ((PlayerCommand) getCommand()).getArgumentName()); + } catch (CommandSyntaxException e) { + throw new RuntimeException(e); + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayersCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayersCommandEvent.java new file mode 100644 index 000000000..b8ba0c265 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayersCommandEvent.java @@ -0,0 +1,16 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import ml.pkom.mcpitanlibarch.api.command.argument.PlayersCommand; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.entity.Entity; + +public class PlayersCommandEvent extends RequiredCommandEvent { + public Entity getValue() { + try { + return EntityArgumentType.getPlayer(context, ((PlayersCommand) getCommand()).getArgumentName()); + } catch (CommandSyntaxException e) { + throw new RuntimeException(e); + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/RequiredCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/RequiredCommandEvent.java new file mode 100644 index 000000000..13bf6e99c --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/RequiredCommandEvent.java @@ -0,0 +1,5 @@ +package ml.pkom.mcpitanlibarch.api.event; + +public abstract class RequiredCommandEvent extends ServerCommandEvent { + public abstract Object getValue(); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java index f6a733e6d..46260a71f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java @@ -41,7 +41,7 @@ public String getInput() { return context.getInput(); } - public Command getCommand() { + public Command getContextCommand() { return context.getCommand(); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/StringCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/StringCommandEvent.java new file mode 100644 index 000000000..d4a9b3963 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/StringCommandEvent.java @@ -0,0 +1,10 @@ +package ml.pkom.mcpitanlibarch.api.event; + +import com.mojang.brigadier.arguments.StringArgumentType; +import ml.pkom.mcpitanlibarch.api.command.argument.StringCommand; + +public class StringCommandEvent extends RequiredCommandEvent { + public String getValue() { + return StringArgumentType.getString(context, ((StringCommand) getCommand()).getArgumentName()); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java index cf6f04a94..32f84d549 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java @@ -2,25 +2,42 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; +import ml.pkom.mcpitanlibarch.api.command.CommandSettings; import ml.pkom.mcpitanlibarch.api.command.LiteralCommand; +import ml.pkom.mcpitanlibarch.api.command.argument.IntegerCommand; +import ml.pkom.mcpitanlibarch.api.event.IntegerCommandEvent; import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; import net.minecraft.item.ItemStack; public class ExampleCommand extends LiteralCommand { @Override - public void init() { + public void init(CommandSettings settings) { addArgumentCommand("item", new LiteralCommand() { @Override - public void init() { + public void init(CommandSettings settings) { + addArgumentCommand(new IntegerCommand() { + @Override + public void execute(IntegerCommandEvent event) { + try { + event.getPlayer().offerOrDrop(new ItemStack(ExampleMod.EXAMPLE_ITEM_SUPPLIER.getOrNull(), event.getValue())); + } catch (CommandSyntaxException ignored) { + } + } + + @Override + public String getArgumentName() { + return "count"; + } + }); } @Override public void execute(ServerCommandEvent event) { try { event.getPlayer().offerOrDrop(new ItemStack(ExampleMod.EXAMPLE_ITEM_SUPPLIER.getOrNull())); - } catch (CommandSyntaxException e) { + } catch (CommandSyntaxException ignored) { } } From 695aabfc706126482ffdb2098453cb710b70c4d4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 17:12:43 +0900 Subject: [PATCH 054/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fab8877c4..84f4eb3e1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.4-1.19.3 +mod_version=1.2.5-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From d06aeb1a2e3715e32fb6a4fcbb4bcc327879f2e6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 17:56:27 +0900 Subject: [PATCH 055/622] fix --- .../ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java index aac57f9f8..666ac4ef6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java @@ -42,7 +42,7 @@ public static void register(LiteralArgumentBuilder builder) ); } - private static void forArgsCmd(AbstractCommand absCmd, ArgumentBuilder builder) { + private static > void forArgsCmd(AbstractCommand absCmd, ArgumentBuilder builder) { if (!absCmd.getArgumentCommands().isEmpty()) { // 引数コマンド @@ -99,7 +99,7 @@ private static void forArgsCmd(AbstractCommand absCmd, ArgumentBuilder) builder).then(nextBuilder); + builder.then(nextBuilder); } } } From b38aefb844fed7b4045ae451eda0e29ffecc2d82 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 17:58:02 +0900 Subject: [PATCH 056/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 84f4eb3e1..c6143d716 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.5-1.19.3 +mod_version=1.2.6-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 3a1065a905071f8d9d7d705e59746ff9f0e730da Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 21:52:40 +0900 Subject: [PATCH 057/622] Fixed CommandRegistry https://github.com/Pitan76/item-alchemy/issues/10 https://github.com/Pitan76/item-alchemy/issues/11 --- .../api/command/CommandRegistry.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java index 666ac4ef6..f01ede60a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java @@ -18,20 +18,25 @@ public class CommandRegistry { public static CommandRegistryAccess latestCommandRegistryAccess; public static void register(String name, LiteralCommand command) { - CommandSettings settings = new CommandSettings(); - command.init(settings); + CommandRegistrationEvent.EVENT.register((dispatcher, registry, environment) -> { + latestCommandRegistryAccess = registry; + + CommandSettings settings = new CommandSettings(); + command.init(settings); - LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal(name).requires(settings::requires) - .executes(context -> { - ServerCommandEvent event = new ServerCommandEvent(); - event.setContext(context); - command.execute(event); - return command.isSuccess; - }); + LiteralArgumentBuilder builder = LiteralArgumentBuilder.literal(name).requires(settings::requires) + .executes(context -> { + ServerCommandEvent event = new ServerCommandEvent(); + event.setContext(context); + command.execute(event); + return command.isSuccess; + }); - forArgsCmd(command, builder); + forArgsCmd(command, builder); - register(builder); + //register(builder); + dispatcher.register(builder); + }); } public static void register(LiteralArgumentBuilder builder) { From ea8217a089de757dad42540cc3f698f0152523a8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Dec 2022 21:53:47 +0900 Subject: [PATCH 058/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c6143d716..c986ccc2a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.6-1.19.3 +mod_version=1.2.7-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From f70daf6be505e73ee82e570534a9f8cb29148647 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 17 Dec 2022 21:52:05 +0900 Subject: [PATCH 059/622] update api --- .../api/client/SimpleHandledScreen.java | 2 + .../api/gui/ExtendedScreenHandler.java | 15 ++++++ .../api/gui/ExtendedScreenHandlerType.java | 24 +++++++++ .../api/gui/SimpleScreenHandler.java | 51 ++++++++++++++++++- .../pkom/mcpitanlibarch/api/nbt/NbtTag.java | 1 + .../api/registry/ArchRegistry.java | 7 +++ .../pkom/mcpitanlibarch/api/tag/TagKey.java | 19 ++++++- .../api/tile/ExtendBlockEntity.java | 22 ++++++++ .../api/util/EntityTypeUtil.java | 15 ++++++ .../mcpitanlibarch/api/util/FluidUtil.java | 15 ++++++ .../mcpitanlibarch/api/util/ItemUtil.java | 1 + .../api/util/ScreenHandlerUtil.java | 4 ++ .../mcpitanlibarch/api/util/WorldUtil.java | 10 ++++ .../api/util/client/ScreenUtil.java | 22 ++++++++ 14 files changed, 205 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandler.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 389f770d0..32e89a72d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -145,4 +145,6 @@ public int getBackgroundHeight() { public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { renderOverride(matrices, mouseX, mouseY, delta); } + + } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandler.java new file mode 100644 index 000000000..d6f3d6fe9 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandler.java @@ -0,0 +1,15 @@ +package ml.pkom.mcpitanlibarch.api.gui; + +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import org.jetbrains.annotations.Nullable; + +public class ExtendedScreenHandler extends SimpleScreenHandler { + protected ExtendedScreenHandler(@Nullable ScreenHandlerType type, int syncId, PacketByteBuf buf) { + this(type, syncId); + } + + protected ExtendedScreenHandler(@Nullable ScreenHandlerType type, int syncId) { + super(type, syncId); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java new file mode 100644 index 000000000..56155ee99 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java @@ -0,0 +1,24 @@ +package ml.pkom.mcpitanlibarch.api.gui; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; + +public class ExtendedScreenHandlerType extends ScreenHandlerType { + + public ExtendedScreenHandlerType(Factory factory) { + super(factory); + this.factory = factory; + } + + private final Factory factory; + + public T create(int syncId, PlayerInventory playerInventory, PacketByteBuf buf) { + return this.factory.create(syncId, playerInventory, buf); + } + + public interface Factory extends ScreenHandlerType.Factory { + T create(int syncId, PlayerInventory playerInventory, PacketByteBuf buf); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java index b00e10ef2..6f3033a03 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java @@ -28,11 +28,41 @@ public boolean canUse(Player player) { return true; } - protected Slot addNormalSlot(Inventory inventory, int index, int x, int y) { + public Slot addNormalSlot(Inventory inventory, int index, int x, int y) { Slot slot = new Slot(inventory, index, x, y); return this.addSlot(slot); } + public Slot addSlot(Inventory inventory, int index, int x, int y, SlotFactory factory) { + Slot slot = factory.create(inventory, index, x, y); + return this.addSlot(slot); + } + + public interface SlotFactory { + T create(Inventory inventory, int index, int x, int y); + } + + public Slot callAddSlot(Slot slot) { + return this.addSlot(slot); + } + + @Deprecated + @Override + protected Slot addSlot(Slot slot) { + return super.addSlot(slot); + } + + @Deprecated + @Override + public void close(PlayerEntity player) { + this.close(new Player(player)); + } + + public void close(Player player) { + super.close(player.getPlayerEntity()); + } + + public static final int DEFAULT_SLOT_SIZE = 18; /** @@ -116,7 +146,22 @@ protected List addSlotsY(Inventory inventory, int firstIndex, int x, int f return slots; } + @Deprecated public ItemStack quickMoveOverride(PlayerEntity player, int index) { + return quickMoveOverride(new Player(player), index); + } + + public boolean callInsertItem(ItemStack stack, int startIndex, int endIndex, boolean fromLast) { + return this.insertItem(stack, startIndex, endIndex, fromLast); + } + + @Deprecated + @Override + protected boolean insertItem(ItemStack stack, int startIndex, int endIndex, boolean fromLast) { + return super.insertItem(stack, startIndex, endIndex, fromLast); + } + + public ItemStack quickMoveOverride(Player player, int index) { ItemStack itemStack = ItemStack.EMPTY; Slot slot = this.slots.get(index); if (slot.hasStack()) { @@ -140,12 +185,14 @@ public ItemStack quickMoveOverride(PlayerEntity player, int index) { return ItemStack.EMPTY; } - slot.onTakeItem(player, itemStack2); + slot.onTakeItem(player.getEntity(), itemStack2); } return itemStack; } + + @Deprecated @Override public ItemStack quickMove(PlayerEntity player, int slot) { return quickMoveOverride(player, slot); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/nbt/NbtTag.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/nbt/NbtTag.java index d27ae8aad..b46a37933 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/nbt/NbtTag.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/nbt/NbtTag.java @@ -4,6 +4,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtType; +@Deprecated public class NbtTag extends NbtCompound { public NbtTag() { super(); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index bcc16ec0b..0fb4f5e73 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -1,10 +1,13 @@ package ml.pkom.mcpitanlibarch.api.registry; import com.google.common.base.Suppliers; +import dev.architectury.registry.menu.MenuRegistry; import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrarManager; import dev.architectury.registry.registries.RegistrySupplier; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; +import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandler; +import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerType; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; @@ -60,6 +63,10 @@ public RegistryEvent> registerScreenHandlerType(Identifier return new RegistryEvent<>(SCREEN_HANDLER_TYPE.register(id, supplier)); } + public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { + return registerScreenHandlerType(id, () -> MenuRegistry.ofExtended((id1, inventory, buf) -> supplier.get().create(id1, inventory, buf))); + } + public RegistryEvent> registerMenu(Identifier id, Supplier> supplier) { return registerScreenHandlerType(id, supplier); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java index a634c4dac..04b8e890c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java @@ -1,5 +1,13 @@ package ml.pkom.mcpitanlibarch.api.tag; +import ml.pkom.mcpitanlibarch.api.util.BlockUtil; +import ml.pkom.mcpitanlibarch.api.util.EntityTypeUtil; +import ml.pkom.mcpitanlibarch.api.util.FluidUtil; +import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.minecraft.block.Block; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Identifier; @@ -34,6 +42,15 @@ public enum Type { } public boolean isOf(T value) { - return RegistryEntry.of(value).isIn(tagKey); + if (value instanceof Item) + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.ITEM, ItemUtil.toID((Item) value)); + if (value instanceof Block) + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.BLOCK, BlockUtil.toID((Block) value)); + if (value instanceof Fluid) + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.FLUID, FluidUtil.toID((Fluid) value)); + if (value instanceof EntityType) + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.ENTITY_TYPE, EntityTypeUtil.toID((EntityType) value)); + + return RegistryEntry.of(value).isIn(getTagKey()); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java index 38cb78416..d1ae1a077 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java @@ -1,10 +1,12 @@ package ml.pkom.mcpitanlibarch.api.tile; import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; +import ml.pkom.mcpitanlibarch.api.nbt.NbtTag; import ml.pkom.mcpitanlibarch.api.world.ExtendWorld; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.nbt.NbtCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -18,6 +20,26 @@ public ExtendBlockEntity(BlockEntityType type, TileCreateEvent event) { this(type, event.getBlockPos(), event.getBlockState()); } + public void writeNbtOverride(NbtCompound nbt) { + super.writeNbt(nbt); + } + + public void readNbtOverride(NbtCompound nbt) { + super.readNbt(nbt); + } + + @Deprecated + @Override + public void writeNbt(NbtCompound nbt) { + writeNbtOverride(nbt); + } + + @Deprecated + @Override + public void readNbt(NbtCompound nbt) { + readNbtOverride(nbt); + } + @Override public void setWorld(World world) { super.setWorld(world); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java new file mode 100644 index 000000000..19129c222 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java @@ -0,0 +1,15 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.entity.EntityType; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; + +public class EntityTypeUtil { + public static Identifier toID(EntityType entityType) { + return Registries.ENTITY_TYPE.getId(entityType); + } + + public static EntityType fromId(Identifier identifier) { + return Registries.ENTITY_TYPE.get(identifier); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java new file mode 100644 index 000000000..1fdd8457e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java @@ -0,0 +1,15 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.fluid.Fluid; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; + +public class FluidUtil { + public static Identifier toID(Fluid fluid) { + return Registries.FLUID.getId(fluid); + } + + public static Fluid fromId(Identifier identifier) { + return Registries.FLUID.get(identifier); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index 85a1eb042..2b9ad4d88 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -27,6 +27,7 @@ public static boolean isIn(ItemStack stack, TagKey tagKey) { } public static boolean isIn(Item item, TagKey tagKey) { + if (item.getRegistryEntry().isIn(tagKey.getTagKey())) return true; return tagKey.isOf(item); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java index db7bd1ebe..3f444b342 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java @@ -14,6 +14,10 @@ public static DefaultedList getSlots(ScreenHandler screenHandler) { return screenHandler.slots; } + public static Slot getSlot(ScreenHandler screenHandler, int index) { + return screenHandler.getSlot(index); + } + public static List> getAllScreenHandlerTypes() { List> screenHandlerTypes = new ArrayList<>(); for (ScreenHandlerType screenHandler : Registries.SCREEN_HANDLER) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index bf7d21a3e..f80a716f0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -1,5 +1,7 @@ package ml.pkom.mcpitanlibarch.api.util; +import net.minecraft.block.Block; +import net.minecraft.fluid.Fluid; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -32,6 +34,14 @@ public static boolean isClient(World world) { return world.isClient(); } + public static void scheduleBlockTick(World world, BlockPos pos, Block block, int delay) { + world.createAndScheduleBlockTick(pos, block, delay); + } + + public static void scheduleFluidTick(World world, BlockPos pos, Fluid fluid, int delay) { + world.createAndScheduleFluidTick(pos, fluid, delay); + } + public static boolean isServer(World world) { return !isClient(world); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index efb449867..2f1d441af 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -3,9 +3,15 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.render.GameRenderer; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import javax.annotation.Nullable; + @Environment(EnvType.CLIENT) public class ScreenUtil { public static void setBackground(Identifier GUI, float f, float g, float h, float i) { @@ -20,4 +26,20 @@ public static void setBackground(Identifier GUI, float f, float g, float h, floa public static void setBackground(Identifier GUI) { setBackground(GUI, 1.0F, 1.0F, 1.0F, 1.0F); } + + // ～1.19.2 + public static void setRepeatEvents(boolean isRepeatEvents) { + } + + public static ButtonWidget createButtonWidget(int x, int y, int width, int height, Text message, ButtonWidget.PressAction onPress) { + return createButtonWidget(x, y, width, height, message, onPress, null); + } + + public static ButtonWidget createButtonWidget(int x, int y, int width, int height, Text message, ButtonWidget.PressAction onPress, @Nullable ButtonWidget.NarrationSupplier tooltipSupplier) { + ButtonWidget.Builder builder = ButtonWidget.builder(message, onPress).dimensions(x, y, width , height); + if (tooltipSupplier != null) + builder.narrationSupplier(tooltipSupplier); + + return builder.build(); + } } From 499b50d91b41cd2e05066205949de503ff109b37 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 17 Dec 2022 22:04:47 +0900 Subject: [PATCH 060/622] version 1.2.8 --- .../main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index f80a716f0..3b1be5aed 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -35,11 +35,11 @@ public static boolean isClient(World world) { } public static void scheduleBlockTick(World world, BlockPos pos, Block block, int delay) { - world.createAndScheduleBlockTick(pos, block, delay); + world.scheduleBlockTick(pos, block, delay); } public static void scheduleFluidTick(World world, BlockPos pos, Fluid fluid, int delay) { - world.createAndScheduleFluidTick(pos, fluid, delay); + world.scheduleFluidTick(pos, fluid, delay); } public static boolean isServer(World world) { diff --git a/gradle.properties b/gradle.properties index c986ccc2a..47ec0b8b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.7-1.19.3 +mod_version=1.2.8-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 91a169179242b93b4cdf796f23338f9c0f0c08fb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 21 Dec 2022 15:58:59 +0900 Subject: [PATCH 061/622] update api --- .../pkom/mcpitanlibarch/MCPitanLibarch.java | 32 ++++++++ .../api/gui/inventory/IInventory.java | 77 +++++++++++++++++++ .../api/registry/ArchRegistry.java | 6 ++ 3 files changed, 115 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/inventory/IInventory.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index 2c1120b00..52d4b3b9f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -1,14 +1,46 @@ package ml.pkom.mcpitanlibarch; +import ml.pkom.easyapi.config.Config; +import ml.pkom.easyapi.config.YamlConfig; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; import ml.pkom.mcpitanlibarch.test.ExampleMod; +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class MCPitanLibarch { public static final String MOD_ID = "mcpitanlibarch"; + private static File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.json"); + + public static Config config = new YamlConfig(); + private static boolean configLoaded = false; + + public static List itemBlackList = new ArrayList<>(); + public static List blockBlackList = new ArrayList<>(); + public static void init() { + configInit(); if (PlatformUtil.isDevelopmentEnvironment()) { ExampleMod.init(); } } + + public static void configInit() { + if (configLoaded) return; + configLoaded = true; + config.setString("item", "examplemod:hogehoge_item,examplemod:fuga_item"); + config.setString("block", "examplemod:hogehoge_block,examplemod:fuga_block"); + + config.load(configFile); + + itemBlackList.addAll(Arrays.asList(config.getString("item").split(","))); + blockBlackList.addAll(Arrays.asList(config.getString("block").split(","))); + + config.save(configFile); + + } + } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/inventory/IInventory.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/inventory/IInventory.java new file mode 100644 index 000000000..95554c211 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/inventory/IInventory.java @@ -0,0 +1,77 @@ +package ml.pkom.mcpitanlibarch.api.gui.inventory; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventories; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; + +public interface IInventory extends Inventory { + + DefaultedList getItems(); + + static IInventory of(DefaultedList items) { + return () -> items; + } + + static IInventory ofSize(int size) { + return of(DefaultedList.ofSize(size, ItemStack.EMPTY)); + } + + @Override + default int size() { + return getItems().size(); + } + + @Override + default boolean isEmpty() { + for (int i = 0; i < size(); i++) { + ItemStack stack = getStack(i); + if (!stack.isEmpty()) { + return false; + } + } + return true; + } + + @Override + default ItemStack getStack(int slot) { + return getItems().get(slot); + } + + @Override + default ItemStack removeStack(int slot, int count) { + ItemStack result = Inventories.splitStack(getItems(), slot, count); + if (!result.isEmpty()) { + markDirty(); + } + return result; + } + + @Override + default ItemStack removeStack(int slot) { + return Inventories.removeStack(getItems(), slot); + } + + @Override + default void setStack(int slot, ItemStack stack) { + getItems().set(slot, stack); + if (stack.getCount() > getMaxCountPerStack()) { + stack.setCount(getMaxCountPerStack()); + } + } + + @Override + default void clear() { + getItems().clear(); + } + + @Override + default void markDirty() { + } + + @Override + default boolean canPlayerUse(PlayerEntity player) { + return true; + } +} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 0fb4f5e73..f74ed51fa 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -5,11 +5,15 @@ import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrarManager; import dev.architectury.registry.registries.RegistrySupplier; +import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandler; import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerType; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; +import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; +import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; +import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; @@ -50,12 +54,14 @@ public static ArchRegistry createRegistry(String MOD_ID) { } public RegistryEvent registerItem(Identifier id, Supplier supplier) { + if (MCPitanLibarch.itemBlackList.contains(id.toString())) supplier = () -> new Item(new ExtendSettings()); RegistrySupplier registrySupplier = ITEMS.register(id, supplier); CreativeTabManager.register(id); return new RegistryEvent<>(registrySupplier); } public RegistryEvent registerBlock(Identifier id, Supplier supplier) { + if (MCPitanLibarch.blockBlackList.contains(id.toString())) supplier = () -> new Block(AbstractBlock.Settings.of(Material.STONE)); return new RegistryEvent<>(BLOCKS.register(id, supplier)); } From c69fa4bd39b83068671b08413dbe175c78861c64 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 21 Dec 2022 16:02:01 +0900 Subject: [PATCH 062/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 47ec0b8b6..8a168d7cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.8-1.19.3 +mod_version=1.2.9-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From fa3f720ed4539bffc2f046fac986cdbd4ed93c61 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Dec 2022 14:54:19 +0900 Subject: [PATCH 063/622] snakeyaml --- build.gradle | 2 +- fabric/build.gradle | 2 ++ forge/build.gradle | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3573dd513..7a0b39dd0 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ subprojects { mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" // https://mvnrepository.com/artifact/org.yaml/snakeyaml - implementation 'org.yaml:snakeyaml:1.8' + implementation 'org.yaml:snakeyaml:1.33' } } diff --git a/fabric/build.gradle b/fabric/build.gradle index f4d631232..688b6acb7 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -23,6 +23,8 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } + + shadowCommon 'org.yaml:snakeyaml:1.33' } processResources { diff --git a/forge/build.gradle b/forge/build.gradle index 51a986ea1..0b890cefa 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -21,6 +21,8 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } + + shadowCommon 'org.yaml:snakeyaml:1.33' } processResources { From 390a3f37c345fce9f7ad53a31a68fe9e38a3f582 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Dec 2022 15:05:06 +0900 Subject: [PATCH 064/622] temp fix --- .../api/item/DefaultItemGroups.java | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java index db529f75f..6dcc356dc 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java @@ -4,24 +4,32 @@ import net.minecraft.item.ItemGroups; public class DefaultItemGroups { - public static final ItemGroup BUILDING_BLOCKS = ItemGroups.getGroups().get(0); - public static final ItemGroup COLORED_BLOCKS = ItemGroups.getGroups().get(1); // if 1.19.2 and below, BUILDING_BLOCKS - public static final ItemGroup NATURAL = ItemGroups.getGroups().get(2); // if 1.19.2 and below, DECORATIONS - public static final ItemGroup FUNCTIONAL = ItemGroups.getGroups().get(3); // if 1.19.2 and below, TRANSPORTATION - public static final ItemGroup REDSTONE = ItemGroups.getGroups().get(4); - public static final ItemGroup HOTBAR = ItemGroups.getGroups().get(5); - public static final ItemGroup SEARCH = ItemGroups.getGroups().get(6); - public static final ItemGroup TOOLS = ItemGroups.getGroups().get(7); - public static final ItemGroup COMBAT = ItemGroups.getGroups().get(8); - public static final ItemGroup FOOD_AND_DRINK = ItemGroups.getGroups().get(9); // if 1.19.2 and below, FOOD - public static final ItemGroup INGREDIENTS = ItemGroups.getGroups().get(10); // if 1.19.2 and below, MISC - public static final ItemGroup SPAWN_EGGS = ItemGroups.getGroups().get(11); // if 1.19.2 and below, MISC - public static final ItemGroup OPERATOR = ItemGroups.getGroups().get(12); // if 1.19.2 and below, MISC - public static final ItemGroup INVENTORY = ItemGroups.getGroups().get(13); + public static final ItemGroup BUILDING_BLOCKS = getGroup(0); + public static final ItemGroup COLORED_BLOCKS = getGroup(1); // if 1.19.2 and below, BUILDING_BLOCKS + public static final ItemGroup NATURAL = getGroup(2); // if 1.19.2 and below, DECORATIONS + public static final ItemGroup FUNCTIONAL = getGroup(3); // if 1.19.2 and below, TRANSPORTATION + public static final ItemGroup REDSTONE = getGroup(4); + public static final ItemGroup HOTBAR = getGroup(5); + public static final ItemGroup SEARCH = getGroup(6); + public static final ItemGroup TOOLS = getGroup(7); + public static final ItemGroup COMBAT = getGroup(8); + public static final ItemGroup FOOD_AND_DRINK = getGroup(9); // if 1.19.2 and below, FOOD + public static final ItemGroup INGREDIENTS = getGroup(10); // if 1.19.2 and below, MISC + public static final ItemGroup SPAWN_EGGS = getGroup(11); // if 1.19.2 and below, MISC + public static final ItemGroup OPERATOR = getGroup(12); // if 1.19.2 and below, MISC + public static final ItemGroup INVENTORY = getGroup(13); // ～1.19.2 Item Group public static final ItemGroup BREWING = FOOD_AND_DRINK; public static final ItemGroup TRANSPORTATION = FUNCTIONAL; public static final ItemGroup DECORATIONS = NATURAL; public static final ItemGroup MISC = INGREDIENTS; + + private static ItemGroup getGroup(int index) { + try { + return ItemGroups.getGroups().get(index); + } catch (Exception ignored) { + return null; + } + } } \ No newline at end of file From f64a79a4b977d505c0f3eaf0be224d5ac7ef02a6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Dec 2022 16:43:10 +0900 Subject: [PATCH 065/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8a168d7cc..fc65e51ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.2.9-1.19.3 +mod_version=1.3.0-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 07d75ce58e787b804edb3a49d0aaef5e040776c7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Dec 2022 16:58:19 +0900 Subject: [PATCH 066/622] grad --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fc65e51ae..a3e26731d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ mod_version=1.3.0-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=7.0.64 +architectury_version=7.0.65 # https://fabricmc.net/develop/ fabric_loader_version=0.14.11 From f4cfcecc53bd446d183f18658c754fdc48f457c1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Dec 2022 16:58:32 +0900 Subject: [PATCH 067/622] getSlot --- .../mcpitanlibarch/api/gui/SimpleScreenHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java index 6f3033a03..bf88684f9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java @@ -197,4 +197,14 @@ public ItemStack quickMoveOverride(Player player, int index) { public ItemStack quickMove(PlayerEntity player, int slot) { return quickMoveOverride(player, slot); } + + @Deprecated + @Override + public Slot getSlot(int index) { + return super.getSlot(index); + } + + public Slot callGetSlot(int index) { + return getSlot(index); + } } From 2cc50700e62ba7a687612b8f47b03f725e189dbb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Dec 2022 17:52:51 +0900 Subject: [PATCH 068/622] ItemGroups Accesswidener --- common/build.gradle | 4 +++ .../api/item/CreativeTabBuilder.java | 2 -- .../api/item/DefaultItemGroups.java | 36 ++++++++----------- .../main/resources/architectury.common.json | 3 ++ .../resources/mcpitanlibarch.accesswidener | 15 ++++++++ fabric/build.gradle | 7 ++++ fabric/src/main/resources/fabric.mod.json | 1 + forge/build.gradle | 10 ++++++ 8 files changed, 54 insertions(+), 24 deletions(-) create mode 100644 common/src/main/resources/architectury.common.json create mode 100644 common/src/main/resources/mcpitanlibarch.accesswidener diff --git a/common/build.gradle b/common/build.gradle index 91343bdc5..6c3b8acf1 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -10,6 +10,10 @@ architectury { common(forgeEnabled.toBoolean()) } +loom { + accessWidenerPath = file("src/main/resources/mcpitanlibarch.accesswidener") +} + publishing { publications { mavenCommon(MavenPublication) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java index 7834c8273..3b7a66cfd 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java @@ -68,6 +68,4 @@ public ItemGroup build() { })); return tabSupplier.get(); } - - } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java index 6dcc356dc..0c895419f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java @@ -4,32 +4,24 @@ import net.minecraft.item.ItemGroups; public class DefaultItemGroups { - public static final ItemGroup BUILDING_BLOCKS = getGroup(0); - public static final ItemGroup COLORED_BLOCKS = getGroup(1); // if 1.19.2 and below, BUILDING_BLOCKS - public static final ItemGroup NATURAL = getGroup(2); // if 1.19.2 and below, DECORATIONS - public static final ItemGroup FUNCTIONAL = getGroup(3); // if 1.19.2 and below, TRANSPORTATION - public static final ItemGroup REDSTONE = getGroup(4); - public static final ItemGroup HOTBAR = getGroup(5); - public static final ItemGroup SEARCH = getGroup(6); - public static final ItemGroup TOOLS = getGroup(7); - public static final ItemGroup COMBAT = getGroup(8); - public static final ItemGroup FOOD_AND_DRINK = getGroup(9); // if 1.19.2 and below, FOOD - public static final ItemGroup INGREDIENTS = getGroup(10); // if 1.19.2 and below, MISC - public static final ItemGroup SPAWN_EGGS = getGroup(11); // if 1.19.2 and below, MISC - public static final ItemGroup OPERATOR = getGroup(12); // if 1.19.2 and below, MISC - public static final ItemGroup INVENTORY = getGroup(13); + public static final ItemGroup BUILDING_BLOCKS = ItemGroups.BUILDING_BLOCKS; + public static final ItemGroup COLORED_BLOCKS = ItemGroups.COLORED_BLOCKS; // if 1.19.2 and below, BUILDING_BLOCKS + public static final ItemGroup NATURAL = ItemGroups.NATURAL; // if 1.19.2 and below, DECORATIONS + public static final ItemGroup FUNCTIONAL = ItemGroups.FUNCTIONAL; // if 1.19.2 and below, TRANSPORTATION + public static final ItemGroup REDSTONE = ItemGroups.REDSTONE; + public static final ItemGroup HOTBAR = ItemGroups.HOTBAR; + public static final ItemGroup SEARCH = ItemGroups.SEARCH; + public static final ItemGroup TOOLS = ItemGroups.TOOLS; + public static final ItemGroup COMBAT = ItemGroups.COMBAT; + public static final ItemGroup FOOD_AND_DRINK = ItemGroups.FOOD_AND_DRINK; // if 1.19.2 and below, FOOD + public static final ItemGroup INGREDIENTS = ItemGroups.INGREDIENTS; // if 1.19.2 and below, MISC + public static final ItemGroup SPAWN_EGGS = ItemGroups.SPAWN_EGGS; // if 1.19.2 and below, MISC + public static final ItemGroup OPERATOR = ItemGroups.OPERATOR; // if 1.19.2 and below, MISC + public static final ItemGroup INVENTORY = ItemGroups.INVENTORY; // ～1.19.2 Item Group public static final ItemGroup BREWING = FOOD_AND_DRINK; public static final ItemGroup TRANSPORTATION = FUNCTIONAL; public static final ItemGroup DECORATIONS = NATURAL; public static final ItemGroup MISC = INGREDIENTS; - - private static ItemGroup getGroup(int index) { - try { - return ItemGroups.getGroups().get(index); - } catch (Exception ignored) { - return null; - } - } } \ No newline at end of file diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json new file mode 100644 index 000000000..3c2b8ca8e --- /dev/null +++ b/common/src/main/resources/architectury.common.json @@ -0,0 +1,3 @@ +{ + "accessWidener": "mcpitanlibarch.accesswidener" +} \ No newline at end of file diff --git a/common/src/main/resources/mcpitanlibarch.accesswidener b/common/src/main/resources/mcpitanlibarch.accesswidener new file mode 100644 index 000000000..19d82bfef --- /dev/null +++ b/common/src/main/resources/mcpitanlibarch.accesswidener @@ -0,0 +1,15 @@ +accessWidener v2 named +accessible field net/minecraft/item/ItemGroups BUILDING_BLOCKS Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups COLORED_BLOCKS Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups NATURAL Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups FUNCTIONAL Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups REDSTONE Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups HOTBAR Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups SEARCH Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups TOOLS Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups COMBAT Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups FOOD_AND_DRINK Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups INGREDIENTS Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/item/ItemGroup; diff --git a/fabric/build.gradle b/fabric/build.gradle index 688b6acb7..bc8ea7ff8 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -7,6 +7,10 @@ architectury { fabric() } +loom { + accessWidenerPath = project(":common").loom.accessWidenerPath +} + configurations { common shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. @@ -38,11 +42,14 @@ processResources { } shadowJar { + exclude "architectury.common.json" + configurations = [project.configurations.shadowCommon] classifier "dev-shadow" } remapJar { + injectAccessWidener = true input.set shadowJar.archiveFile dependsOn shadowJar classifier null diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index ae2840788..c80ef2f86 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -29,6 +29,7 @@ "mcpitanlibarch.mixins.json", "mcpitanlibarch-common.mixins.json" ], + "accessWidener" : "mcpitanlibarch.accesswidener", "depends": { "minecraft": ">1.19.2", "fabricloader": "*", diff --git a/forge/build.gradle b/forge/build.gradle index 0b890cefa..13b8a6fd8 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -6,6 +6,15 @@ architectury { forge() } +loom { + accessWidenerPath = project(":common").loom.accessWidenerPath + + forge { + convertAccessWideners = true + extraAccessWideners.add loom.accessWidenerPath.get().asFile.name + } +} + configurations { common shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. @@ -37,6 +46,7 @@ processResources { shadowJar { exclude "fabric.mod.json" + exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] classifier "dev-shadow" From 2ca8803fc465daccce74371f681005449a55013c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Dec 2022 17:53:49 +0900 Subject: [PATCH 069/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a3e26731d..119a67092 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.0-1.19.3 +mod_version=1.3.1-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 819a08337efd5d6c8c04c5301c505a60d56e5469 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 Dec 2022 01:07:39 +0900 Subject: [PATCH 070/622] fixed recipe remainder(fabric only) --- .../recipe/FixedRecipeRemainder.java | 7 +++++ .../fabric/mixin/RecipeMixin.java | 28 +++++++++++++++++++ .../main/resources/mcpitanlibarch.mixins.json | 3 +- .../main/resources/mcpitanlibarch.mixins.json | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/recipe/FixedRecipeRemainder.java create mode 100644 fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/recipe/FixedRecipeRemainder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/recipe/FixedRecipeRemainder.java new file mode 100644 index 000000000..affb25f06 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/recipe/FixedRecipeRemainder.java @@ -0,0 +1,7 @@ +package ml.pkom.mcpitanlibarch.recipe; + +import net.minecraft.item.ItemStack; + +public interface FixedRecipeRemainder { + ItemStack getFixedRecipeRemainder(ItemStack stack); +} diff --git a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java new file mode 100644 index 000000000..0a69b3eed --- /dev/null +++ b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java @@ -0,0 +1,28 @@ +package ml.pkom.mcpitanlibarch.fabric.mixin; + +import ml.pkom.mcpitanlibarch.recipe.FixedRecipeRemainder; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Recipe; +import net.minecraft.util.collection.DefaultedList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Recipe.class) +public interface RecipeMixin { + @Inject(method = "getRemainder", at = @At("RETURN")) + default void injectGetRemainder(C inventory, CallbackInfoReturnable> cir) { + DefaultedList defaultedList = cir.getReturnValue(); + + int i = 0; + for(ItemStack stack : defaultedList) { + if (stack.getItem() instanceof FixedRecipeRemainder) { + FixedRecipeRemainder remainder = (FixedRecipeRemainder) stack.getItem(); + defaultedList.set(i, remainder.getFixedRecipeRemainder(stack)); + } + i++; + } + } +} diff --git a/fabric/src/main/resources/mcpitanlibarch.mixins.json b/fabric/src/main/resources/mcpitanlibarch.mixins.json index 5ff32912f..864f03833 100644 --- a/fabric/src/main/resources/mcpitanlibarch.mixins.json +++ b/fabric/src/main/resources/mcpitanlibarch.mixins.json @@ -1,9 +1,10 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.mixin.fabric", + "package": "ml.pkom.mcpitanlibarch.fabric.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ + "RecipeMixin" ], "client": [ ], diff --git a/forge/src/main/resources/mcpitanlibarch.mixins.json b/forge/src/main/resources/mcpitanlibarch.mixins.json index e3ae4ab50..f00451cf3 100644 --- a/forge/src/main/resources/mcpitanlibarch.mixins.json +++ b/forge/src/main/resources/mcpitanlibarch.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.mixin.forge", + "package": "ml.pkom.mcpitanlibarch.forge.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ ], From 41164df3b9ed0cf3fcb083ece31f1d8d2eb7c42d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 Dec 2022 01:09:39 +0900 Subject: [PATCH 071/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 119a67092..9bcc21d62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.1-1.19.3 +mod_version=1.3.2-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From de62ca66ff24509a1b1778dea0041011f1e14b38 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 Dec 2022 21:55:46 +0900 Subject: [PATCH 072/622] fix --- .../src/main/java/ml/pkom/mcpitanlibarch/Dummy.java | 4 ++++ .../ml/pkom/mcpitanlibarch/api/item/ExtendItem.java | 13 +++++++++++++ .../item/FixedRecipeRemainderItem.java} | 4 ++-- .../mcpitanlibarch/fabric/mixin/RecipeMixin.java | 8 ++++---- 4 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java rename common/src/main/java/ml/pkom/mcpitanlibarch/{recipe/FixedRecipeRemainder.java => api/item/FixedRecipeRemainderItem.java} (53%) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java b/common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java new file mode 100644 index 000000000..d523b5c3a --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java @@ -0,0 +1,4 @@ +package ml.pkom.mcpitanlibarch; + +public class Dummy { +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java index a0fe64754..e38b9852d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java @@ -1,5 +1,6 @@ package ml.pkom.mcpitanlibarch.api.item; +import ml.pkom.mcpitanlibarch.Dummy; import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; import ml.pkom.mcpitanlibarch.api.event.item.ItemUseOnBlockEvent; import ml.pkom.mcpitanlibarch.mixin.ItemUsageContextMixin; @@ -17,17 +18,25 @@ public ExtendItem(Settings settings) { super(settings); } + @Deprecated @Override public TypedActionResult use(World world, PlayerEntity user, Hand hand) { return onRightClick(new ItemUseEvent(world, user, hand)); } + @Deprecated @Override public ActionResult useOnBlock(ItemUsageContext context) { ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); } + @Deprecated + @Override + public boolean hasRecipeRemainder() { + return hasRecipeRemainder(new Dummy()); + } + /** * item right click event * @@ -46,4 +55,8 @@ public TypedActionResult onRightClick(ItemUseEvent event) { public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { return super.useOnBlock(event.toIUC()); } + + public boolean hasRecipeRemainder(Dummy dummy) { + return super.hasRecipeRemainder(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/recipe/FixedRecipeRemainder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/FixedRecipeRemainderItem.java similarity index 53% rename from common/src/main/java/ml/pkom/mcpitanlibarch/recipe/FixedRecipeRemainder.java rename to common/src/main/java/ml/pkom/mcpitanlibarch/api/item/FixedRecipeRemainderItem.java index affb25f06..1d9a3d348 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/recipe/FixedRecipeRemainder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/FixedRecipeRemainderItem.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.recipe; +package ml.pkom.mcpitanlibarch.api.item; import net.minecraft.item.ItemStack; -public interface FixedRecipeRemainder { +public interface FixedRecipeRemainderItem { ItemStack getFixedRecipeRemainder(ItemStack stack); } diff --git a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java index 0a69b3eed..dd7f6e646 100644 --- a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java +++ b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java @@ -1,6 +1,6 @@ package ml.pkom.mcpitanlibarch.fabric.mixin; -import ml.pkom.mcpitanlibarch.recipe.FixedRecipeRemainder; +import ml.pkom.mcpitanlibarch.api.item.FixedRecipeRemainderItem; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; @@ -18,9 +18,9 @@ default void injectGetRemainder(C inventory, CallbackInfoReturnable Date: Sat, 24 Dec 2022 21:59:53 +0900 Subject: [PATCH 073/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9bcc21d62..342a50770 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.2-1.19.3 +mod_version=1.3.3-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From ee4fbaa92fcb84c1d8190da44261eb9c9302de3e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 Dec 2022 23:53:16 +0900 Subject: [PATCH 074/622] add api --- .../mcpitanlibarch/api/util/RecipeUtil.java | 24 +++++++++++++++++ .../mcpitanlibarch/api/util/ResourceUtil.java | 27 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java new file mode 100644 index 000000000..828a77585 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -0,0 +1,24 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.ShapelessRecipe; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.DefaultedList; + +public class RecipeUtil { + public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { + return createShapelessRecipe(id, group, output, input); + } + + public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, ItemStack output, DefaultedList input) { + return new ShapelessRecipe(id, group, output, input); + } + + public enum CompatibilityCraftingRecipeCategory { + BUILDING, + REDSTONE, + EQUIPMENT, + MISC; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java new file mode 100644 index 000000000..4a770572e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java @@ -0,0 +1,27 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.resource.Resource; +import net.minecraft.resource.ResourceManager; +import net.minecraft.util.Identifier; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +public class ResourceUtil { + public static Resource getResource(ResourceManager resourceManager, Identifier identifier) throws IOException { + return resourceManager.getResource(identifier); + } + + public static Map findResources(ResourceManager resourceManager, String startingPath, String endingPath) throws IOException { + Map map = new HashMap<>(); + for (Identifier identifier : resourceManager.findResources(startingPath, s -> s.endsWith(endingPath))) { + map.put(identifier, resourceManager.getResource(identifier)); + } + return map; + } + + public static void close(Resource resource) throws IOException { + resource.close(); + } +} From 4d8e0bcbc602d712080ba655948e8bb79d0c0dbb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 25 Dec 2022 00:16:16 +0900 Subject: [PATCH 075/622] a --- .../mcpitanlibarch/api/util/ResourceUtil.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java index 4a770572e..6507eac52 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java @@ -5,23 +5,18 @@ import net.minecraft.util.Identifier; import java.io.IOException; -import java.util.HashMap; import java.util.Map; public class ResourceUtil { - public static Resource getResource(ResourceManager resourceManager, Identifier identifier) throws IOException { - return resourceManager.getResource(identifier); + public static Resource getResource(ResourceManager resourceManager, Identifier identifier) { + return resourceManager.getResource(identifier).get(); } - public static Map findResources(ResourceManager resourceManager, String startingPath, String endingPath) throws IOException { - Map map = new HashMap<>(); - for (Identifier identifier : resourceManager.findResources(startingPath, s -> s.endsWith(endingPath))) { - map.put(identifier, resourceManager.getResource(identifier)); - } - return map; + public static Map findResources(ResourceManager resourceManager, String startingPath, String endingPath) { + return resourceManager.findResources(startingPath, s -> s.toString().endsWith(endingPath)); } public static void close(Resource resource) throws IOException { - resource.close(); + resource.getInputStream().close(); } } From ed27508bc538f11869f5577fc44fd88741c43168 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 25 Dec 2022 00:17:23 +0900 Subject: [PATCH 076/622] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 342a50770..ed4b0a93e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.3-1.19.3 +mod_version=1.3.4-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 3e768f21abca5eb13fc880689a7516f510f8969c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 25 Dec 2022 00:23:07 +0900 Subject: [PATCH 077/622] 1.19.3 --- .../java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java | 5 +++-- php/upload_curseforge.bat | 2 -- php/upload_maven.bat | 2 -- php/upload_modrinth.bat | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 php/upload_curseforge.bat delete mode 100644 php/upload_maven.bat delete mode 100644 php/upload_modrinth.bat diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java index 828a77585..5e99c8e32 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -3,16 +3,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.ShapelessRecipe; +import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; public class RecipeUtil { public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { - return createShapelessRecipe(id, group, output, input); + return new ShapelessRecipe(id, group, CraftingRecipeCategory.valueOf(category.name()), output, input); } public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, ItemStack output, DefaultedList input) { - return new ShapelessRecipe(id, group, output, input); + return createShapelessRecipe(id, group, CompatibilityCraftingRecipeCategory.MISC, output, input); } public enum CompatibilityCraftingRecipeCategory { diff --git a/php/upload_curseforge.bat b/php/upload_curseforge.bat deleted file mode 100644 index 668dab2c9..000000000 --- a/php/upload_curseforge.bat +++ /dev/null @@ -1,2 +0,0 @@ -php upload_curseforge.php -pause \ No newline at end of file diff --git a/php/upload_maven.bat b/php/upload_maven.bat deleted file mode 100644 index 34860da53..000000000 --- a/php/upload_maven.bat +++ /dev/null @@ -1,2 +0,0 @@ -php upload_maven.php -pause \ No newline at end of file diff --git a/php/upload_modrinth.bat b/php/upload_modrinth.bat deleted file mode 100644 index 9b351ae75..000000000 --- a/php/upload_modrinth.bat +++ /dev/null @@ -1,2 +0,0 @@ -php upload_modrinth.php -pause \ No newline at end of file From e252bc7b504a437edcacc57f05a92d2e4f840dc1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 25 Dec 2022 00:38:57 +0900 Subject: [PATCH 078/622] 1.19.2 --- .../ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java index 6507eac52..6621daddd 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java @@ -5,6 +5,7 @@ import net.minecraft.util.Identifier; import java.io.IOException; +import java.io.InputStream; import java.util.Map; public class ResourceUtil { @@ -12,11 +13,15 @@ public static Resource getResource(ResourceManager resourceManager, Identifier i return resourceManager.getResource(identifier).get(); } - public static Map findResources(ResourceManager resourceManager, String startingPath, String endingPath) { + public static InputStream getInputStream(Resource resource) throws IOException { + return resource.getInputStream(); + } + + public static Map findResources(ResourceManager resourceManager, String startingPath, String endingPath) throws IOException { return resourceManager.findResources(startingPath, s -> s.toString().endsWith(endingPath)); } public static void close(Resource resource) throws IOException { - resource.getInputStream().close(); + getInputStream(resource); } } From 4bbd155184f24e5684db4663a6ed54d1c39e723e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 25 Dec 2022 00:42:21 +0900 Subject: [PATCH 079/622] 1.19.2 --- .../main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java index 6621daddd..43e33e1b0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java @@ -22,6 +22,6 @@ public static Map findResources(ResourceManager resourceMa } public static void close(Resource resource) throws IOException { - getInputStream(resource); + getInputStream(resource).close(); } } From 4fc5f138fe1e6ea6ce124b78346a0620ed4b4bc3 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 25 Dec 2022 00:43:23 +0900 Subject: [PATCH 080/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ed4b0a93e..61f6be84a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.4-1.19.3 +mod_version=1.3.5-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 3c6e9b630181d89a32fb94f92f25064236df2f1b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 25 Dec 2022 00:38:57 +0900 Subject: [PATCH 081/622] 1.19.3 --- .../main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java index 43e33e1b0..f15483fa4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.InputStream; +import java.util.HashMap; import java.util.Map; public class ResourceUtil { From e54a8e7afd083e0ccefce027467e3d7ce125b791 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 27 Dec 2022 16:25:14 +0900 Subject: [PATCH 082/622] fix config --- .../java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java | 12 +++++++++--- php/upload_curseforge.bat | 2 ++ php/upload_maven.bat | 2 ++ php/upload_modrinth.bat | 2 ++ 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 php/upload_curseforge.bat create mode 100644 php/upload_maven.bat create mode 100644 php/upload_modrinth.bat diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index 52d4b3b9f..a1a402bd2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -13,7 +13,7 @@ public class MCPitanLibarch { public static final String MOD_ID = "mcpitanlibarch"; - private static File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.json"); + private static File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.yml"); public static Config config = new YamlConfig(); private static boolean configLoaded = false; @@ -31,13 +31,19 @@ public static void init() { public static void configInit() { if (configLoaded) return; configLoaded = true; + if (!configFile.getParentFile().exists()) + configFile.mkdirs(); + config.setString("item", "examplemod:hogehoge_item,examplemod:fuga_item"); config.setString("block", "examplemod:hogehoge_block,examplemod:fuga_block"); config.load(configFile); - itemBlackList.addAll(Arrays.asList(config.getString("item").split(","))); - blockBlackList.addAll(Arrays.asList(config.getString("block").split(","))); + if (config.configMap.containsKey("item")) + itemBlackList.addAll(Arrays.asList(config.getString("item").split(","))); + + if (config.configMap.containsKey("block")) + blockBlackList.addAll(Arrays.asList(config.getString("block").split(","))); config.save(configFile); diff --git a/php/upload_curseforge.bat b/php/upload_curseforge.bat new file mode 100644 index 000000000..668dab2c9 --- /dev/null +++ b/php/upload_curseforge.bat @@ -0,0 +1,2 @@ +php upload_curseforge.php +pause \ No newline at end of file diff --git a/php/upload_maven.bat b/php/upload_maven.bat new file mode 100644 index 000000000..34860da53 --- /dev/null +++ b/php/upload_maven.bat @@ -0,0 +1,2 @@ +php upload_maven.php +pause \ No newline at end of file diff --git a/php/upload_modrinth.bat b/php/upload_modrinth.bat new file mode 100644 index 000000000..9b351ae75 --- /dev/null +++ b/php/upload_modrinth.bat @@ -0,0 +1,2 @@ +php upload_modrinth.php +pause \ No newline at end of file From f722044fbb66ad9031d7206faba263c9a3a2f9f6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 5 Feb 2023 23:21:52 +0900 Subject: [PATCH 083/622] update api (WorldUtil, Player, Tick API) --- .../api/block/ExtendBlockEntityProvider.java | 41 ++++++++++++++++++- .../mcpitanlibarch/api/entity/Player.java | 12 ++++++ .../api/event/tile/TileTickEvent.java | 20 +++++++++ .../api/tile/ExtendBlockEntityTicker.java | 17 ++++++++ .../mcpitanlibarch/api/util/WorldUtil.java | 24 +++++++++++ 5 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/tile/TileTickEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntityTicker.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java index ab5fb7778..0599a54a5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java @@ -1,10 +1,14 @@ package ml.pkom.mcpitanlibarch.api.block; import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; +import ml.pkom.mcpitanlibarch.api.tile.ExtendBlockEntityTicker; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; public interface ExtendBlockEntityProvider extends BlockEntityProvider { @@ -14,5 +18,40 @@ default BlockEntity createBlockEntity(BlockPos pos, BlockState state) { } @Nullable - BlockEntity createBlockEntity(TileCreateEvent event); + default BlockEntity createBlockEntity(TileCreateEvent event) { + if (getBlockEntityType() == null) return null; + + // return new ...BlockEntity(pos, state) + return getBlockEntityType().instantiate(event.getBlockPos(), event.getBlockState()); + } + + @Nullable + default BlockEntityType getBlockEntityType() { + return null; + } + + @Nullable + @Override + default BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + if (isTick()) { + return ((world1, pos, state1, blockEntity) -> { + if (getBlockEntityType() == null || blockEntity == getBlockEntityType().get(world, pos)) { + if (blockEntity instanceof ExtendBlockEntityTicker) { + ExtendBlockEntityTicker ticker = (ExtendBlockEntityTicker) blockEntity; + ticker.tick(world, pos, state, blockEntity); + } else if (blockEntity instanceof BlockEntityTicker) { + BlockEntityTicker ticker = (BlockEntityTicker) blockEntity; + ticker.tick(world, pos, state, blockEntity); + } + } + }); + } + return BlockEntityProvider.super.getTicker(world, state, type); + } + + default boolean isTick() { + return false; + } + + } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index 20f5ba37d..c759e6377 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -173,4 +173,16 @@ public void sendActionBar(Text text) { public void equipStack(EquipmentSlot slot, ItemStack stack) { getEntity().equipStack(slot, stack); } + + public void dropStack(ItemStack stack, boolean throwRandomly, boolean retainOwnership) { + getEntity().dropItem(stack, throwRandomly, retainOwnership); + } + + public void dropStack(ItemStack stack, boolean retainOwnership) { + dropStack(stack, false, retainOwnership); + } + + public void dropStack(ItemStack stack) { + dropStack(stack, false, false); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/tile/TileTickEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/tile/TileTickEvent.java new file mode 100644 index 000000000..2a7c9f628 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/tile/TileTickEvent.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.event.tile; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class TileTickEvent { + public World world; + public BlockPos pos; + public BlockState state; + public BlockEntity blockEntity; + + public TileTickEvent(World world, BlockPos pos, BlockState state, BlockEntity blockEntity) { + this.world = world; + this.pos = pos; + this.state = state; + this.blockEntity = blockEntity; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntityTicker.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntityTicker.java new file mode 100644 index 000000000..5c3705bb0 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntityTicker.java @@ -0,0 +1,17 @@ +package ml.pkom.mcpitanlibarch.api.tile; + +import ml.pkom.mcpitanlibarch.api.event.tile.TileTickEvent; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public interface ExtendBlockEntityTicker extends BlockEntityTicker { + @Override + default void tick(World world, BlockPos pos, BlockState state, BlockEntity blockEntity) { + tick(new TileTickEvent(world, pos, state, blockEntity)); + } + + void tick(TileTickEvent event); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index 3b1be5aed..8eef0faca 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -1,8 +1,14 @@ package ml.pkom.mcpitanlibarch.api.util; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.ExperienceOrbEntity; +import net.minecraft.entity.ItemEntity; import net.minecraft.fluid.Fluid; +import net.minecraft.item.ItemStack; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; public class WorldUtil { @@ -46,4 +52,22 @@ public static boolean isServer(World world) { return !isClient(world); } + public static void spawnStack(World world, BlockPos pos, ItemStack stack) { + spawnEntity(world, new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), stack)); + } + + public static void spawnExperienceOrb(World world, Vec3d pos, int amount) { + if (world instanceof ServerWorld) + ExperienceOrbEntity.spawn((ServerWorld) world, pos, amount); + } + + public static void spawnExperienceOrb(World world, BlockPos pos, int amount) { + spawnExperienceOrb(world, pos.toCenterPos(), amount); + } + + + public static void spawnEntity(World world, Entity entity) { + world.spawnEntity(entity); + } + } From 35f4b2be802b41785bab3b6aa3965690d98ea498 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 5 Feb 2023 23:22:21 +0900 Subject: [PATCH 084/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 61f6be84a..a30fbf866 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.5-1.19.3 +mod_version=1.3.6-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From d6ee230195aaa858bc5db062d65613944b3cfee2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 10 Feb 2023 00:43:09 +0900 Subject: [PATCH 085/622] add Entity/BlockEntity Builder API --- .../api/entity/EntityTypeBuilder.java | 105 ++++++++++++++++++ .../api/entity/ExtendEntityType.java | 25 +++++ .../api/item/CreativeTabBuilder.java | 2 + .../api/tile/BlockEntityTypeBuilder.java | 58 ++++++++++ 4 files changed, 190 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/BlockEntityTypeBuilder.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java new file mode 100644 index 000000000..e4b2ca89c --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java @@ -0,0 +1,105 @@ +package ml.pkom.mcpitanlibarch.api.entity; + +import com.google.common.collect.ImmutableSet; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityDimensions; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; + +public class EntityTypeBuilder { + + private SpawnGroup spawnGroup; + private EntityType.EntityFactory factory; + private EntityDimensions entityDimensions; + private boolean saveable; + private boolean summonable; + private boolean fireImmune; + private boolean spawnableFarFromPlayer; + private ImmutableSet canSpawnBlocks; + private int maxTrackDistance; + private int trackTickInterval; + private Boolean alwaysUpdateVelocity = null; + + + @Deprecated + // Recommend: create() + public EntityTypeBuilder() { + setSaveable(true); + setSummonable(true); + setFireImmune(false); + setChangingDimensions(-1.0f, -1.0f); + + } + + public static EntityTypeBuilder create() { + return new EntityTypeBuilder<>(); + } + + public EntityType build() { + return new ExtendEntityType<>(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, alwaysUpdateVelocity); + } + + public EntityTypeBuilder setSpawnGroup(SpawnGroup spawnGroup) { + this.spawnGroup = spawnGroup; + return this; + } + + public EntityTypeBuilder setEntityFactory(EntityType.EntityFactory factory) { + this.factory = factory; + return this; + } + + public EntityTypeBuilder setDimensions(EntityDimensions entityDimensions) { + this.entityDimensions = entityDimensions; + return this; + } + + public EntityTypeBuilder setFixedDimensions(float width, float height) { + return setDimensions(EntityDimensions.fixed(width, height)); + } + + public EntityTypeBuilder setChangingDimensions(float width, float height) { + return setDimensions(EntityDimensions.changing(width, height)); + } + + public EntityTypeBuilder setSaveable(boolean saveable) { + this.saveable = saveable; + return this; + } + + public EntityTypeBuilder setSummonable(boolean summonable) { + this.summonable = summonable; + return this; + } + + public EntityTypeBuilder setFireImmune(boolean fireImmune) { + this.fireImmune = fireImmune; + return this; + } + + public EntityTypeBuilder setSpawnableFarFromPlayer(boolean spawnableFarFromPlayer) { + this.spawnableFarFromPlayer = spawnableFarFromPlayer; + return this; + } + + public EntityTypeBuilder setCanSpawnBlocks(ImmutableSet canSpawnBlocks) { + this.canSpawnBlocks = canSpawnBlocks; + return this; + } + + public EntityTypeBuilder setMaxTrackDistance(int maxTrackDistance) { + this.maxTrackDistance = maxTrackDistance; + return this; + } + + public EntityTypeBuilder setTrackTickInterval(int trackTickInterval) { + this.trackTickInterval = trackTickInterval; + return this; + } + + public EntityTypeBuilder setAlwaysUpdateVelocity(Boolean alwaysUpdateVelocity) { + this.alwaysUpdateVelocity = alwaysUpdateVelocity; + return this; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java new file mode 100644 index 000000000..bb72550ad --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java @@ -0,0 +1,25 @@ +package ml.pkom.mcpitanlibarch.api.entity; + +import com.google.common.collect.ImmutableSet; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityDimensions; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; + +public class ExtendEntityType extends EntityType { + private final Boolean alwaysUpdateVelocity; + + public ExtendEntityType(EntityType.EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { + super(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval); + this.alwaysUpdateVelocity = alwaysUpdateVelocity; + } + + @Override + public boolean alwaysUpdateVelocity() { + if (alwaysUpdateVelocity != null) + return alwaysUpdateVelocity; + + return super.alwaysUpdateVelocity(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java index 3b7a66cfd..7f7fbdd1c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java @@ -19,6 +19,8 @@ public class CreativeTabBuilder { private boolean special = false; private String texture; + @Deprecated + // Recommend: create(identifier) public CreativeTabBuilder(Identifier identifier) { this.identifier = identifier; } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/BlockEntityTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/BlockEntityTypeBuilder.java new file mode 100644 index 000000000..7df27746e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/BlockEntityTypeBuilder.java @@ -0,0 +1,58 @@ +package ml.pkom.mcpitanlibarch.api.tile; + +import com.mojang.datafixers.types.Type; +import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class BlockEntityTypeBuilder { + private final Factory factory; + private final List blocks; + + public BlockEntityTypeBuilder(Factory factory, List blocks) { + this.factory = factory; + this.blocks = blocks; + } + + public static BlockEntityTypeBuilder create(Factory factory, Block... blocks) { + List blocksList = new ArrayList<>(blocks.length); + Collections.addAll(blocksList, blocks); + + return new BlockEntityTypeBuilder<>(factory, blocksList); + } + + public BlockEntityTypeBuilder addBlock(Block block) { + this.blocks.add(block); + return this; + } + + public BlockEntityTypeBuilder addBlocks(Block... blocks) { + Collections.addAll(this.blocks, blocks); + return this; + } + + public BlockEntityType build() { + return build(null); + } + + public BlockEntityType build(Type type) { + return BlockEntityType.Builder.create(factory::create, blocks.toArray(new Block[0])).build(type); + } + + @FunctionalInterface + public interface Factory { + T create(TileCreateEvent event); + + @Deprecated + default T create(BlockPos pos, BlockState state) { + return create(new TileCreateEvent(pos, state)); + } + } +} From b4a1f8d69c1879ce7ae0972314d5a4f91cf7418c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 10 Feb 2023 00:45:19 +0900 Subject: [PATCH 086/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a30fbf866..5cd05b325 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.6-1.19.3 +mod_version=1.3.7-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 5c4693ed37cc7a68d89ddb0901259708ebabef28 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 10 Feb 2023 00:48:29 +0900 Subject: [PATCH 087/622] 1.19.3 --- .../ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java index bb72550ad..27f735a7c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java @@ -6,12 +6,13 @@ import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; +import net.minecraft.resource.featuretoggle.FeatureFlags; public class ExtendEntityType extends EntityType { private final Boolean alwaysUpdateVelocity; public ExtendEntityType(EntityType.EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { - super(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval); + super(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); this.alwaysUpdateVelocity = alwaysUpdateVelocity; } From c9f7c905c2c0b86800efda247bb8013595811d1a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 10 Feb 2023 00:52:53 +0900 Subject: [PATCH 088/622] fix --- .../api/entity/EntityTypeBuilder.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java index e4b2ca89c..ef6c3f6ca 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java @@ -29,13 +29,34 @@ public EntityTypeBuilder() { setSummonable(true); setFireImmune(false); setChangingDimensions(-1.0f, -1.0f); + spawnableFarFromPlayer = false; + maxTrackDistance = 5; + trackTickInterval = 3; + canSpawnBlocks = ImmutableSet.of(); + } + @Deprecated + public EntityTypeBuilder(SpawnGroup spawnGroup, EntityType.EntityFactory factory) { + setSaveable(true); + setSummonable(true); + setFireImmune(false); + setChangingDimensions(-1.0f, -1.0f); + spawnableFarFromPlayer = false; + maxTrackDistance = 5; + trackTickInterval = 3; + canSpawnBlocks = ImmutableSet.of(); + this.spawnGroup = spawnGroup; + this.factory = factory; } public static EntityTypeBuilder create() { return new EntityTypeBuilder<>(); } + public static EntityTypeBuilder create(SpawnGroup spawnGroup, EntityType.EntityFactory factory) { + return new EntityTypeBuilder<>(spawnGroup, factory); + } + public EntityType build() { return new ExtendEntityType<>(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, alwaysUpdateVelocity); } From 0712ab6fbb279bdcdce79887a0ca4ad7ef06baa0 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 10 Feb 2023 00:53:19 +0900 Subject: [PATCH 089/622] fix --- .../mcpitanlibarch/api/entity/EntityTypeBuilder.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java index ef6c3f6ca..9d22e56d4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java @@ -37,14 +37,7 @@ public EntityTypeBuilder() { @Deprecated public EntityTypeBuilder(SpawnGroup spawnGroup, EntityType.EntityFactory factory) { - setSaveable(true); - setSummonable(true); - setFireImmune(false); - setChangingDimensions(-1.0f, -1.0f); - spawnableFarFromPlayer = false; - maxTrackDistance = 5; - trackTickInterval = 3; - canSpawnBlocks = ImmutableSet.of(); + this(); this.spawnGroup = spawnGroup; this.factory = factory; } From 71dd0084d89b622511d05149627c923e8954c3ce Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 12 Feb 2023 11:43:18 +0900 Subject: [PATCH 090/622] Fixed ExtendedScreenHandlerType API --- .../api/gui/ExtendedScreenHandlerType.java | 15 ++++++++------- .../mcpitanlibarch/api/registry/ArchRegistry.java | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java index 56155ee99..4db122a5a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java @@ -7,18 +7,19 @@ public class ExtendedScreenHandlerType extends ScreenHandlerType { + private final Factory factory; + public ExtendedScreenHandlerType(Factory factory) { - super(factory); + super(null); this.factory = factory; } - private final Factory factory; - - public T create(int syncId, PlayerInventory playerInventory, PacketByteBuf buf) { - return this.factory.create(syncId, playerInventory, buf); + public T create(int syncId, PlayerInventory inventory, PacketByteBuf buf) { + return factory.create(syncId, inventory, buf); } - public interface Factory extends ScreenHandlerType.Factory { - T create(int syncId, PlayerInventory playerInventory, PacketByteBuf buf); + @FunctionalInterface + public interface Factory { + T create(int syncId, PlayerInventory inventory, PacketByteBuf buf); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index f74ed51fa..610a73ab0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -69,7 +69,7 @@ public RegistryEvent> registerScreenHandlerType(Identifier return new RegistryEvent<>(SCREEN_HANDLER_TYPE.register(id, supplier)); } - public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { + public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { return registerScreenHandlerType(id, () -> MenuRegistry.ofExtended((id1, inventory, buf) -> supplier.get().create(id1, inventory, buf))); } From f5537dcfc217a4ef96e515c20f31d86dbb980792 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 12 Feb 2023 11:46:04 +0900 Subject: [PATCH 091/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5cd05b325..ff101ab04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.3.7-1.19.3 +mod_version=1.4.0-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 91facefa946bb180d3cd366a471ad163000f321b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 12 Feb 2023 16:38:16 +0900 Subject: [PATCH 092/622] fix --- forge/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge/build.gradle b/forge/build.gradle index 13b8a6fd8..2678fde7f 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -12,6 +12,9 @@ loom { forge { convertAccessWideners = true extraAccessWideners.add loom.accessWidenerPath.get().asFile.name + + mixinConfig "mcpitanlibarch-common.mixins.json" + mixinConfig "mcpitanlibarch.mixins.json" } } From 6a8b58b1ae71d148973895859a56226d09d79c81 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 12 Feb 2023 17:23:01 +0900 Subject: [PATCH 093/622] add Network API --- .../api/network/ClientNetwork.java | 24 ++++++++++++++ .../api/network/ServerNetworking.java | 33 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetwork.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ServerNetworking.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetwork.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetwork.java new file mode 100644 index 000000000..b11002271 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetwork.java @@ -0,0 +1,24 @@ +package ml.pkom.mcpitanlibarch.api.network; + +import dev.architectury.networking.NetworkManager; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.util.Identifier; + +import static dev.architectury.networking.NetworkManager.Side.S2C; + +public class ClientNetwork { + public static void send(Identifier identifier, PacketByteBuf buf) { + NetworkManager.sendToServer(identifier, buf); + } + + public static void registerReceiver(Identifier identifier, ClientNetworkHandler handler) { + NetworkManager.registerReceiver(S2C, identifier, ((buf, context) -> handler.receive(MinecraftClient.getInstance(), MinecraftClient.getInstance().player, buf))); + } + + @FunctionalInterface + public interface ClientNetworkHandler { + void receive(MinecraftClient client, ClientPlayerEntity player, PacketByteBuf buf); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ServerNetworking.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ServerNetworking.java new file mode 100644 index 000000000..1f1ec4106 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ServerNetworking.java @@ -0,0 +1,33 @@ +package ml.pkom.mcpitanlibarch.api.network; + +import dev.architectury.networking.NetworkManager; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.Identifier; + +import static dev.architectury.networking.NetworkManager.Side.C2S; + +public class ServerNetworking { + public static void send(ServerPlayerEntity player, Identifier identifier, PacketByteBuf buf) { + NetworkManager.sendToPlayer(player, identifier, buf); + } + + public static void send(Iterable players, Identifier identifier, PacketByteBuf buf) { + NetworkManager.sendToPlayers(players, identifier, buf); + } + + + public static void sendAll(MinecraftServer server, Identifier identifier, PacketByteBuf buf) { + send(server.getPlayerManager().getPlayerList(), identifier, buf); + } + + public static void registerReceiver(Identifier identifier, ServerNetworkHandler handler) { + NetworkManager.registerReceiver(C2S, identifier, ((buf, context) -> handler.receive(context.getPlayer().getServer(), (ServerPlayerEntity) context.getPlayer(), buf))); + } + + @FunctionalInterface + public interface ServerNetworkHandler { + void receive(MinecraftServer server, ServerPlayerEntity player, PacketByteBuf buf); + } +} From a679e86d0f6295e3ce565932ebdc569cb1d6b221 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 12 Feb 2023 17:23:25 +0900 Subject: [PATCH 094/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ff101ab04..2f6eff9c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.0-1.19.3 +mod_version=1.4.1-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From f69963cd518845a1243ce7ee9b20ff6e26b8a17e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 15:31:39 +0900 Subject: [PATCH 095/622] fix config --- .../pkom/mcpitanlibarch/MCPitanLibarch.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index a1a402bd2..ddbd67709 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -13,7 +13,7 @@ public class MCPitanLibarch { public static final String MOD_ID = "mcpitanlibarch"; - private static File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.yml"); + private static final File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.yml"); public static Config config = new YamlConfig(); private static boolean configLoaded = false; @@ -29,24 +29,28 @@ public static void init() { } public static void configInit() { - if (configLoaded) return; - configLoaded = true; - if (!configFile.getParentFile().exists()) - configFile.mkdirs(); + try { + if (configLoaded) return; + configLoaded = true; + if (!configFile.getParentFile().exists()) + if (!configFile.getParentFile().mkdirs()) + return; - config.setString("item", "examplemod:hogehoge_item,examplemod:fuga_item"); - config.setString("block", "examplemod:hogehoge_block,examplemod:fuga_block"); + config.setString("item", "examplemod:hogehoge_item,examplemod:fuga_item"); + config.setString("block", "examplemod:hogehoge_block,examplemod:fuga_block"); - config.load(configFile); + config.load(configFile); - if (config.configMap.containsKey("item")) - itemBlackList.addAll(Arrays.asList(config.getString("item").split(","))); + if (config.configMap.containsKey("item")) + itemBlackList.addAll(Arrays.asList(config.getString("item").split(","))); - if (config.configMap.containsKey("block")) - blockBlackList.addAll(Arrays.asList(config.getString("block").split(","))); - - config.save(configFile); + if (config.configMap.containsKey("block")) + blockBlackList.addAll(Arrays.asList(config.getString("block").split(","))); + config.save(configFile); + } catch (Exception e) { + System.out.println("MCPitanLib: Cannot save config file"); + } } } \ No newline at end of file From 33e447d2dfa98999f31509ae8c5ec538d2f24ad7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 15:32:04 +0900 Subject: [PATCH 096/622] rename MCPitanLibarch -> MCPitanLib --- fabric/src/main/resources/fabric.mod.json | 2 +- forge/src/main/resources/META-INF/mods.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c80ef2f86..e9f197567 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "mcpitanlibarch", "version": "${version}", - "name": "MCPitanLibarch", + "name": "MCPitanLib", "description": "Pitan's Minecraft Mod Library", "authors": [ "Pitan" diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index d9ee4dc6e..de7ad18be 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -21,7 +21,7 @@ modId = "mcpitanlibarch" #mandatory # see the associated build.gradle script for how to populate this completely automatically during a build version = "${version}" #mandatory # A display name for the mod -displayName = "MCPitanLibarch" #mandatory +displayName = "MCPitanLib" #mandatory # A URL to query for updates for this mod. See the JSON update specification #updateJSONURL="http://myurl.me/" #optional # A URL for the "homepage" for this mod, displayed in the mod UI From 2fbd5409472ac5354955219042583f96e06d0914 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 15:45:33 +0900 Subject: [PATCH 097/622] add ArchRegistryClient --- .../client/registry/ArchRegistryClient.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java new file mode 100644 index 000000000..e6d05a607 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java @@ -0,0 +1,19 @@ +package ml.pkom.mcpitanlibarch.api.client.registry; + +import dev.architectury.registry.menu.MenuRegistry; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.text.Text; + +public class ArchRegistryClient { + public > void registerScreen(ScreenHandlerType type, ScreenFactory factory) { + MenuRegistry.registerScreenFactory(type, factory::create); + } + + public interface ScreenFactory> { + S create(H handler, PlayerInventory inventory, Text text); + } +} From fb8ea4afd157eb208550abc0d7fcf1862a309724 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 16:13:26 +0900 Subject: [PATCH 098/622] fix add APIs --- .../api/event/v0/EventRegistry.java | 75 +++++++++++++++++++ ...ientNetwork.java => ClientNetworking.java} | 2 +- .../api/network/PacketByteUtil.java | 15 ++++ .../api/registry/ArchRegistry.java | 1 - 4 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java rename common/src/main/java/ml/pkom/mcpitanlibarch/api/network/{ClientNetwork.java => ClientNetworking.java} (96%) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java new file mode 100644 index 000000000..df8cc7fbd --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java @@ -0,0 +1,75 @@ +package ml.pkom.mcpitanlibarch.api.event.v0; + +import me.shedaniel.architectury.event.events.LifecycleEvent; +import me.shedaniel.architectury.event.events.PlayerEvent; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.World; + +public class EventRegistry { + + public static class ServerConnection { + // Architectury: PlayerEvent + public static void join(PlayerJoin state) { + PlayerEvent.PLAYER_JOIN.register(state::join); + } + + public static void quit(PlayerQuit state) { + PlayerEvent.PLAYER_QUIT.register(state::quit); + } + + interface PlayerJoin { + void join(ServerPlayerEntity player); + } + + interface PlayerQuit { + void quit(ServerPlayerEntity player); + } + } + + public static class ServerLifecycle { + // Architectury: LifecycleEvent + public static void serverStarted(ServerState state) { + LifecycleEvent.SERVER_STARTED.register(state::stateChanged); + } + + public static void serverStarting(ServerState state) { + LifecycleEvent.SERVER_STARTING.register(state::stateChanged); + } + + public static void serverStopped(ServerState state) { + LifecycleEvent.SERVER_STOPPED.register(state::stateChanged); + } + + public static void serverStopping(ServerState state) { + LifecycleEvent.SERVER_STOPPING.register(state::stateChanged); + } + + public static void serverWorldLoad(ServerWorldState state) { + LifecycleEvent.SERVER_WORLD_LOAD.register(state::act); + } + + public static void serverWorldSave(ServerWorldState state) { + LifecycleEvent.SERVER_WORLD_SAVE.register(state::act); + } + + public static void serverWorldUnload(ServerWorldState state) { + LifecycleEvent.SERVER_WORLD_UNLOAD.register(state::act); + } + + interface ServerState extends InstanceState { + } + + interface InstanceState { + void stateChanged(T instance); + } + + interface WorldState { + void act(T world); + } + + interface ServerWorldState extends WorldState { + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetwork.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetworking.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetwork.java rename to common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetworking.java index b11002271..99676c043 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetwork.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetworking.java @@ -8,7 +8,7 @@ import static dev.architectury.networking.NetworkManager.Side.S2C; -public class ClientNetwork { +public class ClientNetworking { public static void send(Identifier identifier, PacketByteBuf buf) { NetworkManager.sendToServer(identifier, buf); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java new file mode 100644 index 000000000..963404a2e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java @@ -0,0 +1,15 @@ +package ml.pkom.mcpitanlibarch.api.network; + +import io.netty.buffer.Unpooled; +import net.minecraft.network.PacketByteBuf; + +public class PacketByteUtil { + public static PacketByteBuf create() { + return new PacketByteBuf(Unpooled.buffer()); + } + + + public static PacketByteBuf empty() { + return new PacketByteBuf(Unpooled.EMPTY_BUFFER); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 610a73ab0..d4ad0fd9b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -7,7 +7,6 @@ import dev.architectury.registry.registries.RegistrySupplier; import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; -import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandler; import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerType; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; From 26c5313e0d68e12c97904eaf1cddfeb71885c728 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 16:33:04 +0900 Subject: [PATCH 099/622] fix extendScreen --- ...Type.java => ExtendedScreenHandlerTypeBuilder.java} | 10 +++++----- .../pkom/mcpitanlibarch/api/registry/ArchRegistry.java | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) rename common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/{ExtendedScreenHandlerType.java => ExtendedScreenHandlerTypeBuilder.java} (60%) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java similarity index 60% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java rename to common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java index 4db122a5a..ba608534f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerType.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java @@ -1,21 +1,21 @@ package ml.pkom.mcpitanlibarch.api.gui; +import me.shedaniel.architectury.registry.MenuRegistry; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; -public class ExtendedScreenHandlerType extends ScreenHandlerType { +public class ExtendedScreenHandlerTypeBuilder { private final Factory factory; - public ExtendedScreenHandlerType(Factory factory) { - super(null); + public ExtendedScreenHandlerTypeBuilder(Factory factory) { this.factory = factory; } - public T create(int syncId, PlayerInventory inventory, PacketByteBuf buf) { - return factory.create(syncId, inventory, buf); + public ScreenHandlerType build() { + return MenuRegistry.ofExtended(factory::create); } @FunctionalInterface diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index d4ad0fd9b..7d49cfc24 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -7,7 +7,7 @@ import dev.architectury.registry.registries.RegistrySupplier; import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; -import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerType; +import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; import net.minecraft.block.AbstractBlock; @@ -68,8 +68,9 @@ public RegistryEvent> registerScreenHandlerType(Identifier return new RegistryEvent<>(SCREEN_HANDLER_TYPE.register(id, supplier)); } - public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { - return registerScreenHandlerType(id, () -> MenuRegistry.ofExtended((id1, inventory, buf) -> supplier.get().create(id1, inventory, buf))); + @Deprecated + public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { + return registerScreenHandlerType(id, () -> supplier.get().build()); } public RegistryEvent> registerMenu(Identifier id, Supplier> supplier) { From 40272ab17b9bf15fed7d408abefd7be6262eaa8f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 16:41:48 +0900 Subject: [PATCH 100/622] EventRegistry --- .../mcpitanlibarch/api/event/v0/EventRegistry.java | 10 +++++----- .../api/gui/ExtendedScreenHandlerTypeBuilder.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java index df8cc7fbd..2f2c0c606 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java @@ -1,7 +1,7 @@ package ml.pkom.mcpitanlibarch.api.event.v0; -import me.shedaniel.architectury.event.events.LifecycleEvent; -import me.shedaniel.architectury.event.events.PlayerEvent; +import dev.architectury.event.events.common.LifecycleEvent; +import dev.architectury.event.events.common.PlayerEvent; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; @@ -47,15 +47,15 @@ public static void serverStopping(ServerState state) { } public static void serverWorldLoad(ServerWorldState state) { - LifecycleEvent.SERVER_WORLD_LOAD.register(state::act); + LifecycleEvent.SERVER_LEVEL_LOAD.register(state::act); } public static void serverWorldSave(ServerWorldState state) { - LifecycleEvent.SERVER_WORLD_SAVE.register(state::act); + LifecycleEvent.SERVER_LEVEL_SAVE.register(state::act); } public static void serverWorldUnload(ServerWorldState state) { - LifecycleEvent.SERVER_WORLD_UNLOAD.register(state::act); + LifecycleEvent.SERVER_LEVEL_UNLOAD.register(state::act); } interface ServerState extends InstanceState { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java index ba608534f..189408749 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java @@ -1,6 +1,6 @@ package ml.pkom.mcpitanlibarch.api.gui; -import me.shedaniel.architectury.registry.MenuRegistry; +import dev.architectury.registry.menu.MenuRegistry; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandler; From f6d253d753c653811188bf868f4558a7883ab60e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 16:50:20 +0900 Subject: [PATCH 101/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2f6eff9c4..53400aa12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.1-1.19.3 +mod_version=1.4.2-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 4d21e29eca6751ac318611c86664325a83d30c33 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 17:20:16 +0900 Subject: [PATCH 102/622] fix --- .../api/client/registry/ArchRegistryClient.java | 2 +- .../mcpitanlibarch/api/event/v0/EventRegistry.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java index e6d05a607..431d34779 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java @@ -9,7 +9,7 @@ import net.minecraft.text.Text; public class ArchRegistryClient { - public > void registerScreen(ScreenHandlerType type, ScreenFactory factory) { + public static > void registerScreen(ScreenHandlerType type, ScreenFactory factory) { MenuRegistry.registerScreenFactory(type, factory::create); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java index 2f2c0c606..704ac494f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java @@ -19,11 +19,11 @@ public static void quit(PlayerQuit state) { PlayerEvent.PLAYER_QUIT.register(state::quit); } - interface PlayerJoin { + public interface PlayerJoin { void join(ServerPlayerEntity player); } - interface PlayerQuit { + public interface PlayerQuit { void quit(ServerPlayerEntity player); } } @@ -58,18 +58,18 @@ public static void serverWorldUnload(ServerWorldState state) { LifecycleEvent.SERVER_LEVEL_UNLOAD.register(state::act); } - interface ServerState extends InstanceState { + public interface ServerState extends InstanceState { } - interface InstanceState { + public interface InstanceState { void stateChanged(T instance); } - interface WorldState { + public interface WorldState { void act(T world); } - interface ServerWorldState extends WorldState { + public interface ServerWorldState extends WorldState { } } } From 5ecf17de36de764a2f27586f994c3487ba4e331e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 16 Feb 2023 17:22:57 +0900 Subject: [PATCH 103/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 53400aa12..66b01aada 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.2-1.19.3 +mod_version=1.4.3-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 4c07a2cd05416d3f415b5ae57a512606bb3dbe5a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 25 Feb 2023 21:46:02 +0900 Subject: [PATCH 104/622] Add onSlotClick --- .../mcpitanlibarch/api/gui/SimpleScreenHandler.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java index bf88684f9..8175bf3bf 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java @@ -8,6 +8,7 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; +import net.minecraft.screen.slot.SlotActionType; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -207,4 +208,14 @@ public Slot getSlot(int index) { public Slot callGetSlot(int index) { return getSlot(index); } + + @Deprecated + @Override + public void onSlotClick(int slotIndex, int button, SlotActionType actionType, PlayerEntity player) { + overrideOnSlotClick(slotIndex, button, actionType, new Player(player)); + } + + public void overrideOnSlotClick(int slotIndex, int button, SlotActionType actionType, Player player) { + super.onSlotClick(slotIndex, button, actionType, player.getPlayerEntity()); + } } From e46d7682d089da54ddc33e20f6475f156c8f41a9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 25 Feb 2023 21:50:27 +0900 Subject: [PATCH 105/622] gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 66b01aada..1024db042 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.3-1.19.3 +mod_version=1.4.4-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From ca97ad97f9af92bf1d36ae7bb724e2f09c41049e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 3 Mar 2023 02:07:56 +0900 Subject: [PATCH 106/622] delete architectury.common.json --- common/src/main/resources/architectury.common.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 common/src/main/resources/architectury.common.json diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json deleted file mode 100644 index 3c2b8ca8e..000000000 --- a/common/src/main/resources/architectury.common.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "accessWidener": "mcpitanlibarch.accesswidener" -} \ No newline at end of file From bc23459b3d528a3dca02fe41677aabf0edd52737 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 3 Mar 2023 02:13:01 +0900 Subject: [PATCH 107/622] gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1024db042..c0143a378 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.4-1.19.3 +mod_version=1.4.5-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 381a56717c9bb65c17e2da6d27d2715e842732e9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 3 Mar 2023 17:54:29 +0900 Subject: [PATCH 108/622] add ExtendedNamedScreenHandlerFactory --- .../ExtendedNamedScreenHandlerFactory.java | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedNamedScreenHandlerFactory.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedNamedScreenHandlerFactory.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedNamedScreenHandlerFactory.java new file mode 100644 index 000000000..2a97c5b82 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedNamedScreenHandlerFactory.java @@ -0,0 +1,45 @@ +package ml.pkom.mcpitanlibarch.api.gui; + +import dev.architectury.registry.menu.ExtendedMenuProvider; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerFactory; +import net.minecraft.text.Text; +import org.jetbrains.annotations.Nullable; + +public class ExtendedNamedScreenHandlerFactory implements ExtendedMenuProvider { + + private final Text name; + private final ScreenHandlerFactory baseFactory; + private final PacketByteBufFactory bufFactory; + + public ExtendedNamedScreenHandlerFactory(Text name, ScreenHandlerFactory baseFactory, PacketByteBufFactory bufFactory) { + this.name = name; + this.baseFactory = baseFactory; + this.bufFactory = bufFactory; + } + + @Override + public void saveExtraData(PacketByteBuf buf) { + bufFactory.saveExtraData(buf); + } + + @Override + public Text getDisplayName() { + return name; + } + + @Nullable + @Override + public ScreenHandler createMenu(int syncId, PlayerInventory inv, PlayerEntity player) { + return baseFactory.createMenu(syncId, inv, player); + + } + + @FunctionalInterface + public interface PacketByteBufFactory { + void saveExtraData(PacketByteBuf buf); + } +} From ea3b8693414a4ebefffcaddd13c68196808c3480 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 3 Mar 2023 17:54:45 +0900 Subject: [PATCH 109/622] gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c0143a378..de479ff7b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.5-1.19.3 +mod_version=1.4.6-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 7895fc2801513451199722f7fdca073e8da2b468 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 4 Mar 2023 22:30:48 +0900 Subject: [PATCH 110/622] ScreenUtil api --- .../RedrawableTexturedButtonWidget.java | 64 +++++++++++++++++++ .../api/util/client/RenderUtil.java | 23 +++++++ .../api/util/client/ScreenUtil.java | 53 +++++++++++++-- 3 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java new file mode 100644 index 000000000..fd178c796 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java @@ -0,0 +1,64 @@ +package ml.pkom.mcpitanlibarch.api.client.gui.widget; + +import ml.pkom.mcpitanlibarch.api.util.client.RenderUtil; +import net.minecraft.client.gui.widget.TexturedButtonWidget; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class RedrawableTexturedButtonWidget extends TexturedButtonWidget { + public Identifier texture; + public int u; + public int v; + public int hoveredVOffset; + public int textureWidth; + public int textureHeight; + + public RedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction, Text message) { + super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message); + this.textureWidth = textureWidth; + this.textureHeight = textureHeight; + this.u = u; + this.v = v; + this.hoveredVOffset = hoveredVOffset; + this.texture = texture; + } + + public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { + RenderUtil.setShaderToPositionTexProgram(); + RenderUtil.setShaderTexture(0, this.texture); + int i = this.v; + if (!this.isNarratable()) { + i += this.hoveredVOffset * 2; + } else if (this.isHovered()) { + i += this.hoveredVOffset; + } + + RenderUtil.enableDepthTest(); + drawTexture(matrices, this.getX(), this.getY(), (float)this.u, (float)i, this.width, this.height, this.textureWidth, this.textureHeight); + } + + public void setTexture(Identifier texture) { + this.texture = texture; + } + + public void setU(int u) { + this.u = u; + } + + public void setV(int v) { + this.v = v; + } + + public void setHoveredVOffset(int hoveredVOffset) { + this.hoveredVOffset = hoveredVOffset; + } + + public void setTextureWidth(int textureWidth) { + this.textureWidth = textureWidth; + } + + public void setTextureHeight(int textureHeight) { + this.textureHeight = textureHeight; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java new file mode 100644 index 000000000..2a6f0af8e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java @@ -0,0 +1,23 @@ +package ml.pkom.mcpitanlibarch.api.util.client; + +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.util.Identifier; + +public class RenderUtil { + public static void setShaderToPositionTexProgram() { + RenderSystem.setShader(GameRenderer::getPositionTexProgram); + } + + public static void setShaderColor(float red, float green, float blue, float alpha) { + RenderSystem.setShaderColor(red, green, blue, alpha); + } + + public static void setShaderTexture(int texture, Identifier id) { + RenderSystem.setShaderTexture(texture, id); + } + + public static void enableDepthTest() { + RenderSystem.enableDepthTest(); + } +} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 2f1d441af..8e6527888 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -1,12 +1,11 @@ package ml.pkom.mcpitanlibarch.api.util.client; -import com.mojang.blaze3d.systems.RenderSystem; +import ml.pkom.mcpitanlibarch.api.client.gui.widget.RedrawableTexturedButtonWidget; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.gui.widget.TexturedButtonWidget; +import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -15,9 +14,9 @@ @Environment(EnvType.CLIENT) public class ScreenUtil { public static void setBackground(Identifier GUI, float f, float g, float h, float i) { - RenderSystem.setShader(GameRenderer::getPositionTexProgram); - RenderSystem.setShaderColor(f, g, h, i); - RenderSystem.setShaderTexture(0, GUI); + RenderUtil.setShaderToPositionTexProgram(); + RenderUtil.setShaderColor(f, g, h, i); + RenderUtil.setShaderTexture(0, GUI); // GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); // MinecraftClient.getInstance().getTextureManager().bindTexture(GUI); @@ -42,4 +41,44 @@ public static ButtonWidget createButtonWidget(int x, int y, int width, int heigh return builder.build(); } + + public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, ButtonWidget.PressAction pressAction) { + return createTexturedButtonWidget(x, y, width, height, u, v, height, texture, pressAction); + } + + public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, ButtonWidget.PressAction pressAction) { + return createTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, 256, 256, pressAction); + } + + public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { + return createTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, Texts.empty()); + } + + public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text message) { + return new TexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, ButtonWidget.PressAction pressAction) { + return createRedrawableTexturedButtonWidget(x, y, width, height, u, v, height, texture, pressAction); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, ButtonWidget.PressAction pressAction) { + return createRedrawableTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, 256, 256, pressAction); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { + return createRedrawableTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, Texts.empty()); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text message) { + return new RedrawableTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message); + } + + + + public static class Texts { + public static Text empty() { + return ScreenTexts.EMPTY; + } + } } From 949559d27daa0a9bce56357ca551dba1d95b1602 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 4 Mar 2023 22:31:00 +0900 Subject: [PATCH 111/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index de479ff7b..474d4b7f7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.6-1.19.3 +mod_version=1.4.7-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From c58b4fb50fb0e37053ff04da3414e38647623283 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 7 Mar 2023 15:41:44 +0900 Subject: [PATCH 112/622] add player pos --- .../java/ml/pkom/mcpitanlibarch/api/entity/Player.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index c759e6377..c851f91c0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -12,6 +12,7 @@ import net.minecraft.text.Text; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import java.util.OptionalInt; @@ -185,4 +186,12 @@ public void dropStack(ItemStack stack, boolean retainOwnership) { public void dropStack(ItemStack stack) { dropStack(stack, false, false); } + + public BlockPos getBlockPos() { + return getEntity().getBlockPos(); + } + + public Vec3d getPos() { + return getEntity().getPos(); + } } \ No newline at end of file From 44be9e48bd8441bd03d752bd01f4bcd5ee7c1306 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 7 Mar 2023 18:30:55 +0900 Subject: [PATCH 113/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 474d4b7f7..19648c7b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.7-1.19.3 +mod_version=1.4.8-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From dede1b41974969e3e0ad6c37380df8c8cba41153 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 8 Mar 2023 14:24:42 +0900 Subject: [PATCH 114/622] add API --- .../pkom/mcpitanlibarch/MCPitanLibarch.java | 6 +++-- .../gui/SimpleScreenHandlerTypeBuilder.java | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index ddbd67709..88896b8db 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -3,7 +3,6 @@ import ml.pkom.easyapi.config.Config; import ml.pkom.easyapi.config.YamlConfig; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; -import ml.pkom.mcpitanlibarch.test.ExampleMod; import java.io.File; import java.util.ArrayList; @@ -23,9 +22,11 @@ public class MCPitanLibarch { public static void init() { configInit(); + /* if (PlatformUtil.isDevelopmentEnvironment()) { ExampleMod.init(); } + */ } public static void configInit() { @@ -39,7 +40,8 @@ public static void configInit() { config.setString("item", "examplemod:hogehoge_item,examplemod:fuga_item"); config.setString("block", "examplemod:hogehoge_block,examplemod:fuga_block"); - config.load(configFile); + if (configFile.exists()) + config.load(configFile); if (config.configMap.containsKey("item")) itemBlackList.addAll(Arrays.asList(config.getString("item").split(","))); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java new file mode 100644 index 000000000..d95902f28 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java @@ -0,0 +1,23 @@ +package ml.pkom.mcpitanlibarch.api.gui; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; + +public class SimpleScreenHandlerTypeBuilder { + + private final Factory factory; + + public SimpleScreenHandlerTypeBuilder(Factory factory) { + this.factory = factory; + } + + public ScreenHandlerType build() { + return new ScreenHandlerType<>(factory::create); + } + + @FunctionalInterface + public interface Factory { + T create(int syncId, PlayerInventory inventory); + } +} From 9340fc2807bbcd55ce0989f914178647a9c94520 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 8 Mar 2023 14:24:55 +0900 Subject: [PATCH 115/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 19648c7b1..c77a20d45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.3 archives_base_name=mcpitanlibarch -mod_version=1.4.8-1.19.3 +mod_version=1.4.9-1.19.3 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From c89fe4015311ff1d9ef4516182e7f1fcbf007e2f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 14 Mar 2023 12:43:07 +0900 Subject: [PATCH 116/622] add quilt --- gradle.properties | 9 +- quilt/build.gradle | 91 +++++++++++++++++++ .../quilt/MCPitanLibarchQuilt.java | 13 +++ .../quilt/mixin/RecipeMixin.java | 28 ++++++ .../main/resources/mcpitanlibarch.mixins.json | 14 +++ quilt/src/main/resources/quilt.mod.json | 55 +++++++++++ settings.gradle | 7 +- 7 files changed, 214 insertions(+), 3 deletions(-) create mode 100644 quilt/build.gradle create mode 100644 quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/MCPitanLibarchQuilt.java create mode 100644 quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/mixin/RecipeMixin.java create mode 100644 quilt/src/main/resources/mcpitanlibarch.mixins.json create mode 100644 quilt/src/main/resources/quilt.mod.json diff --git a/gradle.properties b/gradle.properties index c77a20d45..0f20a15ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,11 @@ fabric_api_version=0.68.1+1.19.3 # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.19.3-44.0.1 -forgeEnabled=true \ No newline at end of file + +# https://lambdaurora.dev/tools/import_quilt.html +quilt_loader_version=0.18.4-pre.3 +quilt_fabric_api_version=5.0.0-beta.8+0.75.1 + +fabricEnabled=true +forgeEnabled=true +quiltEnabled=false \ No newline at end of file diff --git a/quilt/build.gradle b/quilt/build.gradle new file mode 100644 index 000000000..9f82c2a25 --- /dev/null +++ b/quilt/build.gradle @@ -0,0 +1,91 @@ +plugins { + id "com.github.johnrengelman.shadow" version "7.1.2" +} + +architectury { + platformSetupLoomIde() + loader("quilt") +} + +repositories { + maven { url "https://maven.quiltmc.org/repository/release/" } +} + +loom { + accessWidenerPath = project(":common").loom.accessWidenerPath +} + +configurations { + common + shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentFabric.extendsFrom common +} + +dependencies { + modImplementation "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}" + modApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}-${minecraft_version}" + // Remove the next line if you don't want to depend on the API + modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" + + common(project(path: ":common", configuration: "namedElements")) { transitive false } + shadowCommon(project(path: ":common", configuration: "transformProductionQuilt")) { transitive false } + + shadowCommon 'org.yaml:snakeyaml:1.33' + +} + +processResources { + inputs.property "version", project.version + + filesMatching("quilt.mod.json") { + expand "version": project.version + } + + project.version = project.version + "-quilt" +} + +shadowJar { + exclude "architectury.common.json" + + configurations = [project.configurations.shadowCommon] + classifier "dev-shadow" +} + +remapJar { + injectAccessWidener = true + inputFile.set shadowJar.archiveFile + dependsOn shadowJar + classifier null +} + +jar { + classifier "dev" +} + +sourcesJar { + def commonSources = project(":common").sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } +} + +components.java { + withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { + skip() + } +} + +publishing { + publications { + mavenFabric(MavenPublication) { + artifactId = rootProject.archives_base_name + "-" + project.name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} \ No newline at end of file diff --git a/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/MCPitanLibarchQuilt.java b/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/MCPitanLibarchQuilt.java new file mode 100644 index 000000000..6d40e85c6 --- /dev/null +++ b/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/MCPitanLibarchQuilt.java @@ -0,0 +1,13 @@ +package ml.pkom.mcpitanlibarch.quilt; + +import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import org.quiltmc.loader.api.ModContainer; +import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; + +public class MCPitanLibarchQuilt implements ModInitializer { + + @Override + public void onInitialize(ModContainer mod) { + MCPitanLibarch.init(); + } +} \ No newline at end of file diff --git a/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/mixin/RecipeMixin.java b/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/mixin/RecipeMixin.java new file mode 100644 index 000000000..dd7f6e646 --- /dev/null +++ b/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/mixin/RecipeMixin.java @@ -0,0 +1,28 @@ +package ml.pkom.mcpitanlibarch.fabric.mixin; + +import ml.pkom.mcpitanlibarch.api.item.FixedRecipeRemainderItem; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Recipe; +import net.minecraft.util.collection.DefaultedList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Recipe.class) +public interface RecipeMixin { + @Inject(method = "getRemainder", at = @At("RETURN")) + default void injectGetRemainder(C inventory, CallbackInfoReturnable> cir) { + DefaultedList defaultedList = cir.getReturnValue(); + + int i = 0; + for(ItemStack stack : defaultedList) { + if (stack.getItem() instanceof FixedRecipeRemainderItem) { + FixedRecipeRemainderItem remainder = (FixedRecipeRemainderItem) stack.getItem(); + defaultedList.set(i, remainder.getFixedRecipeRemainder(stack.copy())); + } + i++; + } + } +} diff --git a/quilt/src/main/resources/mcpitanlibarch.mixins.json b/quilt/src/main/resources/mcpitanlibarch.mixins.json new file mode 100644 index 000000000..864f03833 --- /dev/null +++ b/quilt/src/main/resources/mcpitanlibarch.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "ml.pkom.mcpitanlibarch.fabric.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "RecipeMixin" + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json new file mode 100644 index 000000000..87bf5b401 --- /dev/null +++ b/quilt/src/main/resources/quilt.mod.json @@ -0,0 +1,55 @@ +{ + "schemaVersion": 1, + "quilt_loader" : { + "group": "ml.pkom", + "id": "mcpitanlibarch", + "version": "${version}", + "metadata" : { + "name": "MCPitanLib", + "description": "Pitan's Minecraft Mod Library", + "authors": [ + "Pitan" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch", + "sources": "https://github.com/Pitan76/mcpitanlibarch", + "issues": "https://github.com/Pitan76/mcpitanlibarch/issue" + }, + "license": "MIT", + "icon": "icon.png" + }, + "intermediate_mappings": "net.fabricmc:intermediary", + "environment": "*", + "entrypoints": { + "init": [ + "ml.pkom.mcpitanlibarch.quilt.MCPitanLibarchQuilt" + ] + }, + "custom": { + "modmenu": { + "badges": [ + "library" + ] + } + }, + "depends": [ + { + "id": "minecraft", + "version": ">1.19.2" + }, + { + "id": "quilt_loader", + "version": "*" + }, + { + "id": "architectury", + "version": "*" + } + ] + }, + "accessWidener": "mcpitanlibarch.accesswidener", + "mixins": [ + "mcpitanlibarch.mixins.json", + "mcpitanlibarch-common.mixins.json" + ] +} diff --git a/settings.gradle b/settings.gradle index dad7c8b8c..942e06022 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,6 +8,9 @@ pluginManagement { } include("common") -include("fabric") +if (fabricEnabled.toBoolean()) + include("fabric") if (forgeEnabled.toBoolean()) - include("forge") \ No newline at end of file + include("forge") +if (quiltEnabled.toBoolean()) + include("quilt") \ No newline at end of file From d6b417f9f60903a1edf16aae58eef9ab8af6e3cc Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 14 Mar 2023 12:43:28 +0900 Subject: [PATCH 117/622] fix gradle etc --- fabric/build.gradle | 2 +- .../ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java | 6 +++--- forge/build.gradle | 2 +- .../ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java | 5 +++-- .../forge/client/MCPitanLibarchForgeClient.java | 6 ++---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index bc8ea7ff8..4d019730d 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -50,7 +50,7 @@ shadowJar { remapJar { injectAccessWidener = true - input.set shadowJar.archiveFile + inputFile.set shadowJar.archiveFile dependsOn shadowJar classifier null } diff --git a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java index 43c91610b..7351eef18 100644 --- a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java +++ b/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java @@ -1,17 +1,17 @@ package ml.pkom.mcpitanlibarch.fabric; import ml.pkom.mcpitanlibarch.MCPitanLibarch; -import ml.pkom.mcpitanlibarch.test.ExampleModClient; -import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; -import net.fabricmc.loader.api.FabricLoader; public class MCPitanLibarchFabric implements ModInitializer { @Override public void onInitialize() { MCPitanLibarch.init(); + /* if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) if (FabricLoader.getInstance().isDevelopmentEnvironment()) ExampleModClient.init(); + + */ } } \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index 2678fde7f..eef5cfd94 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -56,7 +56,7 @@ shadowJar { } remapJar { - input.set shadowJar.archiveFile + inputFile.set shadowJar.archiveFile dependsOn shadowJar classifier null } diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java index bcc7e2447..30d38550d 100644 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java +++ b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java @@ -1,10 +1,8 @@ package ml.pkom.mcpitanlibarch.forge; -import dev.architectury.platform.Platform; import dev.architectury.platform.forge.EventBuses; import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; -import ml.pkom.mcpitanlibarch.forge.client.MCPitanLibarchForgeClient; import ml.pkom.mcpitanlibarch.test.ExampleMod; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -19,7 +17,10 @@ public MCPitanLibarchForge() { MCPitanLibarch.init(); + /* if (Platform.getEnv().isClient()) FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchForgeClient::clientInit); + + */ } } \ No newline at end of file diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java index 547a4b49c..7d550a485 100644 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java +++ b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java @@ -1,12 +1,10 @@ package ml.pkom.mcpitanlibarch.forge.client; -import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; -import ml.pkom.mcpitanlibarch.test.ExampleModClient; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; public class MCPitanLibarchForgeClient { public static void clientInit(FMLClientSetupEvent event) { - if (PlatformUtil.isDevelopmentEnvironment()) - ExampleModClient.init(); + //if (PlatformUtil.isDevelopmentEnvironment()) + // ExampleModClient.init(); } } From 146e3d056649c774981269d11f37f1133b6a535a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 11:52:23 +0900 Subject: [PATCH 118/622] gradle --- gradle.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0f20a15ce..6aad0cb90 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,25 +1,25 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.19.3 +minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.4.9-1.19.3 +mod_version=1.4.9-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api architectury_version=7.0.65 # https://fabricmc.net/develop/ -fabric_loader_version=0.14.11 -yarn_mappings=1.19.3+build.2 -fabric_api_version=0.68.1+1.19.3 +fabric_loader_version=0.14.17 +yarn_mappings=1.19.4+build.1 +fabric_api_version=0.75.3+1.19.4 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.19.3-44.0.1 +forge_version=1.19.4- # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.18.4-pre.3 -quilt_fabric_api_version=5.0.0-beta.8+0.75.1 +quilt_fabric_api_version= fabricEnabled=true -forgeEnabled=true +forgeEnabled=false quiltEnabled=false \ No newline at end of file From c269fb13f4b3fdd5c85eb3d27821b1f4fd73a44f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 12:34:14 +0900 Subject: [PATCH 119/622] port to 1.19.4 --- .../java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java | 2 +- .../ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java | 4 ++-- .../api/gui/SimpleScreenHandlerTypeBuilder.java | 3 ++- .../src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java | 3 ++- common/src/main/resources/mcpitanlibarch.accesswidener | 4 ++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java index a5431c660..c2d163c11 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java @@ -4,8 +4,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.nbt.NbtCompound; -import net.minecraft.network.Packet; import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.Packet; import net.minecraft.world.World; public class ExtendEntity extends Entity { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java index 8175bf3bf..66674057b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java @@ -55,12 +55,12 @@ protected Slot addSlot(Slot slot) { @Deprecated @Override - public void close(PlayerEntity player) { + public void onClosed(PlayerEntity player) { this.close(new Player(player)); } public void close(Player player) { - super.close(player.getPlayerEntity()); + super.onClosed(player.getPlayerEntity()); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java index d95902f28..30bdac46c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java @@ -1,6 +1,7 @@ package ml.pkom.mcpitanlibarch.api.gui; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; @@ -13,7 +14,7 @@ public SimpleScreenHandlerTypeBuilder(Factory factory) { } public ScreenHandlerType build() { - return new ScreenHandlerType<>(factory::create); + return new ScreenHandlerType<>(factory::create, FeatureFlags.VANILLA_FEATURES); } @FunctionalInterface diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java index e706cd78e..2835fe322 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -2,6 +2,7 @@ import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; +import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandlerTypeBuilder; import ml.pkom.mcpitanlibarch.api.item.DefaultItemGroups; import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; @@ -33,7 +34,7 @@ public static Identifier id(String id) { public static ArchRegistry registry = ArchRegistry.createRegistry(MOD_ID); - public static RegistryEvent> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new ScreenHandlerType<>(ExampleScreenHandler::new));; + public static RegistryEvent> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); public static RegistryEvent EXAMPLE_ITEM_SUPPLIER; public static RegistryEvent EXAMPLE_BLOCK_SUPPLIER; diff --git a/common/src/main/resources/mcpitanlibarch.accesswidener b/common/src/main/resources/mcpitanlibarch.accesswidener index 19d82bfef..00bc14b46 100644 --- a/common/src/main/resources/mcpitanlibarch.accesswidener +++ b/common/src/main/resources/mcpitanlibarch.accesswidener @@ -13,3 +13,7 @@ accessible field net/minecraft/item/ItemGroups INGREDIENTS Lnet/mine accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minecraft/item/ItemGroup; accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/item/ItemGroup; accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/item/ItemGroup; + +accessible class net/minecraft/screen/ScreenHandlerType$Factory +accessible method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V +extendable method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V \ No newline at end of file From 6ff3fdb885ba710234cccbc3d1a1c4aa5059bc71 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 17:26:38 +0900 Subject: [PATCH 120/622] add API --- .../mcpitanlibarch/api/util/client/RenderUtil.java | 8 ++++++++ .../pkom/mcpitanlibarch/api/util/math/PosUtil.java | 14 ++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java index 2a6f0af8e..4156c0b48 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java @@ -20,4 +20,12 @@ public static void setShaderTexture(int texture, Identifier id) { public static void enableDepthTest() { RenderSystem.enableDepthTest(); } + + public static void enableTexture() { + // ～1.19.2 + } + + public static void disableTexture() { + // ～1.19.2 + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java new file mode 100644 index 000000000..f01f1f046 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java @@ -0,0 +1,14 @@ +package ml.pkom.mcpitanlibarch.api.util.math; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Position; + +public class PosUtil { + public BlockPos flooredBlockPos(double x, double y, double z) { + return BlockPos.ofFloored(x, y, z); + } + + public BlockPos flooredBlockPos(Position pos) { + return BlockPos.ofFloored(pos); + } +} From 30f261ae529d46cf6781b40280fa6da25f056faf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 17:26:52 +0900 Subject: [PATCH 121/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6aad0cb90..5b59d996b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.4.9-1.19.4 +mod_version=1.5.0-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From a9f40523e1fbe9f498a4a6eacc28c9e7cdae4442 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 17:27:53 +0900 Subject: [PATCH 122/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5b59d996b..c17db6b34 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ yarn_mappings=1.19.4+build.1 fabric_api_version=0.75.3+1.19.4 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.19.4- +forge_version=1.19.4-45.0.1 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.18.4-pre.3 From a39d8cfd22b7f080c6e3fcd0fc81b50f77682bdd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 17:38:02 +0900 Subject: [PATCH 123/622] info --- fabric/src/main/resources/fabric.mod.json | 2 +- forge/src/main/resources/META-INF/mods.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index e9f197567..02e30a00b 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ ], "accessWidener" : "mcpitanlibarch.accesswidener", "depends": { - "minecraft": ">1.19.2", + "minecraft": ">1.19.3", "fabricloader": "*", "architectury": "*" } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index de7ad18be..59649356e 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -53,6 +53,6 @@ side = "BOTH" modId = "minecraft" mandatory = true # This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange = "[1.19,)" +versionRange = "[1.19.4,)" ordering = "NONE" side = "BOTH" From 4d9bf230513e24d5824f3386c62fc7ad882114c5 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 17:55:43 +0900 Subject: [PATCH 124/622] forge --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c17db6b34..9cb6cf397 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ quilt_loader_version=0.18.4-pre.3 quilt_fabric_api_version= fabricEnabled=true -forgeEnabled=false +forgeEnabled=true quiltEnabled=false \ No newline at end of file From 92d1107427da3ddcbf8e560b8a3cac36b3f72e83 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 19:57:29 +0900 Subject: [PATCH 125/622] add api & add icon --- .../mcpitanlibarch/api/util/RecipeUtil.java | 13 +++++++++++++ .../api/util/client/ScreenUtil.java | 7 +++++++ fabric/src/main/resources/icon.png | Bin 0 -> 31357 bytes forge/src/main/resources/icon.png | Bin 0 -> 31357 bytes 4 files changed, 20 insertions(+) create mode 100644 fabric/src/main/resources/icon.png create mode 100644 forge/src/main/resources/icon.png diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java index 5e99c8e32..099afc1fd 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -1,11 +1,15 @@ package ml.pkom.mcpitanlibarch.api.util; +import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.Recipe; import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; +import net.minecraft.world.World; public class RecipeUtil { public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { @@ -16,6 +20,15 @@ public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, return createShapelessRecipe(id, group, CompatibilityCraftingRecipeCategory.MISC, output, input); } + public static ItemStack craft(Recipe recipe, Inventory inventory, World world) { + return recipe.craft(inventory, world.getRegistryManager()); + } + + + public static ItemStack getOutput(Recipe recipe, World world) { + return recipe.getOutput(world.getRegistryManager()); + } + public enum CompatibilityCraftingRecipeCategory { BUILDING, REDSTONE, diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 8e6527888..6b1d62c1f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -4,6 +4,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; @@ -81,4 +82,10 @@ public static Text empty() { return ScreenTexts.EMPTY; } } + + public static class TextFieldUtil { + public static void setFocused(TextFieldWidget widget, boolean focused) { + widget.setFocused(focused); + } + } } diff --git a/fabric/src/main/resources/icon.png b/fabric/src/main/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ee30da76cfb8f1e8b1d336ca50b7011afa1ac8 GIT binary patch literal 31357 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

7KoUGA9beKtdXX^n>aq2ip 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 literal 0 HcmV?d00001 diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a8ee30da76cfb8f1e8b1d336ca50b7011afa1ac8 GIT binary patch literal 31357 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

7KoUGA9beKtdXX^n>aq2ip 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 literal 0 HcmV?d00001 From 90e9bb0068d3c65f3c30ae07108532d29764f4c0 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 19:57:48 +0900 Subject: [PATCH 126/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9cb6cf397..ff48565b6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.0-1.19.4 +mod_version=1.5.1-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 41aabf815fa8c83026d584da6f57881f8c430e67 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 20:00:02 +0900 Subject: [PATCH 127/622] fix --- common/src/main/resources/icon.png | Bin 31357 -> 0 bytes fabric/src/main/resources/icon.png | Bin 31357 -> 0 bytes forge/src/main/resources/icon.png | Bin 31357 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 fabric/src/main/resources/icon.png delete mode 100644 forge/src/main/resources/icon.png diff --git a/common/src/main/resources/icon.png b/common/src/main/resources/icon.png index a8ee30da76cfb8f1e8b1d336ca50b7011afa1ac8..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 GIT binary patch literal 0 HcmV?d00001 literal 31357 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

7KoUGA9beKtdXX^n>aq2ip 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 diff --git a/fabric/src/main/resources/icon.png b/fabric/src/main/resources/icon.png deleted file mode 100644 index a8ee30da76cfb8f1e8b1d336ca50b7011afa1ac8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31357 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

7KoUGA9beKtdXX^n>aq2ip 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 diff --git a/forge/src/main/resources/icon.png b/forge/src/main/resources/icon.png deleted file mode 100644 index a8ee30da76cfb8f1e8b1d336ca50b7011afa1ac8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31357 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

7KoUGA9beKtdXX^n>aq2ip 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 From 70aad091f3aefad37de7b2b5ca2e8b20cff1f09e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 22:38:12 +0900 Subject: [PATCH 128/622] Fix API --- .../java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java | 5 ++--- .../ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java | 8 ++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java index 099afc1fd..01e19d5fc 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -6,7 +6,6 @@ import net.minecraft.recipe.Recipe; import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; -import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; @@ -20,12 +19,12 @@ public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, return createShapelessRecipe(id, group, CompatibilityCraftingRecipeCategory.MISC, output, input); } - public static ItemStack craft(Recipe recipe, Inventory inventory, World world) { + public static ItemStack craft(Recipe recipe, C inventory, World world) { return recipe.craft(inventory, world.getRegistryManager()); } - public static ItemStack getOutput(Recipe recipe, World world) { + public static ItemStack getOutput(Recipe recipe, World world) { return recipe.getOutput(world.getRegistryManager()); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java index f01f1f046..cf83c5460 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java @@ -2,13 +2,17 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Position; +import net.minecraft.util.math.Vec3d; public class PosUtil { - public BlockPos flooredBlockPos(double x, double y, double z) { + public static BlockPos flooredBlockPos(double x, double y, double z) { return BlockPos.ofFloored(x, y, z); } - public BlockPos flooredBlockPos(Position pos) { + public static BlockPos flooredBlockPos(Position pos) { + return BlockPos.ofFloored(pos); + } + public static BlockPos flooredBlockPos(Vec3d pos) { return BlockPos.ofFloored(pos); } } From a9c1bf53b77da5cb46ad4b9eb9bff247b5412dd2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 22:43:06 +0900 Subject: [PATCH 129/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ff48565b6..1a391c04d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.1-1.19.4 +mod_version=1.5.2-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From aa8bc862760925416c494624a98e69b079fcc34a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 15 Mar 2023 23:04:16 +0900 Subject: [PATCH 130/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1a391c04d..fe9aa9b72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.2-1.19.4 +mod_version=1.5.3-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 8fa7476682408184593064f27560e22f0f1e74e4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 17 Mar 2023 14:33:57 +0900 Subject: [PATCH 131/622] fix&gradle --- build.gradle | 2 +- .../pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java | 2 +- fabric/build.gradle | 3 ++- forge/build.gradle | 3 ++- .../pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java | 9 ++++----- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 7a0b39dd0..241ca090c 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ subprojects { mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" // https://mvnrepository.com/artifact/org.yaml/snakeyaml - implementation 'org.yaml:snakeyaml:1.33' + implementation 'org.yaml:snakeyaml:2.0' } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java index 7f7fbdd1c..7537e704f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java @@ -25,7 +25,7 @@ public CreativeTabBuilder(Identifier identifier) { this.identifier = identifier; } - public CreativeTabBuilder create(Identifier identifier) { + public static CreativeTabBuilder create(Identifier identifier) { return new CreativeTabBuilder(identifier); } diff --git a/fabric/build.gradle b/fabric/build.gradle index 4d019730d..a2d3ed01c 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -28,7 +28,8 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } - shadowCommon 'org.yaml:snakeyaml:1.33' + shadowCommon 'org.yaml:snakeyaml:2.0' + include 'org.yaml:snakeyaml:2.0' } processResources { diff --git a/forge/build.gradle b/forge/build.gradle index eef5cfd94..176ce1ffe 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -34,7 +34,8 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } - shadowCommon 'org.yaml:snakeyaml:1.33' + shadowCommon 'org.yaml:snakeyaml:2.0' + compileOnly 'org.yaml:snakeyaml:2.0' } processResources { diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java index 30d38550d..be5f0e929 100644 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java +++ b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java @@ -1,8 +1,10 @@ package ml.pkom.mcpitanlibarch.forge; +import dev.architectury.platform.Platform; import dev.architectury.platform.forge.EventBuses; import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; +import ml.pkom.mcpitanlibarch.forge.client.MCPitanLibarchForgeClient; import ml.pkom.mcpitanlibarch.test.ExampleMod; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -12,15 +14,12 @@ public class MCPitanLibarchForge { public MCPitanLibarchForge() { // Submit our event bus to let architectury register our content on the right time EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - if (PlatformUtil.isDevelopmentEnvironment()) - EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + //if (PlatformUtil.isDevelopmentEnvironment()) + // EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); MCPitanLibarch.init(); - /* if (Platform.getEnv().isClient()) FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchForgeClient::clientInit); - - */ } } \ No newline at end of file From b5ded9ea42fa3e3a94acd008175c31021f692d68 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 17 Mar 2023 14:34:10 +0900 Subject: [PATCH 132/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fe9aa9b72..984e5345d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.3-1.19.4 +mod_version=1.5.4-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 548999f8b6f46c3b4e4dd2569ddff8fdfbb218eb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 17 Mar 2023 14:58:30 +0900 Subject: [PATCH 133/622] use jsonconfig --- .../main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index 88896b8db..df8f887e4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -1,7 +1,7 @@ package ml.pkom.mcpitanlibarch; import ml.pkom.easyapi.config.Config; -import ml.pkom.easyapi.config.YamlConfig; +import ml.pkom.easyapi.config.JsonConfig; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; import java.io.File; @@ -12,9 +12,9 @@ public class MCPitanLibarch { public static final String MOD_ID = "mcpitanlibarch"; - private static final File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.yml"); + private static final File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.json"); - public static Config config = new YamlConfig(); + public static Config config = new JsonConfig(); private static boolean configLoaded = false; public static List itemBlackList = new ArrayList<>(); From 5b0a51a2b32727658b92780d85fa8713684b97da Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 17 Mar 2023 15:05:38 +0900 Subject: [PATCH 134/622] ver --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 984e5345d..3839542f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,15 +6,15 @@ mod_version=1.5.4-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=7.0.65 +architectury_version=8.1.73 # https://fabricmc.net/develop/ fabric_loader_version=0.14.17 yarn_mappings=1.19.4+build.1 -fabric_api_version=0.75.3+1.19.4 +fabric_api_version=0.76.0+1.19.4 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.19.4-45.0.1 +forge_version=1.19.4-45.0.9 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.18.4-pre.3 From 4a09b7697015f0f89904f4cadb00e532c947cedd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 18 Mar 2023 17:44:27 +0900 Subject: [PATCH 135/622] add APIs --- .../api/block/CompatibleBlockSettings.java | 193 ++++++++++++++++++ .../mcpitanlibarch/api/block/ExtendBlock.java | 4 + .../api/gui/slot/CompatibleSlot.java | 61 ++++++ .../api/item/CompatibleItemSettings.java | 64 ++++++ .../mcpitanlibarch/api/item/ExtendItem.java | 4 + .../api/item/ExtendSettings.java | 5 - 6 files changed, 326 insertions(+), 5 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java new file mode 100644 index 000000000..ec685ce5d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java @@ -0,0 +1,193 @@ +package ml.pkom.mcpitanlibarch.api.block; + +import net.minecraft.block.*; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.DyeColor; + +import java.util.function.Function; +import java.util.function.ToIntFunction; + +public class CompatibleBlockSettings { + private final AbstractBlock.Settings settings; + + public CompatibleBlockSettings(Material material, MapColor mapColor) { + this.settings = AbstractBlock.Settings.of(material, mapColor); + } + + public CompatibleBlockSettings(Material material, DyeColor dyeColor) { + this.settings = AbstractBlock.Settings.of(material, dyeColor); + } + + public CompatibleBlockSettings(Material material) { + this.settings = AbstractBlock.Settings.of(material); + } + + public CompatibleBlockSettings(Material material, Function mapColor) { + this.settings = AbstractBlock.Settings.of(material, mapColor); + } + + public static CompatibleBlockSettings of(Material material, MapColor mapColor) { + return new CompatibleBlockSettings(material, mapColor); + } + + public static CompatibleBlockSettings of(Material material, DyeColor dyeColor) { + return new CompatibleBlockSettings(material, dyeColor); + } + + public static CompatibleBlockSettings of(Material material) { + return new CompatibleBlockSettings(material); + } + + public static CompatibleBlockSettings of(Material material, Function mapColor) { + return new CompatibleBlockSettings(material, mapColor); + } + + public CompatibleBlockSettings(AbstractBlock block) { + this.settings = AbstractBlock.Settings.copy(block); + } + + public static CompatibleBlockSettings copy(AbstractBlock block) { + return new CompatibleBlockSettings(block); + } + + public CompatibleBlockSettings air() { + settings.air(); + return this; + } + + public CompatibleBlockSettings blockVision(AbstractBlock.ContextPredicate predicate) { + settings.blockVision(predicate); + return this; + } + + public CompatibleBlockSettings postProcess(AbstractBlock.ContextPredicate predicate) { + settings.postProcess(predicate); + return this; + } + + public CompatibleBlockSettings solidBlock(AbstractBlock.ContextPredicate predicate) { + settings.solidBlock(predicate); + return this; + } + + public CompatibleBlockSettings suffocates(AbstractBlock.ContextPredicate predicate) { + settings.suffocates(predicate); + return this; + } + + public CompatibleBlockSettings mapColor(MapColor color) { + settings.mapColor(color); + return this; + } + + public CompatibleBlockSettings dropsLike(Block source) { + settings.dropsLike(source); + return this; + } + + public CompatibleBlockSettings breakInstantly() { + settings.breakInstantly(); + return this; + } + + public CompatibleBlockSettings dropsNothing() { + settings.dropsNothing(); + return this; + } + + public CompatibleBlockSettings dynamicBounds() { + settings.dynamicBounds(); + return this; + } + + public CompatibleBlockSettings hardness(float hardness) { + settings.hardness(hardness); + return this; + } + + public CompatibleBlockSettings noBlockBreakParticles() { + settings.noBlockBreakParticles(); + return this; + } + + public CompatibleBlockSettings requiresTool() { + settings.requiresTool(); + return this; + } + + public CompatibleBlockSettings noCollision() { + settings.noCollision(); + return this; + } + + public CompatibleBlockSettings nonOpaque() { + settings.nonOpaque(); + return this; + } + + public CompatibleBlockSettings resistance(float resistance) { + settings.resistance(resistance); + return this; + } + + public CompatibleBlockSettings strength(float strength) { + settings.strength(strength); + return this; + } + + public CompatibleBlockSettings strength(float hardness, float resistance) { + settings.strength(hardness, resistance); + return this; + } + + public CompatibleBlockSettings ticksRandomly() { + settings.ticksRandomly(); + return this; + } + + public CompatibleBlockSettings sounds(BlockSoundGroup blockSoundGroup) { + settings.sounds(blockSoundGroup); + return this; + } + + public CompatibleBlockSettings luminance(ToIntFunction luminance) { + settings.luminance(luminance); + return this; + } + + public CompatibleBlockSettings jumpVelocityMultiplier(float jumpVelocityMultiplier) { + settings.jumpVelocityMultiplier(jumpVelocityMultiplier); + return this; + } + + public CompatibleBlockSettings slipperiness(float slipperiness) { + settings.slipperiness(slipperiness); + return this; + } + + public CompatibleBlockSettings velocityMultiplier(float velocityMultiplier) { + settings.velocityMultiplier(velocityMultiplier); + return this; + } + + public CompatibleBlockSettings emissiveLighting(AbstractBlock.ContextPredicate predicate) { + settings.emissiveLighting(predicate); + return this; + } + + public CompatibleBlockSettings offset(AbstractBlock.OffsetType offsetType) { + settings.offset(offsetType); + return this; + } + + public CompatibleBlockSettings allowsSpawning(AbstractBlock.TypedContextPredicate> predicate) { + settings.allowsSpawning(predicate); + return this; + } + + @Deprecated + public AbstractBlock.Settings build() { + return settings; + + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index 36e8fe18b..1a614c2b4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -26,6 +26,10 @@ public ExtendBlock(Settings settings) { super(settings); } + public ExtendBlock(CompatibleBlockSettings settings) { + super(settings.build()); + } + public void scheduledTick(BlockScheduledTickEvent event) { super.scheduledTick(event.state, event.world, event.pos, event.random); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java new file mode 100644 index 000000000..c0f459a08 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java @@ -0,0 +1,61 @@ +package ml.pkom.mcpitanlibarch.api.gui.slot; + +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; + +public class CompatibleSlot extends Slot { + public CompatibleSlot(Inventory inventory, int index, int x, int y) { + super(inventory, index, x, y); + } + + public void callSetStack(ItemStack stack) { + super.setStack(stack); + } + + public void callSetStackNoCallbacks(ItemStack stack) { + super.setStackNoCallbacks(stack); + } + + public ItemStack callGetStack() { + return super.getStack(); + } + + public ItemStack callTakeStack(int amount) { + return super.takeStack(amount); + } + + public boolean callHasStack() { + return super.hasStack(); + } + + @Deprecated + @Override + public void setStack(ItemStack stack) { + callSetStack(stack); + } + + @Deprecated + @Override + public void setStackNoCallbacks(ItemStack stack) { + callSetStackNoCallbacks(stack); + } + + @Deprecated + @Override + public ItemStack getStack() { + return callGetStack(); + } + + @Deprecated + @Override + public ItemStack takeStack(int amount) { + return callTakeStack(amount); + } + + @Deprecated + @Override + public boolean hasStack() { + return callHasStack(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java new file mode 100644 index 000000000..c45c32721 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java @@ -0,0 +1,64 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import net.minecraft.item.FoodComponent; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; + +public class CompatibleItemSettings { + private final ExtendSettings settings = new ExtendSettings(); + + public static CompatibleItemSettings of() { + return new CompatibleItemSettings(); + } + + // ～1.19.2 + public CompatibleItemSettings addGroup(ItemGroup itemGroup) { + settings.addGroup(itemGroup); + return this; + } + + // 1.19.3～ + // identifier: Item ID + public CompatibleItemSettings addGroup(ItemGroup itemGroup, Identifier identifier) { + settings.addGroup(itemGroup, identifier); + return this; + } + + public CompatibleItemSettings maxCount(int maxCount) { + settings.maxCount(maxCount); + return this; + } + + public CompatibleItemSettings maxDamage(int maxDamage) { + settings.maxDamage(maxDamage); + return this; + } + + public CompatibleItemSettings maxDamageIfAbsent(int maxDamage) { + settings.maxDamageIfAbsent(maxDamage); + return this; + } + + public CompatibleItemSettings food(FoodComponent foodComponent) { + settings.food(foodComponent); + return this; + } + + public CompatibleItemSettings rarity(Rarity rarity) { + settings.rarity(rarity); + return this; + } + + public CompatibleItemSettings recipeRemainder(Item recipeRemainder) { + settings.recipeRemainder(recipeRemainder); + return this; + } + + @Deprecated + public ExtendSettings build() { + return settings; + + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java index e38b9852d..6b1a613c3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java @@ -18,6 +18,10 @@ public ExtendItem(Settings settings) { super(settings); } + public ExtendItem(CompatibleItemSettings settings) { + super(settings.build()); + } + @Deprecated @Override public TypedActionResult use(World world, PlayerEntity user, Hand hand) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java index 74edb916f..3cf61c0af 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java @@ -1,14 +1,9 @@ package ml.pkom.mcpitanlibarch.api.item; -import dev.architectury.registry.CreativeTabRegistry; -import ml.pkom.mcpitanlibarch.api.util.ItemUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; -import java.util.ArrayList; -import java.util.List; - public class ExtendSettings extends Item.Settings { // ～1.19.2 From 39f3c9a35b270cf5d4ed7de8be2f963b379f3cd7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 18 Mar 2023 17:44:36 +0900 Subject: [PATCH 136/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3839542f0..63feb04b8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.4-1.19.4 +mod_version=1.5.5-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From d84dcf407dce4e088d64b5e2cf9ec7bb6a212dc5 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Mar 2023 22:53:16 +0900 Subject: [PATCH 137/622] api --- .../mcpitanlibarch/api/util/BlockUtil.java | 11 ++++++++++ .../mcpitanlibarch/api/util/ItemUtil.java | 21 +++++++++++++++++++ .../mcpitanlibarch/api/util/SlotUtil.java | 18 ++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SlotUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index 2c0f2239f..cb9f5a8ca 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -1,5 +1,6 @@ package ml.pkom.mcpitanlibarch.api.util; +import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; @@ -53,4 +54,14 @@ public static List getAllBlocks() { } return blocks; } + + @Deprecated + public static Block of(AbstractBlock.Settings settings) { + return new Block(settings); + } + + public static Block of(CompatibleBlockSettings settings) { + return of(settings.build()); + } + } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index 2b9ad4d88..4680351f4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -1,6 +1,9 @@ package ml.pkom.mcpitanlibarch.api.util; +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; @@ -42,6 +45,24 @@ public static Item fromId(Identifier identifier) { return Registries.ITEM.get(identifier); } + @Deprecated + public static BlockItem ofBlock(Block block, Item.Settings settings) { + return new BlockItem(block, settings); + } + + public static BlockItem ofBlock(Block block, CompatibleItemSettings settings) { + return ofBlock(block, settings.build()); + } + + @Deprecated + public static Item of(Item.Settings settings) { + return new Item(settings); + } + + public static Item of(CompatibleItemSettings settings) { + return of(settings.build()); + } + public static List getAllItems() { List items = new ArrayList<>(); for (Item item : Registries.ITEM) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SlotUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SlotUtil.java new file mode 100644 index 000000000..ac3ea4bc4 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SlotUtil.java @@ -0,0 +1,18 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; + +public class SlotUtil { + public static void setStack(Slot slot, ItemStack stack) { + slot.setStack(stack); + } + + public static ItemStack getStack(Slot slot) { + return slot.getStack(); + } + + public static void takeStack(Slot slot, int amount) { + slot.takeStack(amount); + } +} From d6c0f2f2d65116d11234d46d392e08e3acd386e2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Mar 2023 23:03:07 +0900 Subject: [PATCH 138/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 63feb04b8..e9153ca86 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.5-1.19.4 +mod_version=1.5.6-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 07c4048dd59deb8466cda22595697da4e79418e4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 22 Mar 2023 14:10:09 +0900 Subject: [PATCH 139/622] add API --- .../client/registry/ArchRegistryClient.java | 88 +++++++++++++++++++ .../mcpitanlibarch/api/entity/Player.java | 46 ++++++++++ .../event/block/BlockScheduledTickEvent.java | 17 ++++ .../api/event/block/BlockUseEvent.java | 31 +++++++ .../event/item/ItemAppendTooltipEvent.java | 40 +++++++++ .../api/event/item/ItemFinishUsingEvent.java | 30 +++++++ .../api/event/item/ItemUseEvent.java | 19 ++++ .../api/event/item/ItemUseOnBlockEvent.java | 27 ++++++ .../api/event/item/ItemUseOnEntityEvent.java | 39 ++++++++ .../mcpitanlibarch/api/item/ExtendItem.java | 39 +++++++- .../api/util/ScreenHandlerUtil.java | 18 ++++ 11 files changed, 392 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemAppendTooltipEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java index 431d34779..77404a752 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java @@ -1,12 +1,29 @@ package ml.pkom.mcpitanlibarch.api.client.registry; +import dev.architectury.registry.client.level.entity.EntityRendererRegistry; +import dev.architectury.registry.client.particle.ParticleProviderRegistry; import dev.architectury.registry.menu.MenuRegistry; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.SpriteProvider; +import net.minecraft.client.render.entity.EntityRendererFactory; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.SpriteAtlasTexture; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.particle.ParticleEffect; +import net.minecraft.particle.ParticleType; +import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.random.Random; + +import java.util.List; +import java.util.function.Supplier; public class ArchRegistryClient { public static > void registerScreen(ScreenHandlerType type, ScreenFactory factory) { @@ -16,4 +33,75 @@ public static > { S create(H handler, PlayerInventory inventory, Text text); } + + public static void registerParticle(ParticleType type, ParticleFactory factory) { + ParticleProviderRegistry.register(type, factory); + } + + public static void registerParticle(ParticleType type, DeferredParticleProvider provider) { + ParticleProviderRegistry.register(type, spriteSet -> provider.create(new ExtendedSpriteSet() { + @Override + public SpriteAtlasTexture getAtlas() { + return spriteSet.getAtlas(); + } + + @Override + public List getSprites() { + return spriteSet.getSprites(); + } + + @Override + public Sprite getSprite(int age, int maxAge) { + return spriteSet.getSprite(age, maxAge); + } + + @Override + public Sprite getSprite(Random random) { + return spriteSet.getSprite(random); + } + })); + } + + public static void registerEntityRenderer(Supplier> type, EntityRendererFactory provider) { + EntityRendererRegistry.register(type, provider); + } + + @FunctionalInterface + public interface DeferredParticleProvider { + ParticleFactory create(ExtendedSpriteSet spriteSet); + } + + public interface ExtendedSpriteSet extends SpriteProvider { + SpriteAtlasTexture getAtlas(); + + List getSprites(); + } + + public void registryClientSpriteAtlasTexture(Identifier identifier) { + registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, identifier); + } + + public void registryClientSpriteAtlasTexture(Sprite sprite) { + registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, sprite); + } + + public void registryClientSprite(Identifier atlasId, Identifier identifier) { + // ～1.19.2 + /* + ClientSpriteRegistryCallback.event(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE).register(((atlasTexture, registry) -> { + registry.register(identifier); + })); + + */ + } + + public void registryClientSprite(Identifier atlasId, Sprite sprite) { + // ～1.19.2 + /* + ClientSpriteRegistryCallback.event(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE).register(((atlasTexture, registry) -> { + registry.register(sprite); + })); + + */ + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index c851f91c0..b1523c947 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -1,5 +1,8 @@ package ml.pkom.mcpitanlibarch.api.entity; +import dev.architectury.registry.menu.ExtendedMenuProvider; +import ml.pkom.mcpitanlibarch.api.gui.ExtendedNamedScreenHandlerFactory; +import ml.pkom.mcpitanlibarch.api.util.ScreenHandlerUtil; import net.minecraft.block.BlockState; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerAbilities; @@ -7,9 +10,12 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; +import net.minecraft.util.Hand; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -17,6 +23,7 @@ import java.util.OptionalInt; import java.util.UUID; +import java.util.function.Consumer; /* PlayerEntity helper @@ -100,6 +107,29 @@ public OptionalInt openGuiScreen(World world, BlockState state, BlockPos pos) { return openGuiScreen(state.createScreenHandlerFactory(world, pos)); } + public boolean isServerPlayerEntity() { + return this.getEntity() instanceof ServerPlayerEntity; + } + + public void openExtendedMenu(NamedScreenHandlerFactory provider, Consumer bufWriter) { + if (isServerPlayerEntity()) + ScreenHandlerUtil.openExtendedMenu((ServerPlayerEntity) this.getPlayerEntity(), provider, bufWriter); + } + + public void openExtendedMenu(ExtendedMenuProvider provider) { + if (isServerPlayerEntity()) + ScreenHandlerUtil.openExtendedMenu((ServerPlayerEntity) this.getPlayerEntity(), provider); + } + + public void openExtendedMenu(ExtendedNamedScreenHandlerFactory provider) { + this.openExtendedMenu((ExtendedMenuProvider) provider); + } + + public void openMenu(NamedScreenHandlerFactory provider) { + if (isServerPlayerEntity()) + ScreenHandlerUtil.openMenu((ServerPlayerEntity) this.getPlayerEntity(), provider); + } + public void insertStack(ItemStack stack) { getInv().insertStack(stack); } @@ -194,4 +224,20 @@ public BlockPos getBlockPos() { public Vec3d getPos() { return getEntity().getPos(); } + + public ItemStack getStackInHand(Hand hand) { + return this.getEntity().getStackInHand(hand); + } + + public void heal(float amount) { + this.getEntity().heal(amount); + } + + public float getYaw() { + return this.getEntity().getYaw(); + } + + public float getPitch() { + return this.getEntity().getPitch(); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java index b2ae4cc63..502e1c533 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java @@ -18,4 +18,21 @@ public BlockScheduledTickEvent(BlockState state, ServerWorld world, BlockPos pos this.pos = pos; this.random = random; } + + public BlockState getState() { + return state; + } + + public BlockPos getPos() { + return pos; + } + + public ServerWorld getWorld() { + return world; + } + + @Deprecated + public Random getRandom() { + return random; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java index 71b78bc9c..59f3bb3a2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java @@ -4,6 +4,7 @@ import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -16,6 +17,7 @@ public class BlockUseEvent extends BaseEvent { public Player player; public Hand hand; public BlockHitResult hit; + public ItemStack stack; public BlockUseEvent(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { this.state = state; @@ -24,5 +26,34 @@ public BlockUseEvent(BlockState state, World world, BlockPos pos, PlayerEntity p this.player = new Player(player); this.hand = hand; this.hit = hit; + this.stack = this.player.getStackInHand(hand); + } + + public BlockHitResult getHit() { + return hit; + } + + public ItemStack getStack() { + return stack; + } + + public Player getPlayer() { + return player; + } + + public Hand getHand() { + return hand; + } + + public World getWorld() { + return world; + } + + public BlockState getState() { + return state; + } + + public BlockPos getPos() { + return pos; } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemAppendTooltipEvent.java new file mode 100644 index 000000000..a1a21932a --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemAppendTooltipEvent.java @@ -0,0 +1,40 @@ +package ml.pkom.mcpitanlibarch.api.event.item; + +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class ItemAppendTooltipEvent extends BaseEvent { + public ItemStack stack; + public World world; + public List tooltip; + public TooltipContext context; + + public ItemAppendTooltipEvent(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + this.stack = stack; + this.world = world; + this.tooltip = tooltip; + this.context = context; + } + + public ItemStack getStack() { + return stack; + } + + public World getWorld() { + return world; + } + + public List getTooltip() { + return tooltip; + } + + public TooltipContext getContext() { + return context; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java new file mode 100644 index 000000000..a0dc5c5ac --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java @@ -0,0 +1,30 @@ +package ml.pkom.mcpitanlibarch.api.event.item; + +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class ItemFinishUsingEvent extends BaseEvent { + public ItemStack stack; + public World world; + public LivingEntity user; + + public ItemFinishUsingEvent(ItemStack stack, World world, LivingEntity user) { + this.stack = stack; + this.world = world; + this.user = user; + } + + public ItemStack getStack() { + return stack; + } + + public World getWorld() { + return world; + } + + public LivingEntity getUser() { + return user; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java index b99647d33..7174881f9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java @@ -3,6 +3,7 @@ import ml.pkom.mcpitanlibarch.api.entity.Player; import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.world.World; @@ -11,10 +12,28 @@ public class ItemUseEvent extends BaseEvent { public World world; public Player user; public Hand hand; + public ItemStack stack; public ItemUseEvent(World world, PlayerEntity user, Hand hand) { this.world = world; this.user = new Player(user); this.hand = hand; + this.stack = user.getStackInHand(hand); + } + + public ItemStack getStack() { + return stack; + } + + public Hand getHand() { + return hand; + } + + public World getWorld() { + return world; + } + + public Player getUser() { + return user; } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java index 590a61877..fbff538a5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemUsageContext; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import javax.annotation.Nullable; @@ -17,6 +18,7 @@ public class ItemUseOnBlockEvent extends BaseEvent { public BlockHitResult hit; public ItemStack stack; public World world; + public BlockPos blockPos; public ItemUseOnBlockEvent(PlayerEntity player, Hand hand, BlockHitResult hit) { this(player.world, player, hand, player.getStackInHand(hand), hit); @@ -29,6 +31,7 @@ public ItemUseOnBlockEvent(World world, @Nullable PlayerEntity player, Hand hand this.hit = hit; this.stack = stack; this.world = world; + this.blockPos = hit.getBlockPos(); } public ItemUsageContext toIUC() { @@ -38,4 +41,28 @@ public ItemUsageContext toIUC() { public boolean isClient() { return world.isClient(); } + + public Player getPlayer() { + return player; + } + + public World getWorld() { + return world; + } + + public BlockHitResult getHit() { + return hit; + } + + public BlockPos getBlockPos() { + return blockPos; + } + + public Hand getHand() { + return hand; + } + + public ItemStack getStack() { + return stack; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java new file mode 100644 index 000000000..d27ca6563 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java @@ -0,0 +1,39 @@ +package ml.pkom.mcpitanlibarch.api.event.item; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Hand; + +public class ItemUseOnEntityEvent extends BaseEvent { + + public ItemStack stack; + public Player user; + public LivingEntity entity; + public Hand hand; + + public ItemUseOnEntityEvent(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) { + this.stack = stack; + this.user = new Player(user); + this.hand = hand; + this.entity = entity; + } + + public ItemStack getStack() { + return stack; + } + + public Hand getHand() { + return hand; + } + + public Player getUser() { + return user; + } + + public LivingEntity getEntity() { + return entity; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java index 6b1a613c3..a95f4216d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java @@ -1,17 +1,22 @@ package ml.pkom.mcpitanlibarch.api.item; import ml.pkom.mcpitanlibarch.Dummy; -import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; -import ml.pkom.mcpitanlibarch.api.event.item.ItemUseOnBlockEvent; +import ml.pkom.mcpitanlibarch.api.event.item.*; import ml.pkom.mcpitanlibarch.mixin.ItemUsageContextMixin; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +import java.util.List; public class ExtendItem extends Item { public ExtendItem(Settings settings) { @@ -35,12 +40,30 @@ public ActionResult useOnBlock(ItemUsageContext context) { return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); } + @Deprecated + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + return onFinishUsing(new ItemFinishUsingEvent(stack, world, user)); + } + + @Deprecated + @Override + public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) { + return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)); + } + @Deprecated @Override public boolean hasRecipeRemainder() { return hasRecipeRemainder(new Dummy()); } + @Deprecated + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + appendTooltip(new ItemAppendTooltipEvent(stack, world, tooltip, context)); + } + /** * item right click event * @@ -60,7 +83,19 @@ public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { return super.useOnBlock(event.toIUC()); } + public ItemStack onFinishUsing(ItemFinishUsingEvent event) { + return super.finishUsing(event.stack, event.world, event.user); + } + + public ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { + return super.useOnEntity(event.stack, event.user.getEntity(), event.entity, event.hand); + } + public boolean hasRecipeRemainder(Dummy dummy) { return super.hasRecipeRemainder(); } + + public void appendTooltip(ItemAppendTooltipEvent event) { + super.appendTooltip(event.stack, event.world, event.tooltip, event.context); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java index 3f444b342..8da36c5ba 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java @@ -1,13 +1,19 @@ package ml.pkom.mcpitanlibarch.api.util; +import dev.architectury.registry.menu.ExtendedMenuProvider; +import dev.architectury.registry.menu.MenuRegistry; +import net.minecraft.network.PacketByteBuf; import net.minecraft.registry.Registries; +import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.collection.DefaultedList; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; public class ScreenHandlerUtil { public static DefaultedList getSlots(ScreenHandler screenHandler) { @@ -25,4 +31,16 @@ public static List> getAllScreenHandlerTypes() { } return screenHandlerTypes; } + + public static void openExtendedMenu(ServerPlayerEntity player, NamedScreenHandlerFactory provider, Consumer bufWriter) { + MenuRegistry.openExtendedMenu(player, provider, bufWriter); + } + + public static void openExtendedMenu(ServerPlayerEntity player, ExtendedMenuProvider provider) { + MenuRegistry.openExtendedMenu(player, provider); + } + + public static void openMenu(ServerPlayerEntity player, NamedScreenHandlerFactory provider) { + MenuRegistry.openMenu(player, provider); + } } From 59666be6d506b7fe4c257447d95595521add0107 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 22 Mar 2023 14:13:09 +0900 Subject: [PATCH 140/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e9153ca86..a286ea558 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.6-1.19.4 +mod_version=1.5.7-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 3556d3a0797c107c683083a2e193ad35e23b7ba9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 31 Mar 2023 14:08:13 +0900 Subject: [PATCH 141/622] fix api ver --- .../client/registry/ArchRegistryClient.java | 20 +++--------- .../api/item/CreativeTabManager.java | 31 ++++++++++++++++--- gradle.properties | 2 +- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java index 77404a752..931f98934 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java @@ -77,31 +77,19 @@ public interface ExtendedSpriteSet extends SpriteProvider { List getSprites(); } - public void registryClientSpriteAtlasTexture(Identifier identifier) { + public static void registryClientSpriteAtlasTexture(Identifier identifier) { registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, identifier); } - public void registryClientSpriteAtlasTexture(Sprite sprite) { + public static void registryClientSpriteAtlasTexture(Sprite sprite) { registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, sprite); } - public void registryClientSprite(Identifier atlasId, Identifier identifier) { + public static void registryClientSprite(Identifier atlasId, Identifier identifier) { // ～1.19.2 - /* - ClientSpriteRegistryCallback.event(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE).register(((atlasTexture, registry) -> { - registry.register(identifier); - })); - - */ } - public void registryClientSprite(Identifier atlasId, Sprite sprite) { + public static void registryClientSprite(Identifier atlasId, Sprite sprite) { // ～1.19.2 - /* - ClientSpriteRegistryCallback.event(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE).register(((atlasTexture, registry) -> { - registry.register(sprite); - })); - - */ } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java index ab1637a22..395f0d146 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -3,6 +3,7 @@ import dev.architectury.registry.CreativeTabRegistry; import ml.pkom.mcpitanlibarch.api.util.ItemUtil; import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import java.util.ArrayList; @@ -10,6 +11,7 @@ public class CreativeTabManager { private static final List bookingItems = new ArrayList<>(); + private static final List bookingStacks = new ArrayList<>(); // グループ予約済みアイテム public static class BookingItem { @@ -21,11 +23,29 @@ private BookingItem(ItemGroup itemGroup, Identifier identifier) { } } + // グループ予約済みアイテムスタック + public static class BookingStack { + public ItemGroup itemGroup; + public ItemStack stack; + private BookingStack(ItemGroup itemGroup, ItemStack stack) { + this.itemGroup = itemGroup; + this.stack = stack; + } + } + public static void allRegister() { - if (bookingItems.isEmpty()) return; - for (BookingItem bookingItem : bookingItems) { - CreativeTabRegistry.append(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); - bookingItems.remove(bookingItem); + if (!bookingItems.isEmpty()) { + for (BookingItem bookingItem : bookingItems) { + CreativeTabRegistry.append(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); + bookingItems.remove(bookingItem); + } + } + + if (!bookingStacks.isEmpty()) { + for (BookingStack bookingStack : bookingStacks) { + CreativeTabRegistry.appendStack(bookingStack.itemGroup, bookingStack.stack); + bookingStacks.remove(bookingStack); + } } } @@ -41,6 +61,9 @@ public static void register(Identifier identifier) { public static void addItem(ItemGroup itemGroup, Identifier identifier) { bookingItems.add(new BookingItem(itemGroup, identifier)); + } + public static void addStack(ItemGroup itemGroup, ItemStack stack) { + bookingStacks.add(new BookingStack(itemGroup, stack)); } } diff --git a/gradle.properties b/gradle.properties index a286ea558..203302f7e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.7-1.19.4 +mod_version=1.5.8-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 56a7053c8f081b35dc10b9ebfff2cd9ef7a7da14 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Apr 2023 11:59:50 +0900 Subject: [PATCH 142/622] fix 1194 --- .../api/client/registry/ArchRegistryClient.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java index 931f98934..8c8f610d2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleType; -import net.minecraft.screen.PlayerScreenHandler; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.text.Text; @@ -78,11 +77,11 @@ public interface ExtendedSpriteSet extends SpriteProvider { } public static void registryClientSpriteAtlasTexture(Identifier identifier) { - registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, identifier); + //registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, identifier); } public static void registryClientSpriteAtlasTexture(Sprite sprite) { - registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, sprite); + //registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, sprite); } public static void registryClientSprite(Identifier atlasId, Identifier identifier) { From a94f1d67e5a71abb89a4e13342b51483db012ce7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Apr 2023 12:31:07 +0900 Subject: [PATCH 143/622] fix api --- .../api/item/ArmorEquipmentType.java | 73 +++++++++++++++++++ .../api/item/CompatibleArmorMaterial.java | 36 +++++++++ .../api/registry/ArchRegistry.java | 10 ++- .../api/util/BlockEntityTypeUtil.java | 19 +++++ .../mcpitanlibarch/api/util/BlockUtil.java | 3 + .../api/util/EntityTypeUtil.java | 4 + .../mcpitanlibarch/api/util/ItemUtil.java | 4 + .../mcpitanlibarch/api/util/MathUtil.java | 18 +++++ .../api/util/ScreenHandlerUtil.java | 4 + .../api/util/client/MatrixStackUtil.java | 12 +++ 10 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ArmorEquipmentType.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleArmorMaterial.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/MatrixStackUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ArmorEquipmentType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ArmorEquipmentType.java new file mode 100644 index 000000000..bedd7a2e0 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ArmorEquipmentType.java @@ -0,0 +1,73 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.item.ArmorItem; +import org.jetbrains.annotations.Nullable; + +public class ArmorEquipmentType { + + public static ArmorEquipmentType HEAD = new ArmorEquipmentType(EquipmentSlot.HEAD, ArmorItem.Type.HELMET); + public static ArmorEquipmentType CHEST = new ArmorEquipmentType(EquipmentSlot.CHEST, ArmorItem.Type.CHESTPLATE); + public static ArmorEquipmentType LEGS = new ArmorEquipmentType(EquipmentSlot.LEGS, ArmorItem.Type.LEGGINGS); + public static ArmorEquipmentType FEET = new ArmorEquipmentType(EquipmentSlot.FEET, ArmorItem.Type.BOOTS); + + protected final EquipmentSlot slot; + protected final ArmorItem.Type type; + + protected ArmorEquipmentType(EquipmentSlot slot, ArmorItem.Type type) { + this.slot = slot; + this.type = type; + } + + @Deprecated + public EquipmentSlot getSlot() { + return slot; + } + + @Deprecated + public ArmorItem.Type getType() { + return type; + } + + @Nullable + public static ArmorEquipmentType of(EquipmentSlot slot) { + switch (slot) { + case HEAD -> { + return HEAD; + } + case CHEST -> { + return CHEST; + } + case LEGS -> { + return LEGS; + } + case FEET -> { + return FEET; + } + default -> { + return null; + } + } + } + + @Nullable + public static ArmorEquipmentType of(ArmorItem.Type type) { + switch (type) { + case HELMET -> { + return HEAD; + } + case CHESTPLATE -> { + return CHEST; + } + case LEGGINGS -> { + return LEGS; + } + case BOOTS -> { + return FEET; + } + default -> { + return null; + } + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleArmorMaterial.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleArmorMaterial.java new file mode 100644 index 000000000..32a238c44 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleArmorMaterial.java @@ -0,0 +1,36 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.recipe.Ingredient; +import net.minecraft.sound.SoundEvent; + +public interface CompatibleArmorMaterial extends ArmorMaterial { + int getDurability(ArmorEquipmentType type); + + int getProtection(ArmorEquipmentType type); + + @Override + @Deprecated + default int getDurability(ArmorItem.Type type) { + return getDurability(ArmorEquipmentType.of(type)); + } + + @Override + @Deprecated + default int getProtection(ArmorItem.Type type) { + return getProtection(ArmorEquipmentType.of(type)); + } + + int getEnchantability(); + + SoundEvent getEquipSound(); + + Ingredient getRepairIngredient(); + + String getName(); + + float getToughness(); + + float getKnockbackResistance(); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 7d49cfc24..ac0b22da0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -1,7 +1,7 @@ package ml.pkom.mcpitanlibarch.api.registry; import com.google.common.base.Suppliers; -import dev.architectury.registry.menu.MenuRegistry; +import dev.architectury.registry.fuel.FuelRegistry; import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrarManager; import dev.architectury.registry.registries.RegistrySupplier; @@ -17,6 +17,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; import net.minecraft.registry.RegistryKeys; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; @@ -102,7 +103,14 @@ public RegistryEvent registerFluid(Identifier id, Supplier supplie return new RegistryEvent<>(FLUID.register(id, supplier)); } + public static void registerFuel(int time, ItemConvertible... item) { + FuelRegistry.register(time, item); + } + public void allRegister() { // 1.16 Register + + // ItemGroup + CreativeTabManager.allRegister(); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java new file mode 100644 index 000000000..26fcec4c5 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java @@ -0,0 +1,19 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; + +public class BlockEntityTypeUtil { + public static Identifier toID(BlockEntityType entityType) { + return Registries.BLOCK_ENTITY_TYPE.getId(entityType); + } + + public static BlockEntityType fromId(Identifier identifier) { + return Registries.BLOCK_ENTITY_TYPE.get(identifier); + } + + public static int getRawId(BlockEntityType type) { + return Registries.BLOCK_ENTITY_TYPE.getRawId(type); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index cb9f5a8ca..eb1574622 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -64,4 +64,7 @@ public static Block of(CompatibleBlockSettings settings) { return of(settings.build()); } + public static int getRawId(Block block) { + return Registries.BLOCK.getRawId(block); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java index 19129c222..bf5607069 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java @@ -12,4 +12,8 @@ public static Identifier toID(EntityType entityType) { public static EntityType fromId(Identifier identifier) { return Registries.ENTITY_TYPE.get(identifier); } + + public static int getRawId(EntityType type) { + return Registries.ENTITY_TYPE.getRawId(type); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index 4680351f4..e5288706e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -70,4 +70,8 @@ public static List getAllItems() { } return items; } + + public static int getRawId(Item item) { + return Registries.ITEM.getRawId(item); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java index b9cbb40f6..3bd403b9a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java @@ -1,6 +1,8 @@ package ml.pkom.mcpitanlibarch.api.util; +import net.minecraft.util.math.RotationAxis; import net.minecraft.util.math.random.Random; +import org.joml.Quaternionf; public class MathUtil { @@ -11,4 +13,20 @@ public static Random createRandom(long seed) { public static Random createRandom() { return Random.create(); } + + public static Quaternionf getRotationDegrees(RotationAxisType type, float deg) { + return type.axis.rotationDegrees(deg); + } + + public static class RotationAxisType { + + public static RotationAxisType POSITIVE_X = new RotationAxisType(RotationAxis.POSITIVE_X); + public static RotationAxisType POSITIVE_Y = new RotationAxisType(RotationAxis.POSITIVE_Y); + public static RotationAxisType POSITIVE_Z = new RotationAxisType(RotationAxis.POSITIVE_Z); + + protected final RotationAxis axis; + protected RotationAxisType(RotationAxis axis) { + this.axis = axis; + } + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java index 8da36c5ba..476a8a464 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java @@ -43,4 +43,8 @@ public static void openExtendedMenu(ServerPlayerEntity player, ExtendedMenuProvi public static void openMenu(ServerPlayerEntity player, NamedScreenHandlerFactory provider) { MenuRegistry.openMenu(player, provider); } + + public static int getRawId(ScreenHandlerType type) { + return Registries.SCREEN_HANDLER.getRawId(type); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/MatrixStackUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/MatrixStackUtil.java new file mode 100644 index 000000000..36e3e08ec --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/MatrixStackUtil.java @@ -0,0 +1,12 @@ +package ml.pkom.mcpitanlibarch.api.util.client; + +import ml.pkom.mcpitanlibarch.api.util.MathUtil; +import net.minecraft.client.util.math.MatrixStack; + +import static ml.pkom.mcpitanlibarch.api.util.MathUtil.*; + +public class MatrixStackUtil { + public static void multiply(MatrixStack matrixStack, MathUtil.RotationAxisType type, float deg) { + matrixStack.multiply(getRotationDegrees(type, deg)); + } +} From e1b8e12ec7ec7cad989d96c1ed745ada6c5c8a7d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 1 Apr 2023 12:31:20 +0900 Subject: [PATCH 144/622] ver --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 203302f7e..900973cfc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.8-1.19.4 +mod_version=1.5.9-1.19.4 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api From 7632e9f4c48015d64fec602da4d1067fdcbe60db Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 7 Apr 2023 23:27:32 +0900 Subject: [PATCH 145/622] quilt --- build.gradle | 2 +- gradle.properties | 6 +++--- quilt/build.gradle | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 241ca090c..d881a2906 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ allprojects { apply plugin: "maven-publish" archivesBaseName = rootProject.archives_base_name - version = rootProject.mod_version + version = rootProject.mod_version + "-" + rootProject.minecraft_version group = rootProject.maven_group repositories { diff --git a/gradle.properties b/gradle.properties index 900973cfc..0d2cee49e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 archives_base_name=mcpitanlibarch -mod_version=1.5.9-1.19.4 +mod_version=1.6.0 maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api @@ -17,8 +17,8 @@ fabric_api_version=0.76.0+1.19.4 forge_version=1.19.4-45.0.9 # https://lambdaurora.dev/tools/import_quilt.html -quilt_loader_version=0.18.4-pre.3 -quilt_fabric_api_version= +quilt_loader_version=0.19.0-beta.9 +quilt_fabric_api_version=6.0.0-beta.3+0.76.0 fabricEnabled=true forgeEnabled=true diff --git a/quilt/build.gradle b/quilt/build.gradle index 9f82c2a25..afc433f53 100644 --- a/quilt/build.gradle +++ b/quilt/build.gradle @@ -20,12 +20,12 @@ configurations { shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. compileClasspath.extendsFrom common runtimeClasspath.extendsFrom common - developmentFabric.extendsFrom common + developmentQuilt.extendsFrom common } dependencies { modImplementation "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}" - modApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}-${minecraft_version}" + modApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}-${rootProject.minecraft_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" From 741234a07dc65e9d5bd209d691100d5b633ad424 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 8 Apr 2023 00:13:38 +0900 Subject: [PATCH 146/622] add api --- .../api/block/CompatibleBlockSettings.java | 1 - .../client/registry/ArchRegistryClient.java | 20 +++++ .../api/entity/EntityTypeBuilder.java | 9 +- .../api/entity/ExtendEntityType.java | 9 +- .../api/item/CompatibleItemSettings.java | 1 - .../api/registry/ArchRegistry.java | 57 ++++++------- .../api/util/BlockEntityTypeUtil.java | 4 + .../mcpitanlibarch/api/util/BlockUtil.java | 4 + .../api/util/EntityTypeUtil.java | 4 + .../mcpitanlibarch/api/util/FluidUtil.java | 8 ++ .../mcpitanlibarch/api/util/ItemUtil.java | 4 + .../mcpitanlibarch/api/util/MathUtil.java | 1 + .../api/util/ScreenHandlerUtil.java | 4 + .../core/registry/FuelRegistry.java | 17 ++++ .../core/registry/MCPLRegistry.java | 82 +++++++++++++++++++ .../pkom/mcpitanlibarch/test/ExampleMod.java | 4 +- 16 files changed, 185 insertions(+), 44 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/FuelRegistry.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java index ec685ce5d..2ab5b57c8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java @@ -185,7 +185,6 @@ public CompatibleBlockSettings allowsSpawning(AbstractBlock.TypedContextPredicat return this; } - @Deprecated public AbstractBlock.Settings build() { return settings; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java index 8c8f610d2..362de05b0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java @@ -2,17 +2,25 @@ import dev.architectury.registry.client.level.entity.EntityRendererRegistry; import dev.architectury.registry.client.particle.ParticleProviderRegistry; +import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry; +import dev.architectury.registry.client.rendering.RenderTypeRegistry; import dev.architectury.registry.menu.MenuRegistry; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; import net.minecraft.client.particle.ParticleFactory; import net.minecraft.client.particle.SpriteProvider; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.texture.Sprite; import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.fluid.Fluid; import net.minecraft.particle.ParticleEffect; import net.minecraft.particle.ParticleType; import net.minecraft.screen.ScreenHandler; @@ -91,4 +99,16 @@ public static void registryClientSprite(Identifier atlasId, Identifier identifie public static void registryClientSprite(Identifier atlasId, Sprite sprite) { // ～1.19.2 } + + public static void registerBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { + BlockEntityRendererRegistry.register(type, provider); + } + + public static void registerRenderTypeBlock(RenderLayer layer, Block block) { + RenderTypeRegistry.register(layer, block); + } + + public static void registerRenderTypeFluid(RenderLayer layer, Fluid fluid) { + RenderTypeRegistry.register(layer, fluid); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java index 9d22e56d4..3ce02458e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java @@ -6,11 +6,12 @@ import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; +import ml.pkom.mcpitanlibarch.api.entity.ExtendEntityType.EntityFactory; public class EntityTypeBuilder { private SpawnGroup spawnGroup; - private EntityType.EntityFactory factory; + private EntityFactory factory; private EntityDimensions entityDimensions; private boolean saveable; private boolean summonable; @@ -36,7 +37,7 @@ public EntityTypeBuilder() { } @Deprecated - public EntityTypeBuilder(SpawnGroup spawnGroup, EntityType.EntityFactory factory) { + public EntityTypeBuilder(SpawnGroup spawnGroup, EntityFactory factory) { this(); this.spawnGroup = spawnGroup; this.factory = factory; @@ -46,7 +47,7 @@ public static EntityTypeBuilder create() { return new EntityTypeBuilder<>(); } - public static EntityTypeBuilder create(SpawnGroup spawnGroup, EntityType.EntityFactory factory) { + public static EntityTypeBuilder create(SpawnGroup spawnGroup, EntityFactory factory) { return new EntityTypeBuilder<>(spawnGroup, factory); } @@ -59,7 +60,7 @@ public EntityTypeBuilder setSpawnGroup(SpawnGroup spawnGroup) { return this; } - public EntityTypeBuilder setEntityFactory(EntityType.EntityFactory factory) { + public EntityTypeBuilder setEntityFactory(ExtendEntityType.EntityFactory factory) { this.factory = factory; return this; } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java index 27f735a7c..f2d66a976 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java @@ -7,12 +7,13 @@ import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; import net.minecraft.resource.featuretoggle.FeatureFlags; +import net.minecraft.world.World; public class ExtendEntityType extends EntityType { private final Boolean alwaysUpdateVelocity; - public ExtendEntityType(EntityType.EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { - super(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); + public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { + super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); this.alwaysUpdateVelocity = alwaysUpdateVelocity; } @@ -23,4 +24,8 @@ public boolean alwaysUpdateVelocity() { return super.alwaysUpdateVelocity(); } + + public interface EntityFactory { + T create(EntityType type, World world); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java index c45c32721..7fd0a68aa 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java @@ -56,7 +56,6 @@ public CompatibleItemSettings recipeRemainder(Item recipeRemainder) { return this; } - @Deprecated public ExtendSettings build() { return settings; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index ac0b22da0..40370c2d1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -1,16 +1,16 @@ package ml.pkom.mcpitanlibarch.api.registry; -import com.google.common.base.Suppliers; -import dev.architectury.registry.fuel.FuelRegistry; -import dev.architectury.registry.registries.Registrar; -import dev.architectury.registry.registries.RegistrarManager; import dev.architectury.registry.registries.RegistrySupplier; import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; -import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; -import net.minecraft.block.AbstractBlock; +import ml.pkom.mcpitanlibarch.api.util.BlockUtil; +import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import ml.pkom.mcpitanlibarch.core.registry.FuelRegistry; +import ml.pkom.mcpitanlibarch.core.registry.MCPLRegistry; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntityType; @@ -18,7 +18,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; -import net.minecraft.registry.RegistryKeys; +import net.minecraft.particle.ParticleType; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; @@ -27,26 +27,10 @@ public class ArchRegistry { - public Supplier REGISTRIES; - - public Registrar ITEMS; - public Registrar BLOCKS; - public Registrar> SCREEN_HANDLER_TYPE; - public Registrar> BLOCK_ENTITY_TYPE; - public Registrar> ENTITY_TYPE; - public Registrar SOUND_EVENT; - public Registrar FLUID; + private final MCPLRegistry mcplr; public ArchRegistry(String MOD_ID) { - REGISTRIES = Suppliers.memoize(() -> RegistrarManager.get(MOD_ID)); - - ITEMS = REGISTRIES.get().get(RegistryKeys.ITEM); - BLOCKS = REGISTRIES.get().get(RegistryKeys.BLOCK); - SCREEN_HANDLER_TYPE = REGISTRIES.get().get(RegistryKeys.SCREEN_HANDLER); - BLOCK_ENTITY_TYPE = REGISTRIES.get().get(RegistryKeys.BLOCK_ENTITY_TYPE); - ENTITY_TYPE = REGISTRIES.get().get(RegistryKeys.ENTITY_TYPE); - SOUND_EVENT = REGISTRIES.get().get(RegistryKeys.SOUND_EVENT); - FLUID = REGISTRIES.get().get(RegistryKeys.FLUID); + mcplr = new MCPLRegistry(MOD_ID); } public static ArchRegistry createRegistry(String MOD_ID) { @@ -54,19 +38,19 @@ public static ArchRegistry createRegistry(String MOD_ID) { } public RegistryEvent registerItem(Identifier id, Supplier supplier) { - if (MCPitanLibarch.itemBlackList.contains(id.toString())) supplier = () -> new Item(new ExtendSettings()); - RegistrySupplier registrySupplier = ITEMS.register(id, supplier); + if (MCPitanLibarch.itemBlackList.contains(id.toString())) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); + RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); CreativeTabManager.register(id); return new RegistryEvent<>(registrySupplier); } public RegistryEvent registerBlock(Identifier id, Supplier supplier) { - if (MCPitanLibarch.blockBlackList.contains(id.toString())) supplier = () -> new Block(AbstractBlock.Settings.of(Material.STONE)); - return new RegistryEvent<>(BLOCKS.register(id, supplier)); + if (MCPitanLibarch.blockBlackList.contains(id.toString())) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(Material.STONE)); + return new RegistryEvent<>(mcplr.registryBlock(id, supplier)); } public RegistryEvent> registerScreenHandlerType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(SCREEN_HANDLER_TYPE.register(id, supplier)); + return new RegistryEvent<>(mcplr.registryScreenHandlerType(id, supplier)); } @Deprecated @@ -79,16 +63,16 @@ public RegistryEvent> registerMenu(Identifier id, Supplier< } public RegistryEvent> registerBlockEntityType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(BLOCK_ENTITY_TYPE.register(id, supplier)); + return new RegistryEvent<>(mcplr.registryBlockEntityType(id, supplier)); } public RegistryEvent> registerEntity(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(ENTITY_TYPE.register(id, supplier)); + return new RegistryEvent<>(mcplr.registryEntityType(id, supplier)); } @Deprecated public RegistryEvent registerSoundEvent(Identifier id, Supplier supplier) { - return new RegistryEvent<>(SOUND_EVENT.register(id, supplier)); + return new RegistryEvent<>(mcplr.registrySoundEvent(id, supplier)); } public RegistryEvent registerSoundEvent(Identifier id) { @@ -100,7 +84,11 @@ public RegistryEvent registerSoundEvent(Identifier id, float distanc } public RegistryEvent registerFluid(Identifier id, Supplier supplier) { - return new RegistryEvent<>(FLUID.register(id, supplier)); + return new RegistryEvent<>(mcplr.registryFluid(id, supplier)); + } + + public RegistryEvent> registerParticleType(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(mcplr.registryParticleType(id, supplier)); } public static void registerFuel(int time, ItemConvertible... item) { @@ -109,6 +97,7 @@ public static void registerFuel(int time, ItemConvertible... item) { public void allRegister() { // 1.16 Register + mcplr.allRegister1_16(); // ItemGroup CreativeTabManager.allRegister(); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java index 26fcec4c5..edec070a2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java @@ -16,4 +16,8 @@ public static BlockEntityType fromId(Identifier identifier) { public static int getRawId(BlockEntityType type) { return Registries.BLOCK_ENTITY_TYPE.getRawId(type); } + + public static BlockEntityType fromIndex(int index) { + return Registries.BLOCK_ENTITY_TYPE.get(index); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index eb1574622..6ba6a6f93 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -67,4 +67,8 @@ public static Block of(CompatibleBlockSettings settings) { public static int getRawId(Block block) { return Registries.BLOCK.getRawId(block); } + + public static Block fromIndex(int index) { + return Registries.BLOCK.get(index); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java index bf5607069..f7267b4b2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java @@ -16,4 +16,8 @@ public static EntityType fromId(Identifier identifier) { public static int getRawId(EntityType type) { return Registries.ENTITY_TYPE.getRawId(type); } + + public static EntityType fromIndex(int index) { + return Registries.ENTITY_TYPE.get(index); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java index 1fdd8457e..921432d63 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java @@ -12,4 +12,12 @@ public static Identifier toID(Fluid fluid) { public static Fluid fromId(Identifier identifier) { return Registries.FLUID.get(identifier); } + + public static int getRawId(Fluid fluid) { + return Registries.FLUID.getRawId(fluid); + } + + public static Fluid fromIndex(int index) { + return Registries.FLUID.get(index); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index e5288706e..2225a9b84 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -74,4 +74,8 @@ public static List getAllItems() { public static int getRawId(Item item) { return Registries.ITEM.getRawId(item); } + + public static Item fromIndex(int index) { + return Registries.ITEM.get(index); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java index 3bd403b9a..011fde68c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java @@ -14,6 +14,7 @@ public static Random createRandom() { return Random.create(); } + @Deprecated public static Quaternionf getRotationDegrees(RotationAxisType type, float deg) { return type.axis.rotationDegrees(deg); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java index 476a8a464..67941e92b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java @@ -47,4 +47,8 @@ public static void openMenu(ServerPlayerEntity player, NamedScreenHandlerFactory public static int getRawId(ScreenHandlerType type) { return Registries.SCREEN_HANDLER.getRawId(type); } + + public static ScreenHandlerType fromIndex(int index) { + return Registries.SCREEN_HANDLER.get(index); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/FuelRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/FuelRegistry.java new file mode 100644 index 000000000..b1d4be253 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/FuelRegistry.java @@ -0,0 +1,17 @@ +package ml.pkom.mcpitanlibarch.core.registry; + +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; + +public class FuelRegistry { + private FuelRegistry() { + + } + + public static void register(int time, ItemConvertible... item) { + dev.architectury.registry.fuel.FuelRegistry.register(time, item); + } + public static int get(ItemStack stack) { + return dev.architectury.registry.fuel.FuelRegistry.get(stack); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry.java new file mode 100644 index 000000000..cbcf82fca --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry.java @@ -0,0 +1,82 @@ +package ml.pkom.mcpitanlibarch.core.registry; + +import com.google.common.base.Suppliers; +import dev.architectury.registry.registries.Registrar; +import dev.architectury.registry.registries.RegistrarManager; +import dev.architectury.registry.registries.RegistrySupplier; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +import net.minecraft.particle.ParticleType; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; + +import java.util.function.Supplier; + +@Deprecated +public class MCPLRegistry { + + public Supplier REGISTRIES; + + public Registrar ITEMS; + public Registrar BLOCKS; + public Registrar> SCREEN_HANDLER_TYPE; + public Registrar> BLOCK_ENTITY_TYPE; + public Registrar> ENTITY_TYPE; + public Registrar SOUND_EVENT; + public Registrar FLUID; + public Registrar> PARTICLE_TYPE; + + public MCPLRegistry(String MOD_ID) { + REGISTRIES = Suppliers.memoize(() -> RegistrarManager.get(MOD_ID)); + + ITEMS = REGISTRIES.get().get(RegistryKeys.ITEM); + BLOCKS = REGISTRIES.get().get(RegistryKeys.BLOCK); + SCREEN_HANDLER_TYPE = REGISTRIES.get().get(RegistryKeys.SCREEN_HANDLER); + BLOCK_ENTITY_TYPE = REGISTRIES.get().get(RegistryKeys.BLOCK_ENTITY_TYPE); + ENTITY_TYPE = REGISTRIES.get().get(RegistryKeys.ENTITY_TYPE); + SOUND_EVENT = REGISTRIES.get().get(RegistryKeys.SOUND_EVENT); + FLUID = REGISTRIES.get().get(RegistryKeys.FLUID); + PARTICLE_TYPE = REGISTRIES.get().get(RegistryKeys.PARTICLE_TYPE); + } + + public RegistrySupplier registryItem(Identifier id, Supplier supplier) { + return ITEMS.register(id, supplier); + } + + public RegistrySupplier registryBlock(Identifier id, Supplier supplier) { + return BLOCKS.register(id, supplier); + } + + public RegistrySupplier> registryScreenHandlerType(Identifier id, Supplier> supplier) { + return SCREEN_HANDLER_TYPE.register(id, supplier); + } + + public RegistrySupplier> registryBlockEntityType(Identifier id, Supplier> supplier) { + return BLOCK_ENTITY_TYPE.register(id, supplier); + } + + public RegistrySupplier> registryEntityType(Identifier id, Supplier> supplier) { + return ENTITY_TYPE.register(id, supplier); + } + + public RegistrySupplier registrySoundEvent(Identifier id, Supplier supplier) { + return SOUND_EVENT.register(id, supplier); + } + + public RegistrySupplier registryFluid(Identifier id, Supplier supplier) { + return FLUID.register(id, supplier); + } + + public RegistrySupplier> registryParticleType(Identifier id, Supplier> supplier) { + return PARTICLE_TYPE.register(id, supplier); + } + + public void allRegister1_16() { + + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java index 2835fe322..b7c993b4f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -11,8 +11,6 @@ import net.minecraft.block.Material; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemGroups; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; import org.apache.logging.log4j.Level; @@ -44,6 +42,8 @@ public static Identifier id(String id) { public static RegistryEvent EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER; public static void init() { + //EntityTypeBuilder.create().setSpawnGroup(SpawnGroup.AMBIENT).setEntityFactory(((type, world) -> new ZombieEntity((EntityType) type, world))); + EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new Item(new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS, id("example_item")))); EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new Block(AbstractBlock.Settings.of(Material.STONE))); EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); From d200e4253e7132292b0b6093342adc4501f9ff83 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 8 Apr 2023 16:30:45 +0900 Subject: [PATCH 147/622] add api --- build.gradle | 16 ++++- common/build.gradle | 2 +- .../client/registry/ArchRegistryClient.java | 70 ++++++++++++++++++- fabric/build.gradle | 2 +- forge/build.gradle | 2 +- gradle.properties | 3 - info.properties | 3 + php/build.bat | 53 ++++++++++++++ 8 files changed, 140 insertions(+), 11 deletions(-) create mode 100644 info.properties create mode 100644 php/build.bat diff --git a/build.gradle b/build.gradle index d881a2906..9e153e2d4 100644 --- a/build.gradle +++ b/build.gradle @@ -26,14 +26,24 @@ subprojects { } } +def loadProperties(filename) { + def props = new Properties() + file(filename).withInputStream { + props.load(it) + } + return props +} + +ext.info = loadProperties("$rootDir/info.properties") + allprojects { apply plugin: "java" apply plugin: "architectury-plugin" apply plugin: "maven-publish" - archivesBaseName = rootProject.archives_base_name - version = rootProject.mod_version + "-" + rootProject.minecraft_version - group = rootProject.maven_group + archivesBaseName = info.archives_base_name + version = info.mod_version + "-" + rootProject.minecraft_version + group = info.maven_group repositories { // Add repositories to retrieve artifacts from in here. diff --git a/common/build.gradle b/common/build.gradle index 6c3b8acf1..ee1ded13c 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -17,7 +17,7 @@ loom { publishing { publications { mavenCommon(MavenPublication) { - artifactId = rootProject.archives_base_name + artifactId = info.archives_base_name from components.java } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java index 362de05b0..0dfa038aa 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java @@ -5,16 +5,27 @@ import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry; import dev.architectury.registry.client.rendering.RenderTypeRegistry; import dev.architectury.registry.menu.MenuRegistry; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.client.model.ModelPart; import net.minecraft.client.particle.ParticleFactory; import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.block.BlockRenderManager; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.EntityRendererFactory; +import net.minecraft.client.render.entity.model.EntityModelLayer; +import net.minecraft.client.render.entity.model.EntityModelLoader; +import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.texture.Sprite; import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.entity.Entity; @@ -32,6 +43,7 @@ import java.util.List; import java.util.function.Supplier; +@Environment(EnvType.CLIENT) public class ArchRegistryClient { public static > void registerScreen(ScreenHandlerType type, ScreenFactory factory) { MenuRegistry.registerScreenFactory(type, factory::create); @@ -100,10 +112,64 @@ public static void registryClientSprite(Identifier atlasId, Sprite sprite) { // ～1.19.2 } - public static void registerBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { - BlockEntityRendererRegistry.register(type, provider); + public static void registerBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { + BlockEntityRendererRegistry.register(type, ctx -> provider.create(new BlockEntityRendererFactory.Context( + ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer() + ))); } + @FunctionalInterface + public interface BlockEntityRendererFactory { + BlockEntityRenderer create(BlockEntityRendererFactory.Context ctx); + + class Context { + private final BlockEntityRenderDispatcher renderDispatcher; + private final BlockRenderManager renderManager; + private final ItemRenderer itemRenderer; + private final EntityRenderDispatcher entityRenderDispatcher; + private final EntityModelLoader layerRenderDispatcher; + private final TextRenderer textRenderer; + + public Context(BlockEntityRenderDispatcher renderDispatcher, BlockRenderManager renderManager, ItemRenderer itemRenderer, EntityRenderDispatcher entityRenderDispatcher, EntityModelLoader layerRenderDispatcher, TextRenderer textRenderer) { + this.renderDispatcher = renderDispatcher; + this.renderManager = renderManager; + this.itemRenderer = itemRenderer; + this.entityRenderDispatcher = entityRenderDispatcher; + this.layerRenderDispatcher = layerRenderDispatcher; + this.textRenderer = textRenderer; + } + + public BlockEntityRenderDispatcher getRenderDispatcher() { + return this.renderDispatcher; + } + + public BlockRenderManager getRenderManager() { + return this.renderManager; + } + + public EntityRenderDispatcher getEntityRenderDispatcher() { + return this.entityRenderDispatcher; + } + + public ItemRenderer getItemRenderer() { + return this.itemRenderer; + } + + public EntityModelLoader getLayerRenderDispatcher() { + return this.layerRenderDispatcher; + } + + public ModelPart getLayerModelPart(EntityModelLayer modelLayer) { + return this.layerRenderDispatcher.getModelPart(modelLayer); + } + + public TextRenderer getTextRenderer() { + return this.textRenderer; + } + } + } + + public static void registerRenderTypeBlock(RenderLayer layer, Block block) { RenderTypeRegistry.register(layer, block); } diff --git a/fabric/build.gradle b/fabric/build.gradle index a2d3ed01c..7c6b990b2 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -75,7 +75,7 @@ components.java { publishing { publications { mavenFabric(MavenPublication) { - artifactId = rootProject.archives_base_name + "-" + project.name + artifactId = info.archives_base_name + "-" + project.name from components.java } } diff --git a/forge/build.gradle b/forge/build.gradle index 176ce1ffe..f153aadbc 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -81,7 +81,7 @@ components.java { publishing { publications { mavenForge(MavenPublication) { - artifactId = rootProject.archives_base_name + "-" + project.name + artifactId = info.archives_base_name + "-" + project.name from components.java } } diff --git a/gradle.properties b/gradle.properties index 0d2cee49e..fc04c062e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,6 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.19.4 -archives_base_name=mcpitanlibarch -mod_version=1.6.0 -maven_group=ml.pkom # https://www.curseforge.com/minecraft/mc-mods/architectury-api architectury_version=8.1.73 diff --git a/info.properties b/info.properties new file mode 100644 index 000000000..7e7ee6d6e --- /dev/null +++ b/info.properties @@ -0,0 +1,3 @@ +archives_base_name=mcpitanlibarch +mod_version=1.6.1 +maven_group=ml.pkom \ No newline at end of file diff --git a/php/build.bat b/php/build.bat new file mode 100644 index 000000000..876b0f055 --- /dev/null +++ b/php/build.bat @@ -0,0 +1,53 @@ +cd "../" + +git fetch origin +git checkout 1.19.4 +gradlew build +gradlew generatePomFileForMavenCommonPublication +gradlew generatePomFileForMavenForgePublication +gradlew generatePomFileForMavenFabricPublication + +git fetch origin +git checkout 1.19.3 +gradlew build +gradlew generatePomFileForMavenCommonPublication +gradlew generatePomFileForMavenForgePublication +gradlew generatePomFileForMavenFabricPublication + +git fetch origin +git checkout 1.19.2 +gradlew build +gradlew generatePomFileForMavenCommonPublication +gradlew generatePomFileForMavenForgePublication +gradlew generatePomFileForMavenFabricPublication + +git fetch origin +git checkout 1.18.2 +gradlew build +gradlew generatePomFileForMavenCommonPublication +gradlew generatePomFileForMavenForgePublication +gradlew generatePomFileForMavenFabricPublication + +git fetch origin +git checkout 1.17.1 +gradlew build +gradlew generatePomFileForMavenCommonPublication +gradlew generatePomFileForMavenForgePublication +gradlew generatePomFileForMavenFabricPublication + +git fetch origin +git checkout 1.16.5 +gradlew build +gradlew generatePomFileForMavenCommonPublication +gradlew generatePomFileForMavenForgePublication +gradlew generatePomFileForMavenFabricPublication + +git fetch origin +git checkout 1.16.5 + +cd "./php" + +start "./upload_maven.bat" +start "./upload_curseforge.bat" +start "./upload_modrinth.bat" +pause \ No newline at end of file From 6c7c31a1dbb3af83c2378c12bf40c35932a8cb2a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 9 Apr 2023 22:52:15 +0900 Subject: [PATCH 148/622] add api --- .../api/item/ExtendItemProvider.java | 73 ++++++++++++++ .../pkom/mcpitanlibarch/mixin/ItemMixin.java | 95 +++++++++++++++++++ .../mcpitanlibarch-common.mixins.json | 1 + info.properties | 2 +- php/build.bat | 81 ++++++++++------ 5 files changed, 221 insertions(+), 31 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemMixin.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java new file mode 100644 index 000000000..904eb1934 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java @@ -0,0 +1,73 @@ +package ml.pkom.mcpitanlibarch.api.item; + +import ml.pkom.mcpitanlibarch.Dummy; +import ml.pkom.mcpitanlibarch.api.event.item.*; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.minecraft.util.TypedActionResult; + +public interface ExtendItemProvider { + + /** + * item right click event + * + * @param event ItemUseEvent + * @return ActionResultType + */ + default TypedActionResult onRightClick(ItemUseEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * item right click event on block + * @param event ItemUseOnBlockEvent + * @return ActionResultType + */ + default ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * using finish with item + * @param event ItemFinishUsingEvent + * @return ItemStack + */ + default ItemStack onFinishUsing(ItemFinishUsingEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * on click with item on entity + * @param event ItemUseOnEntityEvent + * @return ActionResult + */ + default ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * item has recipe remainder + * @param dummy Dummy + * @return boolean + */ + default boolean hasRecipeRemainder(Options options) { + options.cancel = false; + return false; + } + + /** + * add tooltip + * @param event ItemAppendTooltipEvent + */ + default void appendTooltip(ItemAppendTooltipEvent event, Options options) { + options.cancel = true; + } + + public static class Options { + public boolean cancel = true; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemMixin.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemMixin.java new file mode 100644 index 000000000..e34dedfda --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemMixin.java @@ -0,0 +1,95 @@ +package ml.pkom.mcpitanlibarch.mixin; + +import ml.pkom.mcpitanlibarch.api.event.item.*; +import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider.Options; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import java.util.List; + +@Mixin(Item.class) +public class ItemMixin { + @Inject(method = "use", at = @At("HEAD"), cancellable = true) + private void use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + TypedActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "useOnBlock", at = @At("HEAD"), cancellable = true) + private void useOnBlock(ItemUsageContext context, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; + Options options = new Options(); + ActionResult returnValue = provider.onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit()), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "useOnEntity", at = @At("HEAD"), cancellable = true) + private void useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + ActionResult returnValue = provider.onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand), options); + + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "finishUsing", at = @At("HEAD"), cancellable = true) + private void finishUsing(ItemStack stack, World world, LivingEntity user, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + ItemStack returnValue = provider.onFinishUsing(new ItemFinishUsingEvent(stack, world, user), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "hasRecipeRemainder", at = @At("HEAD"), cancellable = true) + private void hasRecipeRemainder(CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + boolean returnValue = provider.hasRecipeRemainder(options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "appendTooltip", at = @At("HEAD"), cancellable = true) + private void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context, CallbackInfo ci) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + provider.appendTooltip(new ItemAppendTooltipEvent(stack, world, tooltip, context), options); + if (options.cancel) + ci.cancel(); + } + } + +} diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlibarch-common.mixins.json index cad714586..0aaea7d9c 100644 --- a/common/src/main/resources/mcpitanlibarch-common.mixins.json +++ b/common/src/main/resources/mcpitanlibarch-common.mixins.json @@ -4,6 +4,7 @@ "package": "ml.pkom.mcpitanlibarch.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ + "ItemMixin", "ItemUsageContextMixin" ], "client": [ diff --git a/info.properties b/info.properties index 7e7ee6d6e..3c730849c 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.1 +mod_version=1.6.2 maven_group=ml.pkom \ No newline at end of file diff --git a/php/build.bat b/php/build.bat index 876b0f055..e088c6fd1 100644 --- a/php/build.bat +++ b/php/build.bat @@ -1,53 +1,74 @@ -cd "../" +cd "..\" git fetch origin git checkout 1.19.4 -gradlew build -gradlew generatePomFileForMavenCommonPublication -gradlew generatePomFileForMavenForgePublication -gradlew generatePomFileForMavenFabricPublication +call gradlew.bat build +call gradlew.bat generatePomFileForMavenCommonPublication +call gradlew.bat generatePomFileForMavenForgePublication +call gradlew.bat generatePomFileForMavenFabricPublication +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.4.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.4.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.4.pom" git fetch origin git checkout 1.19.3 -gradlew build -gradlew generatePomFileForMavenCommonPublication -gradlew generatePomFileForMavenForgePublication -gradlew generatePomFileForMavenFabricPublication +call gradlew.bat build +call gradlew.bat generatePomFileForMavenCommonPublication +call gradlew.bat generatePomFileForMavenForgePublication +call gradlew.bat generatePomFileForMavenFabricPublication +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.3.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.3.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.3.pom" git fetch origin git checkout 1.19.2 -gradlew build -gradlew generatePomFileForMavenCommonPublication -gradlew generatePomFileForMavenForgePublication -gradlew generatePomFileForMavenFabricPublication +call gradlew.bat build +call gradlew.bat generatePomFileForMavenCommonPublication +call gradlew.bat generatePomFileForMavenForgePublication +call gradlew.bat generatePomFileForMavenFabricPublication +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.2.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.2.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.2.pom" git fetch origin git checkout 1.18.2 -gradlew build -gradlew generatePomFileForMavenCommonPublication -gradlew generatePomFileForMavenForgePublication -gradlew generatePomFileForMavenFabricPublication +call gradlew.bat build +call gradlew.bat generatePomFileForMavenCommonPublication +call gradlew.bat generatePomFileForMavenForgePublication +call gradlew.bat generatePomFileForMavenFabricPublication +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.18.2.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.18.2.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.18.2.pom" git fetch origin git checkout 1.17.1 -gradlew build -gradlew generatePomFileForMavenCommonPublication -gradlew generatePomFileForMavenForgePublication -gradlew generatePomFileForMavenFabricPublication +call gradlew.bat build +call gradlew.bat generatePomFileForMavenCommonPublication +call gradlew.bat generatePomFileForMavenForgePublication +call gradlew.bat generatePomFileForMavenFabricPublication +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.17.1.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.17.1.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.17.1.pom" git fetch origin git checkout 1.16.5 -gradlew build -gradlew generatePomFileForMavenCommonPublication -gradlew generatePomFileForMavenForgePublication -gradlew generatePomFileForMavenFabricPublication +copy /y gradlew.bat build +copy /y gradlew.bat generatePomFileForMavenCommonPublication +copy /y gradlew.bat generatePomFileForMavenForgePublication +copy /y gradlew.bat generatePomFileForMavenFabricPublication +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.16.5.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.16.5.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.16.5.pom" git fetch origin -git checkout 1.16.5 +git checkout 1.19.4 + +cd ".\php" -cd "./php" +copy /y "C:\Users\ptms76\Documents\php\*.bat" ".\" +copy /y "C:\Users\ptms76\Documents\php\*.php" ".\" -start "./upload_maven.bat" -start "./upload_curseforge.bat" -start "./upload_modrinth.bat" +start upload_maven.bat +start upload_curseforge.bat +start upload_modrinth.bat pause \ No newline at end of file From f1043b8675ec7557a721b2d2bf204fe8cfed66bd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 9 Apr 2023 22:53:04 +0900 Subject: [PATCH 149/622] ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 824cffc2b..c9e263fba 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ run/ # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar +/php/ From 371b804b236c562d674be86777ef2ab6b789974c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 11 Apr 2023 15:50:19 +0900 Subject: [PATCH 150/622] u --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c9e263fba..c406ea041 100644 --- a/.gitignore +++ b/.gitignore @@ -117,4 +117,5 @@ run/ # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) !gradle-wrapper.jar -/php/ + +php/ From 80e54972c8b9d812bfbdba4715839da9d6337be1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 11 Apr 2023 18:14:49 +0900 Subject: [PATCH 151/622] add api --- .../client/registry/KeybindingRegistry.java | 38 +++++++ .../event/v0/AttackEntityEventRegistry.java | 25 +++++ .../api/event/v0/ClientTickEventRegistry.java | 35 ++++++ .../api/util/EquipMaterialUtil.java | 103 ++++++++++++++++++ info.properties | 2 +- 5 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/KeybindingRegistry.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/AttackEntityEventRegistry.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/ClientTickEventRegistry.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EquipMaterialUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/KeybindingRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/KeybindingRegistry.java new file mode 100644 index 000000000..a2c8a38b4 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/KeybindingRegistry.java @@ -0,0 +1,38 @@ +package ml.pkom.mcpitanlibarch.api.client.registry; + +import dev.architectury.registry.client.keymappings.KeyMappingRegistry; +import ml.pkom.mcpitanlibarch.api.event.v0.ClientTickEventRegistry; +import ml.pkom.mcpitanlibarch.api.network.ClientNetworking; +import ml.pkom.mcpitanlibarch.api.network.PacketByteUtil; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.util.Identifier; + +public class KeybindingRegistry { + public static void register(KeyBinding keyBinding) { + KeyMappingRegistry.register(keyBinding); + } + + public static void register(KeyBinding keyBinding, ClientTickEventRegistry.Client client) { + register(keyBinding); + ClientTickEventRegistry.registerPost(client); + } + + public static void registerOnLevel(KeyBinding keyBinding, ClientTickEventRegistry.ClientLevel level) { + register(keyBinding); + ClientTickEventRegistry.registerLevelPost(level); + } + + public static void registerWithNetwork(KeyBinding keyBinding, Identifier identifier) { + register(keyBinding, client -> { + if (keyBinding.wasPressed()) + ClientNetworking.send(identifier, PacketByteUtil.create()); + }); + } + + public static void registerOnLevelWithNetwork(KeyBinding keyBinding, Identifier identifier) { + registerOnLevel(keyBinding, client -> { + if (keyBinding.wasPressed()) + ClientNetworking.send(identifier, PacketByteUtil.create()); + }); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/AttackEntityEventRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/AttackEntityEventRegistry.java new file mode 100644 index 000000000..8e8cf7638 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/AttackEntityEventRegistry.java @@ -0,0 +1,25 @@ +package ml.pkom.mcpitanlibarch.api.event.v0; + +import dev.architectury.event.EventResult; +import dev.architectury.event.events.common.PlayerEvent; +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +public class AttackEntityEventRegistry { + public static void register(AttackEntity attackEntity) { + PlayerEvent.ATTACK_ENTITY.register(attackEntity::attack); + } + + public interface AttackEntity { + default EventResult attack(PlayerEntity player, World level, Entity target, Hand hand, @Nullable EntityHitResult result) { + return attack(new Player(player), level, target, hand, result); + } + + EventResult attack(Player player, World level, Entity target, Hand hand, @Nullable EntityHitResult result); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/ClientTickEventRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/ClientTickEventRegistry.java new file mode 100644 index 000000000..c6635138d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/ClientTickEventRegistry.java @@ -0,0 +1,35 @@ +package ml.pkom.mcpitanlibarch.api.event.v0; + +import dev.architectury.event.events.client.ClientTickEvent; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.world.ClientWorld; + +public class ClientTickEventRegistry { + public static void registerPost(Client client) { + ClientTickEvent.CLIENT_POST.register(client::tick); + } + + public static void registerPre(Client client) { + ClientTickEvent.CLIENT_PRE.register(client::tick); + } + + public static void registerLevelPost(ClientLevel world) { + ClientTickEvent.CLIENT_LEVEL_POST.register(world::tick); + } + + public static void registerLevelPre(ClientLevel world) { + ClientTickEvent.CLIENT_LEVEL_PRE.register(world::tick); + } + + @Environment(EnvType.CLIENT) + public interface Client { + void tick(MinecraftClient instance); + } + + @Environment(EnvType.CLIENT) + public interface ClientLevel { + void tick(ClientWorld instance); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EquipMaterialUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EquipMaterialUtil.java new file mode 100644 index 000000000..b29b6daed --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EquipMaterialUtil.java @@ -0,0 +1,103 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import ml.pkom.mcpitanlibarch.api.item.ArmorEquipmentType; +import ml.pkom.mcpitanlibarch.api.item.CompatibleArmorMaterial; +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; +import net.minecraft.sound.SoundEvent; + +public class EquipMaterialUtil { + public static ToolMaterial createToolMaterial(int durability, float miningSpeedMultiplier, float attackDamage, int miningLevel, int enchantability, Ingredient repairIngredient) { + return new ToolMaterial() { + @Override + public int getDurability() { + return durability; + } + + @Override + public float getMiningSpeedMultiplier() { + return miningSpeedMultiplier; + } + + @Override + public float getAttackDamage() { + return attackDamage; + } + + @Override + public int getMiningLevel() { + return miningLevel; + } + + @Override + public int getEnchantability() { + return enchantability; + } + + @Override + public Ingredient getRepairIngredient() { + return repairIngredient; + } + }; + } + + public static int toInt(ArmorEquipmentType type) { + switch (type.getSlot()) { + case HEAD: + return 0; + case CHEST: + return 1; + case LEGS: + return 2; + case FEET: + return 3; + default: + return 0; + } + } + + public static CompatibleArmorMaterial createArmorMaterial(int[] durability, int[] protection, int enchantability, SoundEvent equipSound, Ingredient repairIngredient, String name, float toughness, float knockbackResistance) { + + return new CompatibleArmorMaterial() { + @Override + public int getDurability(ArmorEquipmentType type) { + return durability[toInt(type)]; + } + + @Override + public int getProtection(ArmorEquipmentType type) { + return protection[toInt(type)]; + } + + @Override + public int getEnchantability() { + return enchantability; + } + + @Override + public SoundEvent getEquipSound() { + return equipSound; + } + + @Override + public Ingredient getRepairIngredient() { + return repairIngredient; + } + + @Override + public String getName() { + return name; + } + + @Override + public float getToughness() { + return toughness; + } + + @Override + public float getKnockbackResistance() { + return knockbackResistance; + } + }; + } +} diff --git a/info.properties b/info.properties index 3c730849c..c23a3d388 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.2 +mod_version=1.6.3 maven_group=ml.pkom \ No newline at end of file From b199cce9b0c4ce31cadb2f89e89e82c353b84527 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 11 Apr 2023 18:14:55 +0900 Subject: [PATCH 152/622] bbababa --- php/build.bat | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/php/build.bat b/php/build.bat index e088c6fd1..590705c8d 100644 --- a/php/build.bat +++ b/php/build.bat @@ -2,7 +2,6 @@ cd "..\" git fetch origin git checkout 1.19.4 -call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -12,7 +11,6 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.19.3 -call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -22,7 +20,6 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.19.2 -call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -32,7 +29,6 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.18.2 -call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -42,7 +38,6 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.17.1 -call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -52,10 +47,9 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.16.5 -copy /y gradlew.bat build -copy /y gradlew.bat generatePomFileForMavenCommonPublication -copy /y gradlew.bat generatePomFileForMavenForgePublication -copy /y gradlew.bat generatePomFileForMavenFabricPublication +call gradlew.bat generatePomFileForMavenCommonPublication +call gradlew.bat generatePomFileForMavenForgePublication +call gradlew.bat generatePomFileForMavenFabricPublication copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.16.5.pom" copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.16.5.pom" copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.16.5.pom" @@ -64,11 +58,4 @@ git fetch origin git checkout 1.19.4 cd ".\php" - -copy /y "C:\Users\ptms76\Documents\php\*.bat" ".\" -copy /y "C:\Users\ptms76\Documents\php\*.php" ".\" - -start upload_maven.bat -start upload_curseforge.bat -start upload_modrinth.bat pause \ No newline at end of file From 22ef06e1ffb361091d32c3546017ef8b1fc82916 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 27 May 2023 18:34:16 +0900 Subject: [PATCH 153/622] update gradle --- gradle.properties | 16 ++++++++-------- php/build.bat | 13 +++++++++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index fc04c062e..b241e9a45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,22 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.19.4 +minecraft_version=1.20-pre6 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=8.1.73 +architectury_version=9.0.5 # https://fabricmc.net/develop/ -fabric_loader_version=0.14.17 -yarn_mappings=1.19.4+build.1 -fabric_api_version=0.76.0+1.19.4 +fabric_loader_version=0.14.21 +yarn_mappings=1.20-pre6+build.2 +fabric_api_version=0.82.1+1.20 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.19.4-45.0.9 +forge_version=1.20-45.0.9 # https://lambdaurora.dev/tools/import_quilt.html -quilt_loader_version=0.19.0-beta.9 +quilt_loader_version=0.19.0-beta.13 quilt_fabric_api_version=6.0.0-beta.3+0.76.0 fabricEnabled=true -forgeEnabled=true +forgeEnabled=false quiltEnabled=false \ No newline at end of file diff --git a/php/build.bat b/php/build.bat index 590705c8d..832325551 100644 --- a/php/build.bat +++ b/php/build.bat @@ -2,6 +2,7 @@ cd "..\" git fetch origin git checkout 1.19.4 +call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -11,6 +12,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.19.3 +call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -20,6 +22,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.19.2 +call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -29,6 +32,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.18.2 +call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -38,6 +42,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.17.1 +call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -47,6 +52,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.16.5 +call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication @@ -58,4 +64,11 @@ git fetch origin git checkout 1.19.4 cd ".\php" + +copy /y "C:\Users\ptms76\Documents\php\*.bat" ".\" +copy /y "C:\Users\ptms76\Documents\php\*.php" ".\" + +start upload_maven.bat +start upload_curseforge.bat +start upload_modrinth.bat pause \ No newline at end of file From ca161180d717073d67080f7fe4f616e9acf9642b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 27 May 2023 23:13:47 +0900 Subject: [PATCH 154/622] port to 1.20 --- .../api/block/CompatibleBlockSettings.java | 62 +++++- .../api/block/CompatibleMaterial.java | 206 ++++++++++++++++++ .../mcpitanlibarch/api/block/ExtendBlock.java | 14 ++ .../api/client/SimpleHandledScreen.java | 50 +++-- .../RedrawableTexturedButtonWidget.java | 15 +- .../api/client/render/DrawObjectDM.java | 33 +++ .../handledscreen/DrawBackgroundArgs.java | 48 ++++ .../handledscreen/DrawForegroundArgs.java | 38 ++++ .../DrawMouseoverTooltipArgs.java | 38 ++++ .../render/handledscreen/RenderArgs.java | 48 ++++ .../api/entity/ExtendEntity.java | 5 + .../mcpitanlibarch/api/entity/Player.java | 2 +- .../api/event/ServerCommandEvent.java | 2 +- .../api/event/block/OutlineShapeEvent.java | 37 ++++ .../api/event/item/ItemUseOnBlockEvent.java | 2 +- .../api/item/CreativeTabBuilder.java | 6 +- .../api/item/CreativeTabManager.java | 6 +- .../api/item/DefaultItemGroups.java | 29 +-- .../api/registry/ArchRegistry.java | 4 +- .../api/util/InventoryUtil.java | 4 +- .../api/util/ItemStackUtil.java | 23 ++ .../pkom/mcpitanlibarch/test/ExampleMod.java | 8 +- .../mcpitanlibarch/test/ExampleScreen.java | 16 +- .../resources/mcpitanlibarch.accesswidener | 28 +-- info.properties | 2 +- quilt/build.gradle | 2 +- 26 files changed, 633 insertions(+), 95 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleMaterial.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/DrawObjectDM.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawBackgroundArgs.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawForegroundArgs.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/RenderArgs.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/OutlineShapeEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemStackUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java index 2ab5b57c8..1fee0f1c2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java @@ -1,6 +1,7 @@ package ml.pkom.mcpitanlibarch.api.block; import net.minecraft.block.*; +import net.minecraft.block.piston.PistonBehavior; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.DyeColor; @@ -10,35 +11,62 @@ public class CompatibleBlockSettings { private final AbstractBlock.Settings settings; - public CompatibleBlockSettings(Material material, MapColor mapColor) { - this.settings = AbstractBlock.Settings.of(material, mapColor); + public CompatibleBlockSettings() { + this.settings = AbstractBlock.Settings.create(); + } + + private static CompatibleBlockSettings copyCompatibleMaterial(CompatibleMaterial material, CompatibleBlockSettings settings) { + settings.mapColor(material.getColor()); + if (material.isLiquid()) + settings.settings.liquid(); + if (material.isSolid()) + settings.settings.solid(); + if (material.isReplaceable()) + settings.settings.replaceable(); + if (material.isSolid()) + settings.settings.solid(); + if (material.isBurnable()) + settings.settings.burnable(); + settings.settings.pistonBehavior(material.getPistonBehavior()); + return settings; + } + + public CompatibleBlockSettings(CompatibleMaterial material, MapColor mapColor) { + this.settings = AbstractBlock.Settings.create(); + copyCompatibleMaterial(material, this); + mapColor(mapColor); } - public CompatibleBlockSettings(Material material, DyeColor dyeColor) { - this.settings = AbstractBlock.Settings.of(material, dyeColor); + public CompatibleBlockSettings(CompatibleMaterial material, DyeColor dyeColor) { + this.settings = AbstractBlock.Settings.create(); + copyCompatibleMaterial(material, this); + mapColor(dyeColor); } - public CompatibleBlockSettings(Material material) { - this.settings = AbstractBlock.Settings.of(material); + public CompatibleBlockSettings(CompatibleMaterial material) { + this.settings = AbstractBlock.Settings.create(); + copyCompatibleMaterial(material, this); } - public CompatibleBlockSettings(Material material, Function mapColor) { - this.settings = AbstractBlock.Settings.of(material, mapColor); + public CompatibleBlockSettings(CompatibleMaterial material, Function mapColor) { + this.settings = AbstractBlock.Settings.create(); + copyCompatibleMaterial(material, this); + mapColor(mapColor); } - public static CompatibleBlockSettings of(Material material, MapColor mapColor) { + public static CompatibleBlockSettings of(CompatibleMaterial material, MapColor mapColor) { return new CompatibleBlockSettings(material, mapColor); } - public static CompatibleBlockSettings of(Material material, DyeColor dyeColor) { + public static CompatibleBlockSettings of(CompatibleMaterial material, DyeColor dyeColor) { return new CompatibleBlockSettings(material, dyeColor); } - public static CompatibleBlockSettings of(Material material) { + public static CompatibleBlockSettings of(CompatibleMaterial material) { return new CompatibleBlockSettings(material); } - public static CompatibleBlockSettings of(Material material, Function mapColor) { + public static CompatibleBlockSettings of(CompatibleMaterial material, Function mapColor) { return new CompatibleBlockSettings(material, mapColor); } @@ -80,6 +108,16 @@ public CompatibleBlockSettings mapColor(MapColor color) { return this; } + public CompatibleBlockSettings mapColor(DyeColor color) { + settings.mapColor(color); + return this; + } + + public CompatibleBlockSettings mapColor(Function color) { + settings.mapColor(color); + return this; + } + public CompatibleBlockSettings dropsLike(Block source) { settings.dropsLike(source); return this; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleMaterial.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleMaterial.java new file mode 100644 index 000000000..6a6fb0384 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleMaterial.java @@ -0,0 +1,206 @@ +package ml.pkom.mcpitanlibarch.api.block; + +import net.minecraft.block.MapColor; +import net.minecraft.block.piston.PistonBehavior; + +public final class CompatibleMaterial { + public static final CompatibleMaterial AIR; + public static final CompatibleMaterial STRUCTURE_VOID; + public static final CompatibleMaterial PORTAL; + public static final CompatibleMaterial CARPET; + public static final CompatibleMaterial PLANT; + public static final CompatibleMaterial UNDERWATER_PLANT; + public static final CompatibleMaterial REPLACEABLE_PLANT; + public static final CompatibleMaterial NETHER_SHOOTS; + public static final CompatibleMaterial REPLACEABLE_UNDERWATER_PLANT; + public static final CompatibleMaterial WATER; + public static final CompatibleMaterial BUBBLE_COLUMN; + public static final CompatibleMaterial LAVA; + public static final CompatibleMaterial SNOW_LAYER; + public static final CompatibleMaterial FIRE; + public static final CompatibleMaterial DECORATION; + public static final CompatibleMaterial COBWEB; + public static final CompatibleMaterial SCULK; + public static final CompatibleMaterial REDSTONE_LAMP; + public static final CompatibleMaterial ORGANIC_PRODUCT; + public static final CompatibleMaterial SOIL; + public static final CompatibleMaterial SOLID_ORGANIC; + public static final CompatibleMaterial DENSE_ICE; + public static final CompatibleMaterial AGGREGATE; + public static final CompatibleMaterial SPONGE; + public static final CompatibleMaterial SHULKER_BOX; + public static final CompatibleMaterial WOOD; + public static final CompatibleMaterial NETHER_WOOD; + public static final CompatibleMaterial BAMBOO_SAPLING; + public static final CompatibleMaterial BAMBOO; + public static final CompatibleMaterial WOOL; + public static final CompatibleMaterial TNT; + public static final CompatibleMaterial LEAVES; + public static final CompatibleMaterial GLASS; + public static final CompatibleMaterial ICE; + public static final CompatibleMaterial CACTUS; + public static final CompatibleMaterial STONE; + public static final CompatibleMaterial METAL; + public static final CompatibleMaterial SNOW_BLOCK; + public static final CompatibleMaterial REPAIR_STATION; + public static final CompatibleMaterial BARRIER; + public static final CompatibleMaterial PISTON; + public static final CompatibleMaterial MOSS_BLOCK; + public static final CompatibleMaterial GOURD; + public static final CompatibleMaterial EGG; + public static final CompatibleMaterial CAKE; + public static final CompatibleMaterial AMETHYST; + public static final CompatibleMaterial POWDER_SNOW; + private final MapColor color; + private final PistonBehavior pistonBehavior; + private final boolean burnable; + private final boolean liquid; + private final boolean replaceable; + private final boolean solid; + + public CompatibleMaterial(MapColor color, boolean liquid, boolean solid, boolean burnable, boolean replaceable, PistonBehavior pistonBehavior) { + this.color = color; + this.liquid = liquid; + this.solid = solid; + this.burnable = burnable; + this.replaceable = replaceable; + this.pistonBehavior = pistonBehavior; + } + + public boolean isLiquid() { + return this.liquid; + } + + public boolean isSolid() { + return this.solid; + } + + public boolean isBurnable() { + return this.burnable; + } + + public boolean isReplaceable() { + return this.replaceable; + } + + public PistonBehavior getPistonBehavior() { + return this.pistonBehavior; + } + + public MapColor getColor() { + return this.color; + } + + static { + AIR = (new Builder(MapColor.CLEAR)).allowsMovement().lightPassesThrough().notSolid().replaceable().build(); + STRUCTURE_VOID = (new Builder(MapColor.CLEAR)).allowsMovement().lightPassesThrough().notSolid().replaceable().build(); + PORTAL = (new Builder(MapColor.CLEAR)).allowsMovement().lightPassesThrough().notSolid().blocksPistons().build(); + CARPET = (new Builder(MapColor.WHITE_GRAY)).allowsMovement().lightPassesThrough().notSolid().burnable().build(); + PLANT = (new Builder(MapColor.DARK_GREEN)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().build(); + UNDERWATER_PLANT = (new Builder(MapColor.WATER_BLUE)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().build(); + REPLACEABLE_PLANT = (new Builder(MapColor.DARK_GREEN)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().burnable().build(); + NETHER_SHOOTS = (new Builder(MapColor.DARK_GREEN)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().build(); + REPLACEABLE_UNDERWATER_PLANT = (new Builder(MapColor.WATER_BLUE)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().build(); + WATER = (new Builder(MapColor.WATER_BLUE)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().liquid().build(); + BUBBLE_COLUMN = (new Builder(MapColor.WATER_BLUE)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().liquid().build(); + LAVA = (new Builder(MapColor.BRIGHT_RED)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().liquid().build(); + SNOW_LAYER = (new Builder(MapColor.WHITE)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().build(); + FIRE = (new Builder(MapColor.CLEAR)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().replaceable().build(); + DECORATION = (new Builder(MapColor.CLEAR)).allowsMovement().lightPassesThrough().notSolid().destroyedByPiston().build(); + COBWEB = (new Builder(MapColor.WHITE_GRAY)).allowsMovement().lightPassesThrough().destroyedByPiston().build(); + SCULK = (new Builder(MapColor.BLACK)).build(); + REDSTONE_LAMP = (new Builder(MapColor.CLEAR)).build(); + ORGANIC_PRODUCT = (new Builder(MapColor.LIGHT_BLUE_GRAY)).build(); + SOIL = (new Builder(MapColor.DIRT_BROWN)).build(); + SOLID_ORGANIC = (new Builder(MapColor.PALE_GREEN)).build(); + DENSE_ICE = (new Builder(MapColor.PALE_PURPLE)).build(); + AGGREGATE = (new Builder(MapColor.PALE_YELLOW)).build(); + SPONGE = (new Builder(MapColor.YELLOW)).build(); + SHULKER_BOX = (new Builder(MapColor.PURPLE)).build(); + WOOD = (new Builder(MapColor.OAK_TAN)).burnable().build(); + NETHER_WOOD = (new Builder(MapColor.OAK_TAN)).build(); + BAMBOO_SAPLING = (new Builder(MapColor.OAK_TAN)).burnable().destroyedByPiston().allowsMovement().build(); + BAMBOO = (new Builder(MapColor.OAK_TAN)).burnable().destroyedByPiston().build(); + WOOL = (new Builder(MapColor.WHITE_GRAY)).burnable().build(); + TNT = (new Builder(MapColor.BRIGHT_RED)).burnable().lightPassesThrough().build(); + LEAVES = (new Builder(MapColor.DARK_GREEN)).burnable().lightPassesThrough().destroyedByPiston().build(); + GLASS = (new Builder(MapColor.CLEAR)).lightPassesThrough().build(); + ICE = (new Builder(MapColor.PALE_PURPLE)).lightPassesThrough().build(); + CACTUS = (new Builder(MapColor.DARK_GREEN)).lightPassesThrough().destroyedByPiston().build(); + STONE = (new Builder(MapColor.STONE_GRAY)).build(); + METAL = (new Builder(MapColor.IRON_GRAY)).build(); + SNOW_BLOCK = (new Builder(MapColor.WHITE)).build(); + REPAIR_STATION = (new Builder(MapColor.IRON_GRAY)).blocksPistons().build(); + BARRIER = (new Builder(MapColor.CLEAR)).blocksPistons().build(); + PISTON = (new Builder(MapColor.STONE_GRAY)).blocksPistons().build(); + MOSS_BLOCK = (new Builder(MapColor.DARK_GREEN)).destroyedByPiston().build(); + GOURD = (new Builder(MapColor.DARK_GREEN)).destroyedByPiston().build(); + EGG = (new Builder(MapColor.DARK_GREEN)).destroyedByPiston().build(); + CAKE = (new Builder(MapColor.CLEAR)).destroyedByPiston().build(); + AMETHYST = (new Builder(MapColor.PURPLE)).build(); + POWDER_SNOW = (new Builder(MapColor.WHITE)).notSolid().allowsMovement().build(); + } + + public static class Builder { + private PistonBehavior pistonBehavior; + private boolean blocksMovement; + private boolean burnable; + private boolean liquid; + private boolean replaceable; + private boolean solid; + private final MapColor color; + private boolean blocksLight; + + public Builder(MapColor color) { + this.pistonBehavior = PistonBehavior.NORMAL; + this.blocksMovement = true; + this.solid = true; + this.blocksLight = true; + this.color = color; + } + + public Builder liquid() { + this.liquid = true; + return this; + } + + public Builder notSolid() { + this.solid = false; + return this; + } + + public Builder allowsMovement() { + this.blocksMovement = false; + return this; + } + + Builder lightPassesThrough() { + this.blocksLight = false; + return this; + } + + protected Builder burnable() { + this.burnable = true; + return this; + } + + public Builder replaceable() { + this.replaceable = true; + return this; + } + + protected Builder destroyedByPiston() { + this.pistonBehavior = PistonBehavior.DESTROY; + return this; + } + + protected Builder blocksPistons() { + this.pistonBehavior = PistonBehavior.BLOCK; + return this; + } + + public CompatibleMaterial build() { + return new CompatibleMaterial(this.color, this.liquid, this.solid, this.burnable, this.replaceable, this.pistonBehavior); + } + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index 1a614c2b4..01c431bd1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -2,10 +2,12 @@ import ml.pkom.mcpitanlibarch.api.event.block.BlockScheduledTickEvent; import ml.pkom.mcpitanlibarch.api.event.block.BlockUseEvent; +import ml.pkom.mcpitanlibarch.api.event.block.OutlineShapeEvent; import ml.pkom.mcpitanlibarch.api.event.block.ScreenHandlerCreateEvent; import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; @@ -17,6 +19,8 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import javax.annotation.Nullable; @@ -30,6 +34,16 @@ public ExtendBlock(CompatibleBlockSettings settings) { super(settings.build()); } + public VoxelShape getOutlineShape(OutlineShapeEvent event) { + return super.getOutlineShape(event.state, event.world, event.pos, event.context); + } + + @Deprecated + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return super.getOutlineShape(state, world, pos, context); + } + public void scheduledTick(BlockScheduledTickEvent event) { super.scheduledTick(event.state, event.world, event.pos, event.random); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 32e89a72d..111be873d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -1,16 +1,22 @@ package ml.pkom.mcpitanlibarch.api.client; +import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawBackgroundArgs; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawForegroundArgs; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawMouseoverTooltipArgs; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; public abstract class SimpleHandledScreen extends HandledScreen { @@ -31,35 +37,39 @@ protected T addDrawableChild_compati } @Override - protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int mouseY) { - drawBackgroundOverride(matrices, delta, mouseX, mouseY); + protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { + DrawObjectDM drawObjectDM = new DrawObjectDM(context); + drawBackgroundOverride(new DrawBackgroundArgs(drawObjectDM, delta, mouseX, mouseY)); } - public abstract void drawBackgroundOverride(MatrixStack matrices, float delta, int mouseX, int mouseY); + public abstract void drawBackgroundOverride(DrawBackgroundArgs args); @Override - protected void drawForeground(MatrixStack matrices, int mouseX, int mouseY) { - drawForegroundOverride(matrices, mouseX, mouseY); + protected void drawForeground(DrawContext context, int mouseX, int mouseY) { + DrawObjectDM drawObjectDM = new DrawObjectDM(context); + drawForegroundOverride(new DrawForegroundArgs(drawObjectDM, mouseX, mouseY)); } - protected void drawForegroundOverride(MatrixStack matrices, int mouseX, int mouseY) { - super.drawForeground(matrices, mouseX, mouseY); + protected void drawForegroundOverride(DrawForegroundArgs args) { + super.drawForeground(args.drawObjectDM.getContext(), args.mouseX, args.mouseY); } - public void callDrawTexture(MatrixStack matrices, int x, int y, int u, int v, int width, int height) { - super.drawTexture(matrices, x, y, u, v, width, height); + public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { + //ScreenUtil.setBackground(GUI); + //super.drawTexture(matrices, x, y, u, v, width, height); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); } - public void callRenderBackground(MatrixStack matrices) { - super.renderBackground(matrices); + public void callRenderBackground(DrawObjectDM drawObjectDM) { + super.renderBackground(drawObjectDM.getContext()); } - public void callDrawMouseoverTooltip(MatrixStack matrices, int x, int y) { - super.drawMouseoverTooltip(matrices, x, y); + public void callDrawMouseoverTooltip(DrawMouseoverTooltipArgs args) { + super.drawMouseoverTooltip(args.drawObjectDM.getContext(), args.mouseX, args.mouseY); } - public void renderOverride(MatrixStack matrices, int mouseX, int mouseY, float delta) { - super.render(matrices, mouseX, mouseY, delta); + public void renderOverride(RenderArgs args) { + super.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); } public void resizeOverride(MinecraftClient client, int width, int height) { @@ -88,7 +98,7 @@ public void fixScreen() { this.x = super.x; //(this.width - this.backgroundWidth) / 2; this.y = super.y; //(this.height - this.backgroundHeight) / 2; this.textRenderer = super.textRenderer; - this.itemRenderer = super.itemRenderer; + this.itemRenderer = MinecraftClient.getInstance().getItemRenderer(); this.width = super.width; this.height = super.height; } @@ -110,7 +120,6 @@ public void setTextRenderer(TextRenderer textRenderer) { public void setItemRenderer(ItemRenderer itemRenderer) { this.itemRenderer = itemRenderer; - super.itemRenderer = itemRenderer; } public void setWidth(int width) { @@ -142,8 +151,9 @@ public int getBackgroundHeight() { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - renderOverride(matrices, mouseX, mouseY, delta); + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + DrawObjectDM drawObjectDM = new DrawObjectDM(context); + renderOverride(new RenderArgs(drawObjectDM, mouseX, mouseY, delta)); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java index fd178c796..706a57544 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java @@ -1,6 +1,7 @@ package ml.pkom.mcpitanlibarch.api.client.gui.widget; import ml.pkom.mcpitanlibarch.api.util.client.RenderUtil; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; @@ -24,18 +25,8 @@ public RedrawableTexturedButtonWidget(int x, int y, int width, int height, int u this.texture = texture; } - public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { - RenderUtil.setShaderToPositionTexProgram(); - RenderUtil.setShaderTexture(0, this.texture); - int i = this.v; - if (!this.isNarratable()) { - i += this.hoveredVOffset * 2; - } else if (this.isHovered()) { - i += this.hoveredVOffset; - } - - RenderUtil.enableDepthTest(); - drawTexture(matrices, this.getX(), this.getY(), (float)this.u, (float)i, this.width, this.height, this.textureWidth, this.textureHeight); + public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + this.drawTexture(context, texture, this.getX(), this.getY(), this.u, this.v, this.hoveredVOffset, this.width, this.height, this.textureWidth, this.textureHeight); } public void setTexture(Identifier texture) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/DrawObjectDM.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/DrawObjectDM.java new file mode 100644 index 000000000..2be57f7ae --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/DrawObjectDM.java @@ -0,0 +1,33 @@ +package ml.pkom.mcpitanlibarch.api.client.render; + +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.util.math.MatrixStack; + +public class DrawObjectDM { + private MatrixStack stack; + private DrawContext context; + + public DrawObjectDM(DrawContext context) { + this.context = context; + } + + public DrawObjectDM(MatrixStack stack) { + this.stack = stack; + } + + public DrawContext getContext() { + return context; + } + + public MatrixStack getStack() { + return stack; + } + + public void setContext(DrawContext context) { + this.context = context; + } + + public void setStack(MatrixStack stack) { + this.stack = stack; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawBackgroundArgs.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawBackgroundArgs.java new file mode 100644 index 000000000..66370378b --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawBackgroundArgs.java @@ -0,0 +1,48 @@ +package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; + +import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; + +public class DrawBackgroundArgs { + public DrawObjectDM drawObjectDM; + public float delta; + public int mouseX, mouseY; + + public DrawBackgroundArgs(DrawObjectDM drawObjectDM, float delta, int mouseX, int mouseY) { + setDrawObjectDM(drawObjectDM); + setDelta(delta); + setMouseX(mouseX); + setMouseY(mouseY); + } + + public void setDrawObjectDM(DrawObjectDM drawObjectDM) { + this.drawObjectDM = drawObjectDM; + } + + public void setDelta(float delta) { + this.delta = delta; + } + + public void setMouseX(int mouseX) { + this.mouseX = mouseX; + } + + public void setMouseY(int mouseY) { + this.mouseY = mouseY; + } + + public DrawObjectDM getDrawObjectDM() { + return drawObjectDM; + } + + public float getDelta() { + return delta; + } + + public int getMouseX() { + return mouseX; + } + + public int getMouseY() { + return mouseY; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawForegroundArgs.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawForegroundArgs.java new file mode 100644 index 000000000..d4b8b854b --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawForegroundArgs.java @@ -0,0 +1,38 @@ +package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; + +import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; + +public class DrawForegroundArgs { + public DrawObjectDM drawObjectDM; + public int mouseX, mouseY; + + public DrawForegroundArgs(DrawObjectDM drawObjectDM, int mouseX, int mouseY) { + setDrawObjectDM(drawObjectDM); + setMouseX(mouseX); + setMouseY(mouseY); + } + + public void setDrawObjectDM(DrawObjectDM drawObjectDM) { + this.drawObjectDM = drawObjectDM; + } + + public void setMouseX(int mouseX) { + this.mouseX = mouseX; + } + + public void setMouseY(int mouseY) { + this.mouseY = mouseY; + } + + public DrawObjectDM getDrawObjectDM() { + return drawObjectDM; + } + + public int getMouseX() { + return mouseX; + } + + public int getMouseY() { + return mouseY; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java new file mode 100644 index 000000000..2e2c65aca --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java @@ -0,0 +1,38 @@ +package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; + +import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; + +public class DrawMouseoverTooltipArgs { + public DrawObjectDM drawObjectDM; + public int mouseX, mouseY; + + public DrawMouseoverTooltipArgs(DrawObjectDM drawObjectDM, int mouseX, int mouseY) { + setDrawObjectDM(drawObjectDM); + setMouseX(mouseX); + setMouseY(mouseY); + } + + public void setDrawObjectDM(DrawObjectDM drawObjectDM) { + this.drawObjectDM = drawObjectDM; + } + + public void setMouseX(int mouseX) { + this.mouseX = mouseX; + } + + public void setMouseY(int mouseY) { + this.mouseY = mouseY; + } + + public DrawObjectDM getDrawObjectDM() { + return drawObjectDM; + } + + public int getMouseX() { + return mouseX; + } + + public int getMouseY() { + return mouseY; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/RenderArgs.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/RenderArgs.java new file mode 100644 index 000000000..aa6664254 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/RenderArgs.java @@ -0,0 +1,48 @@ +package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; + +import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; + +public class RenderArgs { + public DrawObjectDM drawObjectDM; + public float delta; + public int mouseX, mouseY; + + public RenderArgs(DrawObjectDM drawObjectDM, int mouseX, int mouseY, float delta) { + setDrawObjectDM(drawObjectDM); + setDelta(delta); + setMouseX(mouseX); + setMouseY(mouseY); + } + + public void setDrawObjectDM(DrawObjectDM drawObjectDM) { + this.drawObjectDM = drawObjectDM; + } + + public void setDelta(float delta) { + this.delta = delta; + } + + public void setMouseX(int mouseX) { + this.mouseX = mouseX; + } + + public void setMouseY(int mouseY) { + this.mouseY = mouseY; + } + + public DrawObjectDM getDrawObjectDM() { + return drawObjectDM; + } + + public float getDelta() { + return delta; + } + + public int getMouseX() { + return mouseX; + } + + public int getMouseY() { + return mouseY; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java index c2d163c11..fcc030a09 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java @@ -59,4 +59,9 @@ public NbtCompound fromTag(NbtCompound nbt) { this.readNbt(NbtTag.from(nbt)); return nbt; } + + @Override + public World getWorld() { + return super.getWorld(); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index b1523c947..34b4f0f13 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -166,7 +166,7 @@ public boolean isCreative() { } public World getWorld() { - return getEntity().world; + return getEntity().getWorld(); } public ScreenHandler getCurrentScreenHandler() { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java index 46260a71f..f702c656d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java @@ -58,7 +58,7 @@ public StringRange getRange() { } public void sendSuccess(Text message, boolean broadcastToOps) { - context.getSource().sendFeedback(message, broadcastToOps); + context.getSource().sendFeedback(() -> message, broadcastToOps); } public void sendFailure(Text message) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/OutlineShapeEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/OutlineShapeEvent.java new file mode 100644 index 000000000..ad8722a0f --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/OutlineShapeEvent.java @@ -0,0 +1,37 @@ +package ml.pkom.mcpitanlibarch.api.event.block; + +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; + +public class OutlineShapeEvent extends BaseEvent { + public BlockState state; + public BlockView world; + public BlockPos pos; + public ShapeContext context; + + public OutlineShapeEvent(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + this.state = state; + this.world = world; + this.pos = pos; + this.context = context; + } + + public BlockPos getPos() { + return pos; + } + + public BlockState getState() { + return state; + } + + public BlockView getWorld() { + return world; + } + + public ShapeContext getContext() { + return context; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java index fbff538a5..1aedf1b7b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java @@ -21,7 +21,7 @@ public class ItemUseOnBlockEvent extends BaseEvent { public BlockPos blockPos; public ItemUseOnBlockEvent(PlayerEntity player, Hand hand, BlockHitResult hit) { - this(player.world, player, hand, player.getStackInHand(hand), hit); + this(player.getWorld(), player, hand, player.getStackInHand(hand), hit); } public ItemUseOnBlockEvent(World world, @Nullable PlayerEntity player, Hand hand, ItemStack stack, BlockHitResult hit) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java index 7537e704f..14e674516 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java @@ -1,6 +1,7 @@ package ml.pkom.mcpitanlibarch.api.item; import dev.architectury.registry.CreativeTabRegistry; +import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -60,14 +61,15 @@ public void setTexture(String texture) { } public ItemGroup build() { - CreativeTabRegistry.TabSupplier tabSupplier = CreativeTabRegistry.create(identifier, (builder -> { + return CreativeTabRegistry.create((builder -> { if (displayName != null) builder.displayName(displayName); + else builder.displayName(TextUtil.translatable("itemGroup." + identifier.getNamespace() + "." + identifier.getPath())); + if (iconSupplier != null) builder.icon(iconSupplier); if (noRenderedName) builder.noRenderedName(); if (noScrollbar) builder.noScrollbar(); if (special) builder.special(); if (texture != null) builder.texture(texture); })); - return tabSupplier.get(); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java index 395f0d146..61cafd443 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -36,14 +36,14 @@ private BookingStack(ItemGroup itemGroup, ItemStack stack) { public static void allRegister() { if (!bookingItems.isEmpty()) { for (BookingItem bookingItem : bookingItems) { - CreativeTabRegistry.append(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); bookingItems.remove(bookingItem); } } if (!bookingStacks.isEmpty()) { for (BookingStack bookingStack : bookingStacks) { - CreativeTabRegistry.appendStack(bookingStack.itemGroup, bookingStack.stack); + CreativeTabRegistry.appendBuiltinStack(bookingStack.itemGroup, bookingStack.stack); bookingStacks.remove(bookingStack); } } @@ -53,7 +53,7 @@ public static void register(Identifier identifier) { if (bookingItems.isEmpty()) return; for (BookingItem bookingItem : bookingItems) { if (!bookingItem.identifier.toString().equals(identifier.toString())) continue; - CreativeTabRegistry.append(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); bookingItems.remove(bookingItem); break; } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java index 0c895419f..9b0ba0cd3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java @@ -2,22 +2,23 @@ import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; public class DefaultItemGroups { - public static final ItemGroup BUILDING_BLOCKS = ItemGroups.BUILDING_BLOCKS; - public static final ItemGroup COLORED_BLOCKS = ItemGroups.COLORED_BLOCKS; // if 1.19.2 and below, BUILDING_BLOCKS - public static final ItemGroup NATURAL = ItemGroups.NATURAL; // if 1.19.2 and below, DECORATIONS - public static final ItemGroup FUNCTIONAL = ItemGroups.FUNCTIONAL; // if 1.19.2 and below, TRANSPORTATION - public static final ItemGroup REDSTONE = ItemGroups.REDSTONE; - public static final ItemGroup HOTBAR = ItemGroups.HOTBAR; - public static final ItemGroup SEARCH = ItemGroups.SEARCH; - public static final ItemGroup TOOLS = ItemGroups.TOOLS; - public static final ItemGroup COMBAT = ItemGroups.COMBAT; - public static final ItemGroup FOOD_AND_DRINK = ItemGroups.FOOD_AND_DRINK; // if 1.19.2 and below, FOOD - public static final ItemGroup INGREDIENTS = ItemGroups.INGREDIENTS; // if 1.19.2 and below, MISC - public static final ItemGroup SPAWN_EGGS = ItemGroups.SPAWN_EGGS; // if 1.19.2 and below, MISC - public static final ItemGroup OPERATOR = ItemGroups.OPERATOR; // if 1.19.2 and below, MISC - public static final ItemGroup INVENTORY = ItemGroups.INVENTORY; + public static final ItemGroup BUILDING_BLOCKS = Registries.ITEM_GROUP.get(ItemGroups.BUILDING_BLOCKS); + public static final ItemGroup COLORED_BLOCKS = Registries.ITEM_GROUP.get(ItemGroups.COLORED_BLOCKS); // if 1.19.2 and below, BUILDING_BLOCKS + public static final ItemGroup NATURAL = Registries.ITEM_GROUP.get(ItemGroups.NATURAL); // if 1.19.2 and below, DECORATIONS + public static final ItemGroup FUNCTIONAL = Registries.ITEM_GROUP.get(ItemGroups.FUNCTIONAL); // if 1.19.2 and below, TRANSPORTATION + public static final ItemGroup REDSTONE = Registries.ITEM_GROUP.get(ItemGroups.REDSTONE); + public static final ItemGroup HOTBAR = Registries.ITEM_GROUP.get(ItemGroups.HOTBAR); + public static final ItemGroup SEARCH = Registries.ITEM_GROUP.get(ItemGroups.SEARCH); + public static final ItemGroup TOOLS = Registries.ITEM_GROUP.get(ItemGroups.TOOLS); + public static final ItemGroup COMBAT = Registries.ITEM_GROUP.get(ItemGroups.COMBAT); + public static final ItemGroup FOOD_AND_DRINK = Registries.ITEM_GROUP.get(ItemGroups.FOOD_AND_DRINK); // if 1.19.2 and below, FOOD + public static final ItemGroup INGREDIENTS = Registries.ITEM_GROUP.get(ItemGroups.INGREDIENTS); // if 1.19.2 and below, MISC + public static final ItemGroup SPAWN_EGGS = Registries.ITEM_GROUP.get(ItemGroups.SPAWN_EGGS); // if 1.19.2 and below, MISC + public static final ItemGroup OPERATOR = Registries.ITEM_GROUP.get(ItemGroups.OPERATOR); // if 1.19.2 and below, MISC + public static final ItemGroup INVENTORY = Registries.ITEM_GROUP.get(ItemGroups.INVENTORY); // ～1.19.2 Item Group public static final ItemGroup BREWING = FOOD_AND_DRINK; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 40370c2d1..ee6f2debc 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -3,6 +3,7 @@ import dev.architectury.registry.registries.RegistrySupplier; import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; +import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; @@ -12,7 +13,6 @@ import ml.pkom.mcpitanlibarch.core.registry.FuelRegistry; import ml.pkom.mcpitanlibarch.core.registry.MCPLRegistry; import net.minecraft.block.Block; -import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; @@ -45,7 +45,7 @@ public RegistryEvent registerItem(Identifier id, Supplier supplier) } public RegistryEvent registerBlock(Identifier id, Supplier supplier) { - if (MCPitanLibarch.blockBlackList.contains(id.toString())) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(Material.STONE)); + if (MCPitanLibarch.blockBlackList.contains(id.toString())) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); return new RegistryEvent<>(mcplr.registryBlock(id, supplier)); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java index 97d6fceb5..3f58b6f97 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java @@ -3,6 +3,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; +import java.util.Objects; + public class InventoryUtil { public static boolean insertItem(ItemStack insertStack, DefaultedList inventory) { return insertItem(insertStack, inventory, false); @@ -37,6 +39,6 @@ public static boolean canMergeItems(ItemStack first, ItemStack second) { if (first.getCount() + second.getCount() > first.getMaxCount()) { return false; } - return ItemStack.areNbtEqual(first, second); + return ItemStackUtil.areNbtEqual(first, second); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemStackUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemStackUtil.java new file mode 100644 index 000000000..961b651e4 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemStackUtil.java @@ -0,0 +1,23 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.item.ItemStack; + +import java.util.Objects; + +public class ItemStackUtil { + public static ItemStack copy(ItemStack stack) { + return stack.copy(); + } + + public static ItemStack copyWithCount(ItemStack stack, int count) { + return stack.copyWithCount(count); + } + + public static boolean areItemsEqual(ItemStack left, ItemStack right) { + return ItemStack.areItemsEqual(left, right); + } + + public static boolean areNbtEqual(ItemStack left, ItemStack right) { + return Objects.equals(left.getNbt(), right.getNbt()); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java index b7c993b4f..1f315a30a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -1,5 +1,8 @@ package ml.pkom.mcpitanlibarch.test; +import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; +import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; +import ml.pkom.mcpitanlibarch.api.block.ExtendBlock; import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandlerTypeBuilder; @@ -8,7 +11,6 @@ import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; -import net.minecraft.block.Material; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; @@ -45,12 +47,12 @@ public static void init() { //EntityTypeBuilder.create().setSpawnGroup(SpawnGroup.AMBIENT).setEntityFactory(((type, world) -> new ZombieEntity((EntityType) type, world))); EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new Item(new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS, id("example_item")))); - EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new Block(AbstractBlock.Settings.of(Material.STONE))); + EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); - EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(AbstractBlock.Settings.of(Material.STONE))); + EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> new BlockItem(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); registry.allRegister(); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java index 320974312..1dd4fab98 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java @@ -1,6 +1,9 @@ package ml.pkom.mcpitanlibarch.test; import ml.pkom.mcpitanlibarch.api.client.SimpleHandledScreen; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawBackgroundArgs; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawMouseoverTooltipArgs; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; import ml.pkom.mcpitanlibarch.api.util.client.ScreenUtil; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.client.util.math.MatrixStack; @@ -27,15 +30,14 @@ public void initOverride() { } @Override - public void drawBackgroundOverride(MatrixStack matrices, float delta, int mouseX, int mouseY) { - ScreenUtil.setBackground(GUI); - callDrawTexture(matrices, x, y, 0, 0, this.backgroundWidth, this.backgroundHeight); + public void drawBackgroundOverride(DrawBackgroundArgs args) { + callDrawTexture(args.drawObjectDM, GUI, x, y, 0, 0, this.backgroundWidth, this.backgroundHeight); } @Override - public void renderOverride(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.callRenderBackground(matrices); - super.renderOverride(matrices, mouseX, mouseY, delta); - this.callDrawMouseoverTooltip(matrices, mouseX, mouseY); + public void renderOverride(RenderArgs args) { + this.callRenderBackground(args.drawObjectDM); + super.renderOverride(args); + this.callDrawMouseoverTooltip(new DrawMouseoverTooltipArgs(args.drawObjectDM, args.mouseX, args.mouseY)); } } diff --git a/common/src/main/resources/mcpitanlibarch.accesswidener b/common/src/main/resources/mcpitanlibarch.accesswidener index 00bc14b46..e9dc186fa 100644 --- a/common/src/main/resources/mcpitanlibarch.accesswidener +++ b/common/src/main/resources/mcpitanlibarch.accesswidener @@ -1,18 +1,18 @@ accessWidener v2 named -accessible field net/minecraft/item/ItemGroups BUILDING_BLOCKS Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups COLORED_BLOCKS Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups NATURAL Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups FUNCTIONAL Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups REDSTONE Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups HOTBAR Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups SEARCH Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups TOOLS Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups COMBAT Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups FOOD_AND_DRINK Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups INGREDIENTS Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/item/ItemGroup; -accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/item/ItemGroup; +accessible field net/minecraft/item/ItemGroups BUILDING_BLOCKS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups COLORED_BLOCKS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups NATURAL Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups FUNCTIONAL Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups REDSTONE Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups HOTBAR Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups SEARCH Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups TOOLS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups COMBAT Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups FOOD_AND_DRINK Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups INGREDIENTS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/registry/RegistryKey; accessible class net/minecraft/screen/ScreenHandlerType$Factory accessible method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V diff --git a/info.properties b/info.properties index c23a3d388..52d3dff67 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.3 +mod_version=1.6.4 maven_group=ml.pkom \ No newline at end of file diff --git a/quilt/build.gradle b/quilt/build.gradle index afc433f53..ee067a98e 100644 --- a/quilt/build.gradle +++ b/quilt/build.gradle @@ -32,7 +32,7 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionQuilt")) { transitive false } - shadowCommon 'org.yaml:snakeyaml:1.33' + shadowCommon 'org.yaml:snakeyaml:2.0' } From 9f3f187bb5d901671f23ddd69c433a2b00b1434c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 31 May 2023 23:22:26 +0900 Subject: [PATCH 155/622] 1.20-rc1 --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index b241e9a45..3735d7e18 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.20-pre6 +minecraft_version=1.20-rc1 # https://www.curseforge.com/minecraft/mc-mods/architectury-api architectury_version=9.0.5 # https://fabricmc.net/develop/ fabric_loader_version=0.14.21 -yarn_mappings=1.20-pre6+build.2 -fabric_api_version=0.82.1+1.20 +yarn_mappings=1.20-rc1+build.1 +fabric_api_version=0.83.0+1.20 # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.20-45.0.9 From a6cf1eaa28c45a7537d38f1348ae297ed36d2b7a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 10 Jun 2023 23:44:46 +0900 Subject: [PATCH 156/622] 1.20 --- gradle.properties | 8 ++++---- php/build.bat | 13 ++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3735d7e18..e38ff29ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.20-rc1 +minecraft_version=1.20 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=9.0.5 +architectury_version=9.0.7 # https://fabricmc.net/develop/ fabric_loader_version=0.14.21 -yarn_mappings=1.20-rc1+build.1 +yarn_mappings=1.20+build.1 fabric_api_version=0.83.0+1.20 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.20-45.0.9 +forge_version=1.20-46.0.12 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.19.0-beta.13 diff --git a/php/build.bat b/php/build.bat index 832325551..49c8e1b8e 100644 --- a/php/build.bat +++ b/php/build.bat @@ -1,5 +1,14 @@ cd "..\" +git fetch origin +git checkout 1.20 +call gradlew.bat build +call gradlew.bat generatePomFileForMavenCommonPublication +call gradlew.bat generatePomFileForMavenForgePublication +call gradlew.bat generatePomFileForMavenFabricPublication +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.20-rc1.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.20-rc1.pom" + git fetch origin git checkout 1.19.4 call gradlew.bat build @@ -8,7 +17,7 @@ call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.4.pom" copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.4.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.4.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.20.pom" git fetch origin git checkout 1.19.3 @@ -69,6 +78,4 @@ copy /y "C:\Users\ptms76\Documents\php\*.bat" ".\" copy /y "C:\Users\ptms76\Documents\php\*.php" ".\" start upload_maven.bat -start upload_curseforge.bat -start upload_modrinth.bat pause \ No newline at end of file From dcda0ecfbc1277791d2518d60ffe431a9b909034 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 10 Jun 2023 23:53:24 +0900 Subject: [PATCH 157/622] 1.20 --- common/build.gradle | 5 ++++- php/build.bat | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index ee1ded13c..4a34890dc 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,7 +7,10 @@ dependencies { } architectury { - common(forgeEnabled.toBoolean()) + if (forgeEnabled.toBoolean()) + common("forge") + else + common() } loom { diff --git a/php/build.bat b/php/build.bat index 49c8e1b8e..30c2f00b3 100644 --- a/php/build.bat +++ b/php/build.bat @@ -6,8 +6,8 @@ call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.20-rc1.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.20-rc1.pom" +copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.20.pom" +copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.20.pom" git fetch origin git checkout 1.19.4 From 60a81813ef59836e1d64144abb382269bb1c4189 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 10 Jun 2023 23:54:37 +0900 Subject: [PATCH 158/622] forge enabled --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e38ff29ab..f9c5f697e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,5 +18,5 @@ quilt_loader_version=0.19.0-beta.13 quilt_fabric_api_version=6.0.0-beta.3+0.76.0 fabricEnabled=true -forgeEnabled=false +forgeEnabled=true quiltEnabled=false \ No newline at end of file From c1066ea5f86db400604f1499bd05983f98c77b46 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 11 Jun 2023 00:05:32 +0900 Subject: [PATCH 159/622] forge enabled --- build.gradle | 2 +- common/build.gradle | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 9e153e2d4..da2f96c4c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false } architectury { diff --git a/common/build.gradle b/common/build.gradle index 4a34890dc..ee1ded13c 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,10 +7,7 @@ dependencies { } architectury { - if (forgeEnabled.toBoolean()) - common("forge") - else - common() + common(forgeEnabled.toBoolean()) } loom { From 27e0c360277a082ce5d627777f119935ca75b6e1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 11 Jun 2023 00:07:36 +0900 Subject: [PATCH 160/622] nullable --- .../main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java | 2 +- .../pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java | 2 +- .../pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java | 2 +- .../java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java | 2 +- .../java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index 01c431bd1..d1657e932 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -23,7 +23,7 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public class ExtendBlock extends Block { public ExtendBlock(Settings settings) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java index 1aedf1b7b..8be6ffbb6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java @@ -10,7 +10,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public class ItemUseOnBlockEvent extends BaseEvent { public Player player; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java index 2a6c3628b..ed254d10b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java @@ -3,7 +3,7 @@ import dev.architectury.registry.registries.RegistrySupplier; import ml.pkom.mcpitanlibarch.api.event.BaseEvent; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public class RegistryEvent extends BaseEvent { public RegistrySupplier supplier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java index f7c701f5a..9c5252c48 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java @@ -4,7 +4,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public class TextComponent { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 6b1d62c1f..cb2157e55 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -10,7 +10,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class ScreenUtil { From 2a67962a37d21eea6f8b2f3dbc0117d959d9e1d7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 11 Jun 2023 19:51:33 +0900 Subject: [PATCH 161/622] 2 --- php/build.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/php/build.bat b/php/build.bat index 30c2f00b3..5932e1efb 100644 --- a/php/build.bat +++ b/php/build.bat @@ -8,6 +8,7 @@ call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.20.pom" copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.20.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.20.pom" git fetch origin git checkout 1.19.4 @@ -17,7 +18,7 @@ call gradlew.bat generatePomFileForMavenForgePublication call gradlew.bat generatePomFileForMavenFabricPublication copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.4.pom" copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.4.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.20.pom" +copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.4.pom" git fetch origin git checkout 1.19.3 From b9ef56b3e463b0cc4619c23c90918ec63c83bbf2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 11 Jun 2023 20:08:24 +0900 Subject: [PATCH 162/622] build --- php/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/build.bat b/php/build.bat index 5932e1efb..545448ceb 100644 --- a/php/build.bat +++ b/php/build.bat @@ -71,7 +71,7 @@ copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\buil copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.16.5.pom" git fetch origin -git checkout 1.19.4 +git checkout 1.20 cd ".\php" From 072142398f4686dbe99ca07caea29bf0d96ef664 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 11 Jun 2023 23:15:58 +0900 Subject: [PATCH 163/622] Fix CompatibleSlot --- .../api/gui/slot/CompatibleSlot.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java index c0f459a08..93e38b8f8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java @@ -58,4 +58,28 @@ public ItemStack takeStack(int amount) { public boolean hasStack() { return callHasStack(); } + + public Inventory callGetInventory() { + return inventory; + } + + public int callGetIndex() { + return super.getIndex(); + } + + public int callGetId() { + return super.id; + } + + public int callGetX() { + return super.x; + } + + public int callGetY() { + return super.y; + } + + public void callMarkDirty() { + super.markDirty(); + } } From c277e1ed0d5cc2f5a65c77072c33458e0033a060 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 11 Jun 2023 23:22:40 +0900 Subject: [PATCH 164/622] 1.6.5 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 52d3dff67..c540a3300 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.4 +mod_version=1.6.5 maven_group=ml.pkom \ No newline at end of file From baac349a8e9627d48f45b55d678132688af93da9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 12 Jun 2023 17:20:31 +0900 Subject: [PATCH 165/622] b --- php/build.bat | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/php/build.bat b/php/build.bat index 545448ceb..89d4b8dba 100644 --- a/php/build.bat +++ b/php/build.bat @@ -2,6 +2,7 @@ cd "..\" git fetch origin git checkout 1.20 +timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication @@ -12,6 +13,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.19.4 +timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication @@ -22,6 +24,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.19.3 +timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication @@ -32,6 +35,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.19.2 +timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication @@ -42,6 +46,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.18.2 +timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication @@ -52,6 +57,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.17.1 +timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication @@ -62,6 +68,7 @@ copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\p git fetch origin git checkout 1.16.5 +timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication call gradlew.bat generatePomFileForMavenForgePublication From 2dcb8b8f60e346d172fab94bf8d7c4d524450ffd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 12 Jun 2023 17:20:41 +0900 Subject: [PATCH 166/622] 1.6.6 RendererUtil.drawText --- .../api/util/client/ScreenUtil.java | 18 ++++++++++++++++++ info.properties | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index cb2157e55..4d42558f2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -1,12 +1,16 @@ package ml.pkom.mcpitanlibarch.api.util.client; import ml.pkom.mcpitanlibarch.api.client.gui.widget.RedrawableTexturedButtonWidget; +import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; +import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.OrderedText; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -88,4 +92,18 @@ public static void setFocused(TextFieldWidget widget, boolean focused) { widget.setFocused(focused); } } + + public static class RendererUtil { + public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, Text text, int x, int y, int color) { + return drawObjectDM.getContext().drawText(renderer, text, x, y, color, false); + } + + public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, String text, int x, int y, int color) { + return drawObjectDM.getContext().drawText(renderer, text, x, y, color, false); + } + + public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, OrderedText text, int x, int y, int color) { + return drawObjectDM.getContext().drawText(renderer, text, x, y, color, false); + } + } } diff --git a/info.properties b/info.properties index c540a3300..b1797ba28 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.5 +mod_version=1.6.6 maven_group=ml.pkom \ No newline at end of file From 5a1728ec765a0f6acbee07b56c6bd11afff1e2f4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 13 Jun 2023 23:13:24 +0900 Subject: [PATCH 167/622] add RendererUtil.drawTexture add ItemGroup Register --- .../api/registry/ArchRegistry.java | 8 ++++++ .../api/util/client/RenderUtil.java | 2 ++ .../api/util/client/ScreenUtil.java | 8 ++++++ .../core/registry/MCPLRegistry1_20.java | 26 +++++++++++++++++++ info.properties | 2 +- 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry1_20.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index ee6f2debc..11f724900 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -12,12 +12,14 @@ import ml.pkom.mcpitanlibarch.api.util.ItemUtil; import ml.pkom.mcpitanlibarch.core.registry.FuelRegistry; import ml.pkom.mcpitanlibarch.core.registry.MCPLRegistry; +import ml.pkom.mcpitanlibarch.core.registry.MCPLRegistry1_20; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemGroup; import net.minecraft.particle.ParticleType; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; @@ -28,9 +30,11 @@ public class ArchRegistry { private final MCPLRegistry mcplr; + private final MCPLRegistry1_20 mcplr1_20; public ArchRegistry(String MOD_ID) { mcplr = new MCPLRegistry(MOD_ID); + mcplr1_20 = new MCPLRegistry1_20(mcplr); } public static ArchRegistry createRegistry(String MOD_ID) { @@ -91,6 +95,10 @@ public RegistryEvent> registerParticleType(Identifier id, Suppli return new RegistryEvent<>(mcplr.registryParticleType(id, supplier)); } + public RegistryEvent registerItemGroup(Identifier id, Supplier supplier) { + return new RegistryEvent<>(mcplr1_20.registryItemGroup(id, supplier)); + } + public static void registerFuel(int time, ItemConvertible... item) { FuelRegistry.register(time, item); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java index 4156c0b48..5c257fa93 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java @@ -28,4 +28,6 @@ public static void enableTexture() { public static void disableTexture() { // ～1.19.2 } + + public static class RendererUtil extends ScreenUtil.RendererUtil {} } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 4d42558f2..882205dfe 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -105,5 +105,13 @@ public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, Str public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, OrderedText text, int x, int y, int color) { return drawObjectDM.getContext().drawText(renderer, text, x, y, color, false); } + + public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, textureWidth, textureHeight); + } + + public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, float u, float v, int width, int height) { + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, 256, 256); + } } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry1_20.java b/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry1_20.java new file mode 100644 index 000000000..8354ebf05 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry1_20.java @@ -0,0 +1,26 @@ +package ml.pkom.mcpitanlibarch.core.registry; + +import dev.architectury.registry.registries.Registrar; +import dev.architectury.registry.registries.RegistrySupplier; +import net.minecraft.item.ItemGroup; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +import java.util.function.Supplier; + +@Deprecated +public class MCPLRegistry1_20 { + private final MCPLRegistry mcplr; + + public Registrar ITEM_GROUP; + + + public MCPLRegistry1_20(MCPLRegistry mcplr) { + this.mcplr = mcplr; + ITEM_GROUP = mcplr.REGISTRIES.get().get(RegistryKeys.ITEM_GROUP); + } + + public RegistrySupplier registryItemGroup(Identifier id, Supplier supplier) { + return ITEM_GROUP.register(id, supplier); + } +} diff --git a/info.properties b/info.properties index b1797ba28..bcd7a571e 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.6 +mod_version=1.6.7 maven_group=ml.pkom \ No newline at end of file From 68273a163c9d84876782f0773d34a67c217bed5f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 14 Jun 2023 18:10:33 +0900 Subject: [PATCH 168/622] add TextFieldUtil, ClickableWidgetUtil func --- .../mcpitanlibarch/api/util/client/ScreenUtil.java | 12 ++++++++++++ gradle.properties | 12 ++++++------ info.properties | 2 +- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 882205dfe..9f8d6c040 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -2,11 +2,13 @@ import ml.pkom.mcpitanlibarch.api.client.gui.widget.RedrawableTexturedButtonWidget; import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.screen.ScreenTexts; @@ -91,6 +93,16 @@ public static class TextFieldUtil { public static void setFocused(TextFieldWidget widget, boolean focused) { widget.setFocused(focused); } + + public static void render(TextFieldWidget widget, RenderArgs args) { + widget.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } + } + + public static class ClickableWidgetUtil { + public static void render(ClickableWidget widget, RenderArgs args) { + widget.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } } public static class RendererUtil { diff --git a/gradle.properties b/gradle.properties index f9c5f697e..e44ae431e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,21 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.20 +minecraft_version=1.20.1 # https://www.curseforge.com/minecraft/mc-mods/architectury-api architectury_version=9.0.7 # https://fabricmc.net/develop/ fabric_loader_version=0.14.21 -yarn_mappings=1.20+build.1 -fabric_api_version=0.83.0+1.20 +yarn_mappings=1.20.1+build.1 +fabric_api_version=0.83.1+1.20.1 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.20-46.0.12 +forge_version=1.20.1-47.0.1 # https://lambdaurora.dev/tools/import_quilt.html -quilt_loader_version=0.19.0-beta.13 -quilt_fabric_api_version=6.0.0-beta.3+0.76.0 +quilt_loader_version=0.19.0-beta.18 +quilt_fabric_api_version=6.0.2 fabricEnabled=true forgeEnabled=true diff --git a/info.properties b/info.properties index bcd7a571e..e92ce0f4a 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.7 +mod_version=1.6.8 maven_group=ml.pkom \ No newline at end of file From 9d8e460840d5abce7d2bb7e74f8bbbb97025f8e7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 14 Jun 2023 21:50:57 +0900 Subject: [PATCH 169/622] anc --- php/build.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php/build.bat b/php/build.bat index 89d4b8dba..4eeb2a50f 100644 --- a/php/build.bat +++ b/php/build.bat @@ -1,7 +1,7 @@ cd "..\" git fetch origin -git checkout 1.20 +git checkout 1.20.1 timeout /T 1 call gradlew.bat build call gradlew.bat generatePomFileForMavenCommonPublication @@ -78,7 +78,7 @@ copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\buil copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.16.5.pom" git fetch origin -git checkout 1.20 +git checkout 1.20.1 cd ".\php" From 84221d11c604518e4afea73a54f40453aee4a961 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 14 Jun 2023 21:51:32 +0900 Subject: [PATCH 170/622] anc --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c406ea041..2379174dc 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ run/ !gradle-wrapper.jar php/ +php/*.bat \ No newline at end of file From 5b802efd5a8ce6e834c70e615479ef4cd79d5a34 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 14 Jun 2023 21:54:26 +0900 Subject: [PATCH 171/622] anc --- .gitignore | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2379174dc..a6596c591 100644 --- a/.gitignore +++ b/.gitignore @@ -115,8 +115,7 @@ gradle-app.setting # Common working directory run/ -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - php/ -php/*.bat \ No newline at end of file + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar \ No newline at end of file From 135748987c09d14877764c3ed04943c743785aa0 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 14 Jun 2023 21:55:24 +0900 Subject: [PATCH 172/622] ignore --- php/build.bat | 89 --------------------------------------- php/upload_curseforge.bat | 2 - php/upload_maven.bat | 2 - php/upload_modrinth.bat | 2 - 4 files changed, 95 deletions(-) delete mode 100644 php/build.bat delete mode 100644 php/upload_curseforge.bat delete mode 100644 php/upload_maven.bat delete mode 100644 php/upload_modrinth.bat diff --git a/php/build.bat b/php/build.bat deleted file mode 100644 index 4eeb2a50f..000000000 --- a/php/build.bat +++ /dev/null @@ -1,89 +0,0 @@ -cd "..\" - -git fetch origin -git checkout 1.20.1 -timeout /T 1 -call gradlew.bat build -call gradlew.bat generatePomFileForMavenCommonPublication -call gradlew.bat generatePomFileForMavenForgePublication -call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.20.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.20.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.20.pom" - -git fetch origin -git checkout 1.19.4 -timeout /T 1 -call gradlew.bat build -call gradlew.bat generatePomFileForMavenCommonPublication -call gradlew.bat generatePomFileForMavenForgePublication -call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.4.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.4.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.4.pom" - -git fetch origin -git checkout 1.19.3 -timeout /T 1 -call gradlew.bat build -call gradlew.bat generatePomFileForMavenCommonPublication -call gradlew.bat generatePomFileForMavenForgePublication -call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.3.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.3.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.3.pom" - -git fetch origin -git checkout 1.19.2 -timeout /T 1 -call gradlew.bat build -call gradlew.bat generatePomFileForMavenCommonPublication -call gradlew.bat generatePomFileForMavenForgePublication -call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.19.2.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.19.2.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.19.2.pom" - -git fetch origin -git checkout 1.18.2 -timeout /T 1 -call gradlew.bat build -call gradlew.bat generatePomFileForMavenCommonPublication -call gradlew.bat generatePomFileForMavenForgePublication -call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.18.2.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.18.2.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.18.2.pom" - -git fetch origin -git checkout 1.17.1 -timeout /T 1 -call gradlew.bat build -call gradlew.bat generatePomFileForMavenCommonPublication -call gradlew.bat generatePomFileForMavenForgePublication -call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.17.1.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.17.1.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.17.1.pom" - -git fetch origin -git checkout 1.16.5 -timeout /T 1 -call gradlew.bat build -call gradlew.bat generatePomFileForMavenCommonPublication -call gradlew.bat generatePomFileForMavenForgePublication -call gradlew.bat generatePomFileForMavenFabricPublication -copy /y ".\common\build\publications\mavenCommon\pom-default.xml" ".\common\build\publications\mavenCommon\mcpitanlibarch-1.16.5.pom" -copy /y ".\fabric\build\publications\mavenFabric\pom-default.xml" ".\fabric\build\publications\mavenFabric\mcpitanlibarch-1.16.5.pom" -copy /y ".\forge\build\publications\mavenForge\pom-default.xml" ".\forge\build\publications\mavenForge\mcpitanlibarch-1.16.5.pom" - -git fetch origin -git checkout 1.20.1 - -cd ".\php" - -copy /y "C:\Users\ptms76\Documents\php\*.bat" ".\" -copy /y "C:\Users\ptms76\Documents\php\*.php" ".\" - -start upload_maven.bat -pause \ No newline at end of file diff --git a/php/upload_curseforge.bat b/php/upload_curseforge.bat deleted file mode 100644 index 668dab2c9..000000000 --- a/php/upload_curseforge.bat +++ /dev/null @@ -1,2 +0,0 @@ -php upload_curseforge.php -pause \ No newline at end of file diff --git a/php/upload_maven.bat b/php/upload_maven.bat deleted file mode 100644 index 34860da53..000000000 --- a/php/upload_maven.bat +++ /dev/null @@ -1,2 +0,0 @@ -php upload_maven.php -pause \ No newline at end of file diff --git a/php/upload_modrinth.bat b/php/upload_modrinth.bat deleted file mode 100644 index 9b351ae75..000000000 --- a/php/upload_modrinth.bat +++ /dev/null @@ -1,2 +0,0 @@ -php upload_modrinth.php -pause \ No newline at end of file From a8d6a5aae516c683312f5d6db440ea19fba27c0f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 14 Jun 2023 23:05:01 +0900 Subject: [PATCH 173/622] setPassEvents --- .../ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java | 5 +++++ info.properties | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 9f8d6c040..94b515156 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -7,6 +7,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -37,6 +38,10 @@ public static void setBackground(Identifier GUI) { public static void setRepeatEvents(boolean isRepeatEvents) { } + // ～1.19.4 + public static void setPassEvents(Screen screen, boolean isPassEvents) { + } + public static ButtonWidget createButtonWidget(int x, int y, int width, int height, Text message, ButtonWidget.PressAction onPress) { return createButtonWidget(x, y, width, height, message, onPress, null); } diff --git a/info.properties b/info.properties index e92ce0f4a..e1ab2e852 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.8 +mod_version=1.6.9 maven_group=ml.pkom \ No newline at end of file From 5fb4733328022be60936e4b14080d782c3406a28 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 23 Jun 2023 21:58:59 +0900 Subject: [PATCH 174/622] add api --- .../ml/pkom/mcpitanlibarch/api/entity/Player.java | 6 ++++++ .../ml/pkom/mcpitanlibarch/api/util/WorldUtil.java | 11 ++++++++++- info.properties | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index 34b4f0f13..8d846d6d5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -14,6 +14,8 @@ import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; import net.minecraft.text.Text; import net.minecraft.util.Hand; import net.minecraft.util.collection.DefaultedList; @@ -240,4 +242,8 @@ public float getYaw() { public float getPitch() { return this.getEntity().getPitch(); } + + public void playSound(SoundEvent event, SoundCategory category, float volume, float pitch) { + getEntity().playSound(event, category, volume, pitch); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index 8eef0faca..6c36db9e7 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -1,15 +1,22 @@ package ml.pkom.mcpitanlibarch.api.util; +import ml.pkom.mcpitanlibarch.api.entity.Player; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.ExperienceOrbEntity; import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +import java.util.Objects; public class WorldUtil { public static boolean hasSkyLight(World world) { @@ -65,9 +72,11 @@ public static void spawnExperienceOrb(World world, BlockPos pos, int amount) { spawnExperienceOrb(world, pos.toCenterPos(), amount); } - public static void spawnEntity(World world, Entity entity) { world.spawnEntity(entity); } + public static void playSound(World world, @Nullable Player player, BlockPos pos, SoundEvent sound, SoundCategory category, float volume, float pitch) { + world.playSound(Objects.requireNonNullElse(player, null).getEntity(), pos, sound, category, volume, pitch); + } } diff --git a/info.properties b/info.properties index e1ab2e852..35e08b3e2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.9 +mod_version=1.6.10 maven_group=ml.pkom \ No newline at end of file From 3785b4fa66199d4f8c0422877a36da9cf3802d37 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 24 Jun 2023 22:48:18 +0900 Subject: [PATCH 175/622] add apis --- .../api/client/SimpleHandledScreen.java | 28 ++++++++++++--- .../render/handledscreen/KeyEventArgs.java | 35 +++++++++++++++++++ info.properties | 2 +- 3 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/KeyEventArgs.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 111be873d..01e6fe806 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -1,10 +1,7 @@ package ml.pkom.mcpitanlibarch.api.client; import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawBackgroundArgs; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawForegroundArgs; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawMouseoverTooltipArgs; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; +import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.*; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; @@ -36,6 +33,7 @@ protected T addDrawableChild_compati // addButton } + @Deprecated @Override protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { DrawObjectDM drawObjectDM = new DrawObjectDM(context); @@ -44,6 +42,7 @@ protected void drawBackground(DrawContext context, float delta, int mouseX, int public abstract void drawBackgroundOverride(DrawBackgroundArgs args); + @Deprecated @Override protected void drawForeground(DrawContext context, int mouseX, int mouseY) { DrawObjectDM drawObjectDM = new DrawObjectDM(context); @@ -78,6 +77,7 @@ public void resizeOverride(MinecraftClient client, int width, int height) { public void initOverride() { } + @Deprecated @Override protected void init() { super.init(); @@ -85,6 +85,7 @@ protected void init() { initOverride(); } + @Deprecated @Override public void resize(MinecraftClient client, int width, int height) { super.resize(client, width, height); @@ -150,11 +151,30 @@ public int getBackgroundHeight() { return super.backgroundHeight; } + @Deprecated @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { DrawObjectDM drawObjectDM = new DrawObjectDM(context); renderOverride(new RenderArgs(drawObjectDM, mouseX, mouseY, delta)); } + public boolean keyReleased(KeyEventArgs args) { + return super.keyReleased(args.keyCode, args.scanCode, args.modifiers); + } + + public boolean keyPressed(KeyEventArgs args) { + return super.keyPressed(args.keyCode, args.scanCode, args.modifiers); + } + + @Deprecated + @Override + public boolean keyReleased(int keyCode, int scanCode, int modifiers) { + return this.keyReleased(new KeyEventArgs(keyCode, scanCode, modifiers)); + } + @Deprecated + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + return this.keyPressed(new KeyEventArgs(keyCode, scanCode, modifiers)); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/KeyEventArgs.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/KeyEventArgs.java new file mode 100644 index 000000000..905a7f1b3 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/KeyEventArgs.java @@ -0,0 +1,35 @@ +package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; + +public class KeyEventArgs { + public int keyCode, scanCode, modifiers; + + public KeyEventArgs(int keyCode, int scanCode, int modifiers) { + setKeyCode(keyCode); + setScanCode(scanCode); + setModifiers(modifiers); + } + + public void setKeyCode(int keyCode) { + this.keyCode = keyCode; + } + + public void setModifiers(int modifiers) { + this.modifiers = modifiers; + } + + public void setScanCode(int scanCode) { + this.scanCode = scanCode; + } + + public int getKeyCode() { + return keyCode; + } + + public int getModifiers() { + return modifiers; + } + + public int getScanCode() { + return scanCode; + } +} diff --git a/info.properties b/info.properties index 35e08b3e2..9f2ca7442 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.6.10 +mod_version=1.7.0 maven_group=ml.pkom \ No newline at end of file From 413aea7504b2fb21c69de969239e718a11281cc1 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:32:18 +0900 Subject: [PATCH 176/622] add apis --- .../mcpitanlibarch/api/entity/Player.java | 27 ++++++++++ .../api/gui/SimpleScreenHandler.java | 34 +++++++++++- .../api/util/DamageSourceUtil.java | 40 ++++++++++++++ .../mcpitanlibarch/api/util/EntityUtil.java | 10 ++++ .../mcpitanlibarch/api/util/PlayerUtil.java | 53 +++++++++++++++++++ .../mcpitanlibarch/api/util/WorldUtil.java | 3 +- .../api/util/client/ScreenUtil.java | 2 - .../core/player/ItemCooldown.java | 20 +++++++ info.properties | 2 +- 9 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/core/player/ItemCooldown.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index 8d846d6d5..8af9ae802 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -3,11 +3,15 @@ import dev.architectury.registry.menu.ExtendedMenuProvider; import ml.pkom.mcpitanlibarch.api.gui.ExtendedNamedScreenHandlerFactory; import ml.pkom.mcpitanlibarch.api.util.ScreenHandlerUtil; +import ml.pkom.mcpitanlibarch.core.player.ItemCooldown; import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.player.ItemCooldownManager; import net.minecraft.entity.player.PlayerAbilities; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; @@ -16,6 +20,8 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; +import net.minecraft.stat.Stat; +import net.minecraft.stat.StatType; import net.minecraft.text.Text; import net.minecraft.util.Hand; import net.minecraft.util.collection.DefaultedList; @@ -186,6 +192,9 @@ public ItemStack getCursorStack() { public boolean isClient() { return getWorld().isClient(); } + public boolean isServer() { + return !isClient(); + } public void readCustomDataFromNbt(NbtCompound nbt) { getEntity().readCustomDataFromNbt(nbt); @@ -246,4 +255,22 @@ public float getPitch() { public void playSound(SoundEvent event, SoundCategory category, float volume, float pitch) { getEntity().playSound(event, category, volume, pitch); } + + public ItemCooldown itemCooldown = new ItemCooldown(this); + + public ItemCooldown getItemCooldown() { + return itemCooldown; + } + + public ItemCooldownManager getItemCooldownManager() { + return getEntity().getItemCooldownManager(); + } + + public void incrementStat(Stat stat) { + getEntity().incrementStat(stat); + } + + public void incrementStat(StatType type, T object) { + getEntity().incrementStat(type.getOrCreateStat(object)); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java index 66674057b..de4227086 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java @@ -202,11 +202,11 @@ public ItemStack quickMove(PlayerEntity player, int slot) { @Deprecated @Override public Slot getSlot(int index) { - return super.getSlot(index); + return callGetSlot(index); } public Slot callGetSlot(int index) { - return getSlot(index); + return super.getSlot(index); } @Deprecated @@ -218,4 +218,34 @@ public void onSlotClick(int slotIndex, int button, SlotActionType actionType, Pl public void overrideOnSlotClick(int slotIndex, int button, SlotActionType actionType, Player player) { super.onSlotClick(slotIndex, button, actionType, player.getPlayerEntity()); } + + @Override + @Deprecated + public void setCursorStack(ItemStack stack) { + callSetCursorStack(stack); + } + + public void callSetCursorStack(ItemStack stack) { + super.setCursorStack(stack); + } + + @Override + @Deprecated + public void setStackInSlot(int slot, int revision, ItemStack stack) { + callSetStackInSlot(slot, revision, stack); + } + + public void callSetStackInSlot(int slot, int revision, ItemStack stack) { + super.setStackInSlot(slot, revision, stack); + } + + @Override + @Deprecated + public int getRevision() { + return callGetRevision(); + } + + public int callGetRevision() { + return super.getRevision(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java new file mode 100644 index 000000000..e4d6e13a9 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java @@ -0,0 +1,40 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; + +public class DamageSourceUtil { + public DamageSource thrownProjectile(Entity projectile, Entity attacker, Entity source) { + return thrownProjectile(projectile, attacker); + } + + public DamageSource thrownProjectile(Entity projectile, Entity attacker) { + return DamageSource.thrownProjectile(projectile, attacker); + } + + public DamageSource playerAttack(Player attacker, Entity source) { + return playerAttack(attacker); + } + + public DamageSource playerAttack(Player attacker) { + return DamageSource.player(attacker.getPlayerEntity()); + } + + public DamageSource mobAttack(LivingEntity attacker, Entity source) { + return mobAttack(attacker); + } + + public DamageSource mobAttack(LivingEntity attacker) { + return DamageSource.mob(attacker); + } + + public DamageSource mobProjectile(Entity projectile, LivingEntity attacker, Entity source) { + return mobProjectile(projectile, attacker); + } + + public DamageSource mobProjectile(Entity projectile, LivingEntity attacker) { + return DamageSource.mobProjectile(projectile, attacker); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java new file mode 100644 index 000000000..ef0f072a8 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java @@ -0,0 +1,10 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.entity.Entity; +import net.minecraft.world.World; + +public class EntityUtil { + public static World getWorld(Entity entity) { + return entity.getWorld(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java new file mode 100644 index 000000000..af4905dc9 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java @@ -0,0 +1,53 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +public class PlayerUtil { + + public static Player getPlayerByUUID(MinecraftServer server, UUID uuid) { + return new Player(server.getPlayerManager().getPlayer(uuid)); + } + + public static Player getPlayerByName(MinecraftServer server, String name) { + return new Player(server.getPlayerManager().getPlayer(name)); + } + + public static List getPlayersByIP(MinecraftServer server, String ip) { + List players = new ArrayList<>(); + for (PlayerEntity p: server.getPlayerManager().getPlayersByIp(ip)) { + players.add(new Player(p)); + } + return players; + } + + public static List getPlayers(MinecraftServer server) { + List players = new ArrayList<>(); + for (PlayerEntity p : server.getPlayerManager().getPlayerList()) { + players.add(new Player(p)); + } + return players; + } + + public static Player getPlayerByUUID(World world, UUID uuid) { + return getPlayerByUUID(world.getServer(), uuid); + } + + public static Player getPlayerByName(World world, String name) { + return getPlayerByName(world.getServer(), name); + } + + public static boolean isExistByUUID(MinecraftServer server, UUID uuid) { + return server.getPlayerManager().getPlayer(uuid) != null; + } + + public static boolean isExistByUUID(World world, UUID uuid) { + return isExistByUUID(world.getServer(), uuid); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index 6c36db9e7..97facf525 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -77,6 +77,7 @@ public static void spawnEntity(World world, Entity entity) { } public static void playSound(World world, @Nullable Player player, BlockPos pos, SoundEvent sound, SoundCategory category, float volume, float pitch) { - world.playSound(Objects.requireNonNullElse(player, null).getEntity(), pos, sound, category, volume, pitch); + PlayerEntity entity = player == null ? null : player.getEntity(); + world.playSound(entity, pos, sound, category, volume, pitch); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 94b515156..0eb1678e2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -17,8 +17,6 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import org.jetbrains.annotations.Nullable; - @Environment(EnvType.CLIENT) public class ScreenUtil { public static void setBackground(Identifier GUI, float f, float g, float h, float i) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/player/ItemCooldown.java b/common/src/main/java/ml/pkom/mcpitanlibarch/core/player/ItemCooldown.java new file mode 100644 index 000000000..fcdb43b9d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/core/player/ItemCooldown.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.core.player; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.minecraft.item.Item; + +public class ItemCooldown { + public final Player player; + + public ItemCooldown(Player player) { + this.player = player; + } + + public boolean isCoolingDown(Item item) { + return player.getItemCooldownManager().isCoolingDown(item); + } + + public void set(Item item, int duration) { + player.getItemCooldownManager().set(item, duration); + } +} diff --git a/info.properties b/info.properties index 9f2ca7442..c0f166d92 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.0 +mod_version=1.7.1 maven_group=ml.pkom \ No newline at end of file From 9cb6a6ca66c4bea492b8efedae6213791e90e836 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:35:52 +0900 Subject: [PATCH 177/622] nullable --- .../java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 0eb1678e2..ba3e2b814 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -3,7 +3,6 @@ import ml.pkom.mcpitanlibarch.api.client.gui.widget.RedrawableTexturedButtonWidget; import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.font.TextRenderer; @@ -16,6 +15,7 @@ import net.minecraft.text.OrderedText; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) public class ScreenUtil { From b5179e88f92f995983c520656e80970fdbf09b4e Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sun, 16 Jul 2023 23:40:40 +0900 Subject: [PATCH 178/622] DamageSourceUtil latest --- .../api/util/DamageSourceUtil.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java index e4d6e13a9..e9ebd2fbf 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java @@ -7,34 +7,34 @@ public class DamageSourceUtil { public DamageSource thrownProjectile(Entity projectile, Entity attacker, Entity source) { - return thrownProjectile(projectile, attacker); + return source.getDamageSources().thrown(projectile, attacker); } public DamageSource thrownProjectile(Entity projectile, Entity attacker) { - return DamageSource.thrownProjectile(projectile, attacker); + return thrownProjectile(projectile, attacker, projectile); } public DamageSource playerAttack(Player attacker, Entity source) { - return playerAttack(attacker); + return source.getDamageSources().playerAttack(attacker.getPlayerEntity()); } public DamageSource playerAttack(Player attacker) { - return DamageSource.player(attacker.getPlayerEntity()); + return playerAttack(attacker, attacker.getPlayerEntity()); } public DamageSource mobAttack(LivingEntity attacker, Entity source) { - return mobAttack(attacker); + return source.getDamageSources().mobAttack(attacker); } public DamageSource mobAttack(LivingEntity attacker) { - return DamageSource.mob(attacker); + return mobAttack(attacker, attacker); } public DamageSource mobProjectile(Entity projectile, LivingEntity attacker, Entity source) { - return mobProjectile(projectile, attacker); + return source.getDamageSources().mobProjectile(projectile, attacker); } public DamageSource mobProjectile(Entity projectile, LivingEntity attacker) { - return DamageSource.mobProjectile(projectile, attacker); + return mobProjectile(projectile, attacker, projectile); } } From d6d8d2b2056cc8f946ea3e6faec943a911fbf9ad Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Mon, 17 Jul 2023 17:22:10 +0900 Subject: [PATCH 179/622] Add APIs Fix APIs --- .../api/item/CreativeTabManager.java | 8 ++-- .../api/timer/MinecraftServerTimerAccess.java | 7 ++++ .../api/timer/ServerWorldTimerAccess.java | 7 ++++ .../mcpitanlibarch/api/timer/TimerItem.java | 14 +++++++ .../api/util/DamageSourceUtil.java | 16 ++++---- .../mcpitanlibarch/api/util/TimerUtil.java | 18 +++++++++ .../mixin/MinecraftServerTimer.java | 38 +++++++++++++++++++ .../mixin/ServerWorldTimer.java | 38 +++++++++++++++++++ .../mcpitanlibarch-common.mixins.json | 4 +- info.properties | 2 +- 10 files changed, 138 insertions(+), 14 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/MinecraftServerTimerAccess.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/ServerWorldTimerAccess.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/TimerItem.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TimerUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/mixin/MinecraftServerTimer.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ServerWorldTimer.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java index 61cafd443..9ab27b388 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -10,8 +10,8 @@ import java.util.List; public class CreativeTabManager { - private static final List bookingItems = new ArrayList<>(); - private static final List bookingStacks = new ArrayList<>(); + private static List bookingItems = new ArrayList<>(); + private static List bookingStacks = new ArrayList<>(); // グループ予約済みアイテム public static class BookingItem { @@ -37,15 +37,15 @@ public static void allRegister() { if (!bookingItems.isEmpty()) { for (BookingItem bookingItem : bookingItems) { CreativeTabRegistry.appendBuiltin(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); - bookingItems.remove(bookingItem); } + bookingItems = new ArrayList<>(); } if (!bookingStacks.isEmpty()) { for (BookingStack bookingStack : bookingStacks) { CreativeTabRegistry.appendBuiltinStack(bookingStack.itemGroup, bookingStack.stack); - bookingStacks.remove(bookingStack); } + bookingStacks = new ArrayList<>(); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/MinecraftServerTimerAccess.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/MinecraftServerTimerAccess.java new file mode 100644 index 000000000..f7e41c65f --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/MinecraftServerTimerAccess.java @@ -0,0 +1,7 @@ +package ml.pkom.mcpitanlibarch.api.timer; + +import java.util.function.Supplier; + +public interface MinecraftServerTimerAccess { + void addTimer(long ticksUntilSomething, Supplier supplier); +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/ServerWorldTimerAccess.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/ServerWorldTimerAccess.java new file mode 100644 index 000000000..a26c7e689 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/ServerWorldTimerAccess.java @@ -0,0 +1,7 @@ +package ml.pkom.mcpitanlibarch.api.timer; + +import java.util.function.Supplier; + +public interface ServerWorldTimerAccess { + void addTimer(long ticksUntilSomething, Supplier supplier); +} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/TimerItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/TimerItem.java new file mode 100644 index 000000000..25311a365 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/TimerItem.java @@ -0,0 +1,14 @@ +package ml.pkom.mcpitanlibarch.api.timer; + +import java.util.function.Supplier; + +public class TimerItem { + public long ticksUntilSomething; + + public Supplier executeSupplier; + + public TimerItem(long ticksUntilSomething, Supplier executeSupplier) { + this.ticksUntilSomething = ticksUntilSomething; + this.executeSupplier = executeSupplier; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java index e9ebd2fbf..f756463db 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java @@ -6,35 +6,35 @@ import net.minecraft.entity.damage.DamageSource; public class DamageSourceUtil { - public DamageSource thrownProjectile(Entity projectile, Entity attacker, Entity source) { + public static DamageSource thrownProjectile(Entity projectile, Entity attacker, Entity source) { return source.getDamageSources().thrown(projectile, attacker); } - public DamageSource thrownProjectile(Entity projectile, Entity attacker) { + public static DamageSource thrownProjectile(Entity projectile, Entity attacker) { return thrownProjectile(projectile, attacker, projectile); } - public DamageSource playerAttack(Player attacker, Entity source) { + public static DamageSource playerAttack(Player attacker, Entity source) { return source.getDamageSources().playerAttack(attacker.getPlayerEntity()); } - public DamageSource playerAttack(Player attacker) { + public static DamageSource playerAttack(Player attacker) { return playerAttack(attacker, attacker.getPlayerEntity()); } - public DamageSource mobAttack(LivingEntity attacker, Entity source) { + public static DamageSource mobAttack(LivingEntity attacker, Entity source) { return source.getDamageSources().mobAttack(attacker); } - public DamageSource mobAttack(LivingEntity attacker) { + public static DamageSource mobAttack(LivingEntity attacker) { return mobAttack(attacker, attacker); } - public DamageSource mobProjectile(Entity projectile, LivingEntity attacker, Entity source) { + public static DamageSource mobProjectile(Entity projectile, LivingEntity attacker, Entity source) { return source.getDamageSources().mobProjectile(projectile, attacker); } - public DamageSource mobProjectile(Entity projectile, LivingEntity attacker) { + public static DamageSource mobProjectile(Entity projectile, LivingEntity attacker) { return mobProjectile(projectile, attacker, projectile); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TimerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TimerUtil.java new file mode 100644 index 000000000..2db5369a1 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TimerUtil.java @@ -0,0 +1,18 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import ml.pkom.mcpitanlibarch.api.timer.MinecraftServerTimerAccess; +import ml.pkom.mcpitanlibarch.api.timer.ServerWorldTimerAccess; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; + +import java.util.function.Supplier; + +public class TimerUtil { + public static void addTimer(ServerWorld world, long ticksUntilSomething, Supplier supplier) { + ((ServerWorldTimerAccess) world).addTimer(ticksUntilSomething, supplier); + } + + public static void addTimer(MinecraftServer server, long ticksUntilSomething, Supplier supplier) { + ((MinecraftServerTimerAccess) server).addTimer(ticksUntilSomething, supplier); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/MinecraftServerTimer.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/MinecraftServerTimer.java new file mode 100644 index 000000000..56add9d0d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/MinecraftServerTimer.java @@ -0,0 +1,38 @@ +package ml.pkom.mcpitanlibarch.mixin; + +import ml.pkom.mcpitanlibarch.api.timer.MinecraftServerTimerAccess; +import ml.pkom.mcpitanlibarch.api.timer.TimerItem; +import net.minecraft.server.MinecraftServer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +@Mixin(MinecraftServer.class) +public class MinecraftServerTimer implements MinecraftServerTimerAccess { + @Unique + private final List timerItems = new ArrayList<>(); + + @Inject(method = "tick", at = @At("TAIL")) + private void onTick(CallbackInfo ci) { + if (timerItems.isEmpty()) return; + List items = new ArrayList<>(timerItems); + + for (TimerItem item : items) { + if (--item.ticksUntilSomething == 0L) { + if (item.executeSupplier.get()) + timerItems.remove(item); + } + } + } + + @Override + public void addTimer(long ticksUntilSomething, Supplier executeSupplier) { + timerItems.add(new TimerItem(ticksUntilSomething, executeSupplier)); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ServerWorldTimer.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ServerWorldTimer.java new file mode 100644 index 000000000..283a28321 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ServerWorldTimer.java @@ -0,0 +1,38 @@ +package ml.pkom.mcpitanlibarch.mixin; + +import ml.pkom.mcpitanlibarch.api.timer.ServerWorldTimerAccess; +import ml.pkom.mcpitanlibarch.api.timer.TimerItem; +import net.minecraft.server.world.ServerWorld; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Supplier; + +@Mixin(ServerWorld.class) +public class ServerWorldTimer implements ServerWorldTimerAccess { + @Unique + private final List timerItems = new ArrayList<>(); + + @Inject(method = "tick", at = @At("TAIL")) + private void onTick(CallbackInfo ci) { + if (timerItems.isEmpty()) return; + List items = new ArrayList<>(timerItems); + + for (TimerItem item : items) { + if (--item.ticksUntilSomething == 0L) { + if (item.executeSupplier.get()) + timerItems.remove(item); + } + } + } + + @Override + public void addTimer(long ticksUntilSomething, Supplier executeSupplier) { + timerItems.add(new TimerItem(ticksUntilSomething, executeSupplier)); + } +} diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlibarch-common.mixins.json index 0aaea7d9c..c3b102ae3 100644 --- a/common/src/main/resources/mcpitanlibarch-common.mixins.json +++ b/common/src/main/resources/mcpitanlibarch-common.mixins.json @@ -5,7 +5,9 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "ItemMixin", - "ItemUsageContextMixin" + "ItemUsageContextMixin", + "MinecraftServerTimer", + "ServerWorldTimer" ], "client": [ ], diff --git a/info.properties b/info.properties index c0f166d92..2c10fc370 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.1 +mod_version=1.7.2 maven_group=ml.pkom \ No newline at end of file From 2c2409314715065c50067eab6fb8281f08066369 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Tue, 18 Jul 2023 16:18:09 +0900 Subject: [PATCH 180/622] Add APIs --- .../api/util/WorldRandomUtil.java | 37 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldRandomUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldRandomUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldRandomUtil.java new file mode 100644 index 000000000..4fd31349c --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldRandomUtil.java @@ -0,0 +1,37 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.world.World; + +public class WorldRandomUtil { + public static int nextInt(World world) { + return world.getRandom().nextInt(); + } + + public static int nextInt(World world, int bound) { + return world.getRandom().nextInt(bound); + } + + public static long nextLong(World world) { + return world.getRandom().nextLong(); + } + + public static double nextDouble(World world) { + return world.getRandom().nextDouble(); + } + + public static double nextGaussian(World world) { + return world.getRandom().nextGaussian(); + } + + public static float nextFloat(World world) { + return world.getRandom().nextFloat(); + } + + public static int nextBetween(World world, int min, int max) { + return world.getRandom().nextBetween(min, max); + } + + public static int nextBetweenExclusive(World world, int min, int max) { + return world.getRandom().nextBetweenExclusive(min, max); + } +} diff --git a/info.properties b/info.properties index 2c10fc370..53bf047af 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.2 +mod_version=1.7.3 maven_group=ml.pkom \ No newline at end of file From dc8049f251565e8c62fb6c4b505b3f4d7117fbf2 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Tue, 18 Jul 2023 22:50:00 +0900 Subject: [PATCH 181/622] Add APIs --- .../mcpitanlibarch/api/util/EntityUtil.java | 23 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java index ef0f072a8..d9fd03a75 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java @@ -1,10 +1,33 @@ package ml.pkom.mcpitanlibarch.api.util; +import ml.pkom.mcpitanlibarch.api.entity.Player; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.world.World; public class EntityUtil { public static World getWorld(Entity entity) { return entity.getWorld(); } + + public static boolean damage(Entity entity, DamageSource damageSource, float amount) { + return entity.damage(damageSource, amount); + } + + public static boolean damageWithThrownProjectile(float damageAmount, Entity projectile, Entity attacker) { + return projectile.damage(DamageSourceUtil.thrownProjectile(projectile, attacker), damageAmount); + } + + public static boolean damageWithMobProjectile(float damageAmount, Entity projectile, LivingEntity attacker) { + return projectile.damage(DamageSourceUtil.mobProjectile(projectile, attacker), damageAmount); + } + + public static boolean damageWithMobAttack(float damageAmount, Entity source, LivingEntity attacker) { + return source.damage(DamageSourceUtil.mobAttack(attacker, source), damageAmount); + } + + public static boolean damageWithPlayerAttack(float damageAmount, Entity source, Player attacker) { + return source.damage(DamageSourceUtil.playerAttack(attacker, source), damageAmount); + } } diff --git a/info.properties b/info.properties index 53bf047af..4ac0871a7 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.3 +mod_version=1.7.4 maven_group=ml.pkom \ No newline at end of file From 9972a4f498a6246fed2a7882c4c3a42d40598e06 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Tue, 18 Jul 2023 23:24:53 +0900 Subject: [PATCH 182/622] Add APIs --- .../mcpitanlibarch/api/util/EntityUtil.java | 20 +++++++++---------- .../mcpitanlibarch/api/util/WorldUtil.java | 4 ++++ info.properties | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java index d9fd03a75..32fbee46f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java @@ -11,23 +11,23 @@ public static World getWorld(Entity entity) { return entity.getWorld(); } - public static boolean damage(Entity entity, DamageSource damageSource, float amount) { - return entity.damage(damageSource, amount); + public static boolean damage(Entity target, DamageSource damageSource, float amount) { + return target.damage(damageSource, amount); } - public static boolean damageWithThrownProjectile(float damageAmount, Entity projectile, Entity attacker) { - return projectile.damage(DamageSourceUtil.thrownProjectile(projectile, attacker), damageAmount); + public static boolean damageWithThrownProjectile(Entity target, float damageAmount, Entity projectile, Entity attacker) { + return target.damage(DamageSourceUtil.thrownProjectile(projectile, attacker), damageAmount); } - public static boolean damageWithMobProjectile(float damageAmount, Entity projectile, LivingEntity attacker) { - return projectile.damage(DamageSourceUtil.mobProjectile(projectile, attacker), damageAmount); + public static boolean damageWithMobProjectile(Entity target, float damageAmount, Entity projectile, LivingEntity attacker) { + return target.damage(DamageSourceUtil.mobProjectile(projectile, attacker), damageAmount); } - public static boolean damageWithMobAttack(float damageAmount, Entity source, LivingEntity attacker) { - return source.damage(DamageSourceUtil.mobAttack(attacker, source), damageAmount); + public static boolean damageWithMobAttack(Entity target, float damageAmount, Entity source, LivingEntity attacker) { + return target.damage(DamageSourceUtil.mobAttack(attacker, source), damageAmount); } - public static boolean damageWithPlayerAttack(float damageAmount, Entity source, Player attacker) { - return source.damage(DamageSourceUtil.playerAttack(attacker, source), damageAmount); + public static boolean damageWithPlayerAttack(Entity target, float damageAmount, Entity source, Player attacker) { + return target.damage(DamageSourceUtil.playerAttack(attacker, source), damageAmount); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index 97facf525..1aa6794a7 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -80,4 +80,8 @@ public static void playSound(World world, @Nullable Player player, BlockPos pos, PlayerEntity entity = player == null ? null : player.getEntity(); world.playSound(entity, pos, sound, category, volume, pitch); } + + public static void sendEntityStatus(World world, Entity entity, byte status) { + world.sendEntityStatus(entity, status); + } } diff --git a/info.properties b/info.properties index 4ac0871a7..f44f98037 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.4 +mod_version=1.7.5 maven_group=ml.pkom \ No newline at end of file From 25dd34450b393bf1137d74390d3adc0a2a25f2aa Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sun, 13 Aug 2023 22:42:05 +0900 Subject: [PATCH 183/622] Add API --- .../api/network/PacketByteUtil.java | 67 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java index 963404a2e..86d0c2841 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java @@ -1,7 +1,17 @@ package ml.pkom.mcpitanlibarch.api.network; +import com.google.common.collect.Maps; import io.netty.buffer.Unpooled; +import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import java.util.function.BiConsumer; +import java.util.function.Function; public class PacketByteUtil { public static PacketByteBuf create() { @@ -12,4 +22,61 @@ public static PacketByteBuf create() { public static PacketByteBuf empty() { return new PacketByteBuf(Unpooled.EMPTY_BUFFER); } + + public static Map readMap(PacketByteBuf buf, Function keyParser, Function valueParser) { + return buf.readMap(keyParser::apply, valueParser::apply); + } + + public static void writeMap(PacketByteBuf buf, Map map) { + writeMap(buf, map, PacketByteUtil::writeVar, PacketByteUtil::writeVar); + } + + public static void writeMap(PacketByteBuf buf, Map map, BiConsumer keySerializer, BiConsumer valueSerializer) { + buf.writeMap(map, keySerializer::accept, valueSerializer::accept); + } + + public static void writeVar(PacketByteBuf buf, Object obj) { + if (obj instanceof String) { + String s = (String) obj; + buf.writeString(s); + } + if (obj instanceof Integer) { + int i = (int) obj; + buf.writeInt(i); + } + if (obj instanceof Long) { + long l = (long) obj; + buf.writeLong(l); + } + if (obj instanceof Short) { + short s = (short) obj; + buf.writeShort(s); + } + if (obj instanceof Boolean) { + boolean b = (boolean) obj; + buf.writeBoolean(b); + } + if (obj instanceof Byte) { + byte b = (byte) obj; + buf.writeByte(b); + } + if (obj instanceof NbtCompound) { + NbtCompound nbt = (NbtCompound) obj; + buf.writeNbt(nbt); + } + if (obj instanceof UUID) { + UUID uuid = (UUID) obj; + buf.writeUuid(uuid); + } + if (obj instanceof Text) { + Text text = (Text) obj; + buf.writeText(text); + } + if (obj instanceof BlockPos) { + BlockPos pos = (BlockPos) obj; + buf.writeBlockPos(pos); + } + } } + + diff --git a/info.properties b/info.properties index f44f98037..a96b3d873 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.5 +mod_version=1.7.6 maven_group=ml.pkom \ No newline at end of file From 06647d9a0e36c09451b3fee3c5487503f0c21b99 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 19 Aug 2023 12:23:28 +0900 Subject: [PATCH 184/622] writeVar (Identifier, ItemStack, Float) --- .../api/network/PacketByteUtil.java | 16 ++++++++++++++-- info.properties | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java index 86d0c2841..88ee8f1f0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java @@ -1,13 +1,13 @@ package ml.pkom.mcpitanlibarch.api.network; -import com.google.common.collect.Maps; import io.netty.buffer.Unpooled; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.function.BiConsumer; @@ -64,6 +64,18 @@ public static void writeVar(PacketByteBuf buf, Object obj) { NbtCompound nbt = (NbtCompound) obj; buf.writeNbt(nbt); } + if (obj instanceof ItemStack) { + ItemStack stack = (ItemStack) obj; + buf.writeItemStack(stack); + } + if (obj instanceof Identifier) { + Identifier identifier = (Identifier) obj; + buf.writeIdentifier(identifier); + } + if (obj instanceof Float) { + Float f = (Float) obj; + buf.writeFloat(f); + } if (obj instanceof UUID) { UUID uuid = (UUID) obj; buf.writeUuid(uuid); diff --git a/info.properties b/info.properties index a96b3d873..e2d82e6e4 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.6 +mod_version=1.7.7 maven_group=ml.pkom \ No newline at end of file From 329c700e8b1828aa16c96bcc53a6a178ec172707 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 26 Aug 2023 23:55:20 +0900 Subject: [PATCH 185/622] support Map in writeVar --- .../ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java | 4 ++++ info.properties | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java index 88ee8f1f0..3994a8b7f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java @@ -88,6 +88,10 @@ public static void writeVar(PacketByteBuf buf, Object obj) { BlockPos pos = (BlockPos) obj; buf.writeBlockPos(pos); } + if (obj instanceof Map) { + Map map = (Map) obj; + writeMap(buf, map); + } } } diff --git a/info.properties b/info.properties index e2d82e6e4..76ae2e708 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.7 +mod_version=1.7.8 maven_group=ml.pkom \ No newline at end of file From 6285804c01769a772e6244f2610c53294f1728c1 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Mon, 9 Oct 2023 18:41:26 +0900 Subject: [PATCH 186/622] 1.20.2 --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index e44ae431e..3eb089a14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,20 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.20.1 +minecraft_version=1.20.2 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=9.0.7 +architectury_version=10.0.8 # https://fabricmc.net/develop/ -fabric_loader_version=0.14.21 -yarn_mappings=1.20.1+build.1 -fabric_api_version=0.83.1+1.20.1 +fabric_loader_version=0.14.22 +yarn_mappings=1.20.2+build.4 +fabric_api_version=0.90.0+1.20.2 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.20.1-47.0.1 +forge_version=1.20.2-48.0.20 # https://lambdaurora.dev/tools/import_quilt.html -quilt_loader_version=0.19.0-beta.18 +quilt_loader_version=0.21.0 quilt_fabric_api_version=6.0.2 fabricEnabled=true From 8ac22fa1db70293de8f24eb67dbd58ed08b96292 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Oct 2023 13:21:21 +0900 Subject: [PATCH 187/622] fix 1.20.2 --- .../main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java | 4 ++-- .../main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java index 01e19d5fc..1134eac57 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -12,7 +12,7 @@ public class RecipeUtil { public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { - return new ShapelessRecipe(id, group, CraftingRecipeCategory.valueOf(category.name()), output, input); + return new ShapelessRecipe(group, CraftingRecipeCategory.valueOf(category.name()), output, input); } public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, ItemStack output, DefaultedList input) { @@ -25,7 +25,7 @@ public static ItemStack craft(Recipe recipe, C inventor public static ItemStack getOutput(Recipe recipe, World world) { - return recipe.getOutput(world.getRegistryManager()); + return recipe.getResult(world.getRegistryManager()); } public enum CompatibilityCraftingRecipeCategory { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java index 1dd4fab98..00ebf48ac 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java @@ -5,6 +5,7 @@ import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawMouseoverTooltipArgs; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; import ml.pkom.mcpitanlibarch.api.util.client.ScreenUtil; +import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; @@ -24,7 +25,7 @@ public ExampleScreen(ScreenHandler handler, PlayerInventory inventory, Text titl public void initOverride() { super.initOverride(); System.out.println("hogehogehoge1111"); - this.addDrawableChild_compatibility(new TexturedButtonWidget(0, 0, 30, 30, 0, 0, 16, GUI, (buttonWidget) -> { + this.addDrawableChild_compatibility(new TexturedButtonWidget(0, 0, 30, 30, new ButtonTextures(GUI, GUI), (buttonWidget) -> { System.out.println("hogehoge"); })); } From 522891e32e781455366a664b3f4cb699ae0baa17 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Oct 2023 14:12:59 +0900 Subject: [PATCH 188/622] CompatibleTexturedButtonWidget, Screen --- .../api/client/SimpleHandledScreen.java | 8 ++- .../CompatibleTexturedButtonWidget.java | 50 +++++++++++++++++++ .../RedrawableTexturedButtonWidget.java | 7 +-- .../api/util/client/ScreenUtil.java | 11 ++-- 4 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index 01e6fe806..a1fdbd720 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -59,8 +59,14 @@ public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); } + @Deprecated public void callRenderBackground(DrawObjectDM drawObjectDM) { - super.renderBackground(drawObjectDM.getContext()); + callRenderBackground(new RenderArgs(drawObjectDM, 0, 0, 0)); + } + + + public void callRenderBackground(RenderArgs args) { + super.renderBackground(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); } public void callDrawMouseoverTooltip(DrawMouseoverTooltipArgs args) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java new file mode 100644 index 000000000..639556672 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -0,0 +1,50 @@ +package ml.pkom.mcpitanlibarch.api.client.gui.widget; + +import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ButtonTextures; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.TexturedButtonWidget; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class CompatibleTexturedButtonWidget extends TexturedButtonWidget { + private final Identifier texture; + private final int u; + private final int v; + private final int hoveredVOffset; + private final int textureWidth; + private final int textureHeight; + + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, ButtonWidget.PressAction pressAction) { + this(x, y, width, height, u, v, height, texture, 256, 256, pressAction); + } + + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, ButtonWidget.PressAction pressAction) { + this(x, y, width, height, u, v, hoveredVOffset, texture, 256, 256, pressAction); + } + + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { + this(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, TextUtil.empty()); + } + + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text text) { + super(x, y, width, height, new ButtonTextures(texture, texture), pressAction, text); + this.textureWidth = textureWidth; + this.textureHeight = textureHeight; + this.u = u; + this.v = v; + this.hoveredVOffset = hoveredVOffset; + this.texture = texture; + } + + public void setPos(int x, int y) { + setX(x); + setY(y); + } + + @Override + public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + context.drawTexture(texture, this.getX(), this.getY(), u, v + (isSelected() ? hoveredVOffset : 0), this.width, this.height, textureWidth, textureHeight); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java index 706a57544..13b39729a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java @@ -1,13 +1,10 @@ package ml.pkom.mcpitanlibarch.api.client.gui.widget; -import ml.pkom.mcpitanlibarch.api.util.client.RenderUtil; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.widget.TexturedButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -public class RedrawableTexturedButtonWidget extends TexturedButtonWidget { +public class RedrawableTexturedButtonWidget extends CompatibleTexturedButtonWidget { public Identifier texture; public int u; public int v; @@ -26,7 +23,7 @@ public RedrawableTexturedButtonWidget(int x, int y, int width, int height, int u } public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { - this.drawTexture(context, texture, this.getX(), this.getY(), this.u, this.v, this.hoveredVOffset, this.width, this.height, this.textureWidth, this.textureHeight); + context.drawTexture(texture, this.getX(), this.getY(), u, v + (isSelected() ? hoveredVOffset : 0), this.width, this.height, textureWidth, textureHeight); } public void setTexture(Identifier texture) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index ba3e2b814..735023e3f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -1,5 +1,6 @@ package ml.pkom.mcpitanlibarch.api.util.client; +import ml.pkom.mcpitanlibarch.api.client.gui.widget.CompatibleTexturedButtonWidget; import ml.pkom.mcpitanlibarch.api.client.gui.widget.RedrawableTexturedButtonWidget; import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; @@ -52,20 +53,20 @@ public static ButtonWidget createButtonWidget(int x, int y, int width, int heigh return builder.build(); } - public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, ButtonWidget.PressAction pressAction) { + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, ButtonWidget.PressAction pressAction) { return createTexturedButtonWidget(x, y, width, height, u, v, height, texture, pressAction); } - public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, ButtonWidget.PressAction pressAction) { + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, ButtonWidget.PressAction pressAction) { return createTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, 256, 256, pressAction); } - public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { return createTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, Texts.empty()); } - public static TexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text message) { - return new TexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message); + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text message) { + return new CompatibleTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message); } public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, ButtonWidget.PressAction pressAction) { From f57872250c722e2b35321426a5cc4b1f6d01cc93 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Oct 2023 14:13:47 +0900 Subject: [PATCH 189/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 76ae2e708..7be188f2f 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.8 +mod_version=1.7.9 maven_group=ml.pkom \ No newline at end of file From a409cf425c0811de06e6fc7e4d9475c442d6f8c7 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Oct 2023 14:50:58 +0900 Subject: [PATCH 190/622] fix 1202 --- .../client/gui/widget/CompatibleTexturedButtonWidget.java | 8 +++++++- .../client/gui/widget/RedrawableTexturedButtonWidget.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java index 639556672..38e49e360 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -45,6 +45,12 @@ public void setPos(int x, int y) { @Override public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { - context.drawTexture(texture, this.getX(), this.getY(), u, v + (isSelected() ? hoveredVOffset : 0), this.width, this.height, textureWidth, textureHeight); + int i = v; + if (!this.isNarratable()) { + i = v + hoveredVOffset * 2; + } else if (this.isSelected()) { + i = v + hoveredVOffset; + } + context.drawTexture(texture, this.getX(), this.getY(), u, i, this.width, this.height, textureWidth, textureHeight); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java index 13b39729a..2cc49a0d4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java @@ -23,7 +23,7 @@ public RedrawableTexturedButtonWidget(int x, int y, int width, int height, int u } public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { - context.drawTexture(texture, this.getX(), this.getY(), u, v + (isSelected() ? hoveredVOffset : 0), this.width, this.height, textureWidth, textureHeight); + super.renderButton(context, mouseX, mouseY, delta); } public void setTexture(Identifier texture) { From 0b7efcd0480dff25f4f2af7cee3f6927294da2a0 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:03:57 +0900 Subject: [PATCH 191/622] version & addDrawableCTBW --- .../mcpitanlibarch/api/client/SimpleHandledScreen.java | 7 ++++++- info.properties | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java index a1fdbd720..63403c3d2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java @@ -1,5 +1,6 @@ package ml.pkom.mcpitanlibarch.api.client; +import ml.pkom.mcpitanlibarch.api.client.gui.widget.CompatibleTexturedButtonWidget; import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.*; import net.minecraft.client.MinecraftClient; @@ -28,11 +29,15 @@ public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Tex this.handler = handler; } - protected T addDrawableChild_compatibility(T drawableElement) { + public T addDrawableChild_compatibility(T drawableElement) { return super.addDrawableChild(drawableElement); // addButton } + public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWidget widget) { + return addDrawableChild_compatibility(widget); + } + @Deprecated @Override protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { diff --git a/info.properties b/info.properties index 7be188f2f..b19cb8d00 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.7.9 +mod_version=1.8.0 maven_group=ml.pkom \ No newline at end of file From 6d3b8d3cafeb3685ce03d7a9b1243046d7ea72d1 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Tue, 7 Nov 2023 22:18:34 +0900 Subject: [PATCH 192/622] add APIs --- .../api/event/v0/EventRegistry.java | 17 ++++++++++-- .../event/v0/event/ItemStackActionEvent.java | 27 +++++++++++++++++++ .../event/v0/event/ServerConnectionEvent.java | 15 +++++++++++ .../mcpitanlibarch/api/util/PlayerUtil.java | 21 +++++++++++++++ .../mcpitanlibarch/api/util/RecipeUtil.java | 16 ++++++++++- .../mcpitanlibarch/mixin/ItemStackMixin.java | 18 +++++++++++++ .../mcpitanlibarch-common.mixins.json | 1 + info.properties | 2 +- 8 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ServerConnectionEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java index 704ac494f..7112e8336 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java @@ -2,6 +2,9 @@ import dev.architectury.event.events.common.LifecycleEvent; import dev.architectury.event.events.common.PlayerEvent; +import ml.pkom.mcpitanlibarch.api.event.v0.event.ItemStackActionEvent; +import ml.pkom.mcpitanlibarch.api.event.v0.event.ServerConnectionEvent; +import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; @@ -12,11 +15,11 @@ public class EventRegistry { public static class ServerConnection { // Architectury: PlayerEvent public static void join(PlayerJoin state) { - PlayerEvent.PLAYER_JOIN.register(state::join); + ServerConnectionEvent.join(state); } public static void quit(PlayerQuit state) { - PlayerEvent.PLAYER_QUIT.register(state::quit); + ServerConnectionEvent.quit(state); } public interface PlayerJoin { @@ -28,6 +31,16 @@ public interface PlayerQuit { } } + public static class ItemStackAction { + public static void damage(ItemStackDamageState state) { + ItemStackActionEvent.register(state); + } + + public interface ItemStackDamageState { + void onDamage(ItemStack stack); + } + } + public static class ServerLifecycle { // Architectury: LifecycleEvent public static void serverStarted(ServerState state) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java new file mode 100644 index 000000000..890d3aa43 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java @@ -0,0 +1,27 @@ +package ml.pkom.mcpitanlibarch.api.event.v0.event; + +import ml.pkom.mcpitanlibarch.api.event.v0.EventRegistry; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; +import java.util.List; + +public class ItemStackActionEvent { + private static final List states = new ArrayList<>(); + + public static void register(EventRegistry.ItemStackAction.ItemStackDamageState state) { + states.add(state); + } + + public static void call(ItemStack stack) { + if (states.isEmpty()) return; + for (EventRegistry.ItemStackAction.ItemStackDamageState state : states) { + state.onDamage(stack); + } + } + + public static void unregister(EventRegistry.ItemStackAction.ItemStackDamageState state) { + states.remove(state); + } + +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ServerConnectionEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ServerConnectionEvent.java new file mode 100644 index 000000000..2c13972bf --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ServerConnectionEvent.java @@ -0,0 +1,15 @@ +package ml.pkom.mcpitanlibarch.api.event.v0.event; + +import dev.architectury.event.events.common.PlayerEvent; +import ml.pkom.mcpitanlibarch.api.event.v0.EventRegistry; + +public class ServerConnectionEvent { + // Architectury: PlayerEvent + public static void join(EventRegistry.ServerConnection.PlayerJoin state) { + PlayerEvent.PLAYER_JOIN.register(state::join); + } + + public static void quit(EventRegistry.ServerConnection.PlayerQuit state) { + PlayerEvent.PLAYER_QUIT.register(state::quit); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java index af4905dc9..6d8823b66 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java @@ -3,6 +3,7 @@ import ml.pkom.mcpitanlibarch.api.entity.Player; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; +import net.minecraft.text.Text; import net.minecraft.world.World; import java.util.ArrayList; @@ -50,4 +51,24 @@ public static boolean isExistByUUID(MinecraftServer server, UUID uuid) { public static boolean isExistByUUID(World world, UUID uuid) { return isExistByUUID(world.getServer(), uuid); } + + public static boolean isExistByName(MinecraftServer server, String name) { + return server.getPlayerManager().getPlayer(name) != null; + } + + public static boolean isExistByName(World world, String name) { + return isExistByName(world.getServer(), name); + } + + public static boolean isExistByIP(MinecraftServer server, String ip) { + return !server.getPlayerManager().getPlayersByIp(ip).isEmpty(); + } + + public static boolean isExistByIP(World world, String ip) { + return isExistByIP(world.getServer(), ip); + } + + public static void sendMessage(Player player, String message) { + player.sendMessage(TextUtil.literal(message)); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java index 1134eac57..86816610e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -4,12 +4,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.ShapelessRecipe; import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class RecipeUtil { public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { return new ShapelessRecipe(group, CraftingRecipeCategory.valueOf(category.name()), output, input); @@ -23,11 +28,20 @@ public static ItemStack craft(Recipe recipe, C inventor return recipe.craft(inventory, world.getRegistryManager()); } - public static ItemStack getOutput(Recipe recipe, World world) { return recipe.getResult(world.getRegistryManager()); } + public static List> getAllRecipes(World world) { + Collection> recipes = world.getRecipeManager().values(); + List> outRecipes = new ArrayList<>(); + for (RecipeEntry recipeEntry : recipes) { + Recipe recipe = recipeEntry.value(); + outRecipes.add(recipe); + } + return outRecipes; + } + public enum CompatibilityCraftingRecipeCategory { BUILDING, REDSTONE, diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java new file mode 100644 index 000000000..a04e69c0b --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java @@ -0,0 +1,18 @@ +package ml.pkom.mcpitanlibarch.mixin; + +import ml.pkom.mcpitanlibarch.api.event.v0.event.ItemStackActionEvent; +import net.minecraft.item.ItemStack; +import net.minecraft.server.network.ServerPlayerEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ItemStack.class) +public abstract class ItemStackMixin { + + @Inject(method = "damage(ILnet/minecraft/util/math/random/Random;Lnet/minecraft/server/network/ServerPlayerEntity;)Z", at = @At("HEAD"), cancellable = true) + public void damage(int amount, net.minecraft.util.math.random.Random random, ServerPlayerEntity player, CallbackInfoReturnable cir) { + ItemStackActionEvent.call((ItemStack) (Object) this); + } +} diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlibarch-common.mixins.json index c3b102ae3..d8e6da905 100644 --- a/common/src/main/resources/mcpitanlibarch-common.mixins.json +++ b/common/src/main/resources/mcpitanlibarch-common.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_8", "mixins": [ "ItemMixin", + "ItemStackMixin", "ItemUsageContextMixin", "MinecraftServerTimer", "ServerWorldTimer" diff --git a/info.properties b/info.properties index b19cb8d00..30f252fa1 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.0 +mod_version=1.8.1 maven_group=ml.pkom \ No newline at end of file From cced2a60bcb4d749b66872defd997b8cd6a85011 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Wed, 8 Nov 2023 00:02:42 +0900 Subject: [PATCH 193/622] add APIs --- .../api/event/v0/event/ItemStackActionEvent.java | 7 +++++++ .../java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java index 890d3aa43..6afbab852 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java @@ -7,6 +7,13 @@ import java.util.List; public class ItemStackActionEvent { + + public static Boolean returnValue = null; + + public static void setReturnValue(boolean setReturnValue) { + ItemStackActionEvent.returnValue = setReturnValue; + } + private static final List states = new ArrayList<>(); public static void register(EventRegistry.ItemStackAction.ItemStackDamageState state) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java index a04e69c0b..b7cf944d8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java @@ -14,5 +14,7 @@ public abstract class ItemStackMixin { @Inject(method = "damage(ILnet/minecraft/util/math/random/Random;Lnet/minecraft/server/network/ServerPlayerEntity;)Z", at = @At("HEAD"), cancellable = true) public void damage(int amount, net.minecraft.util.math.random.Random random, ServerPlayerEntity player, CallbackInfoReturnable cir) { ItemStackActionEvent.call((ItemStack) (Object) this); + if (ItemStackActionEvent.returnValue != null) + cir.setReturnValue(ItemStackActionEvent.returnValue); } } From e71eeb7397520c0de710a1e69e05d3a0079f5a7f Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Wed, 8 Nov 2023 00:03:26 +0900 Subject: [PATCH 194/622] add APIs2 --- .../main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java index b7cf944d8..55a464149 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java @@ -13,6 +13,7 @@ public abstract class ItemStackMixin { @Inject(method = "damage(ILnet/minecraft/util/math/random/Random;Lnet/minecraft/server/network/ServerPlayerEntity;)Z", at = @At("HEAD"), cancellable = true) public void damage(int amount, net.minecraft.util.math.random.Random random, ServerPlayerEntity player, CallbackInfoReturnable cir) { + ItemStackActionEvent.returnValue = null; ItemStackActionEvent.call((ItemStack) (Object) this); if (ItemStackActionEvent.returnValue != null) cir.setReturnValue(ItemStackActionEvent.returnValue); From 53931234361692e56a317c0222e48e7d9e66390e Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Wed, 8 Nov 2023 22:00:49 +0900 Subject: [PATCH 195/622] fix getAllRecipes --- .../pkom/mcpitanlibarch/api/util/RecipeUtil.java | 16 ++++++++++------ info.properties | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java index 86816610e..54731fafc 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -2,10 +2,7 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeEntry; -import net.minecraft.recipe.ShapelessRecipe; +import net.minecraft.recipe.*; import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; @@ -36,12 +33,19 @@ public static List> getAllRecipes(World world) { Collection> recipes = world.getRecipeManager().values(); List> outRecipes = new ArrayList<>(); for (RecipeEntry recipeEntry : recipes) { - Recipe recipe = recipeEntry.value(); - outRecipes.add(recipe); + outRecipes.add(recipeEntry.value()); } return outRecipes; } + public static RecipeType getType(Recipe recipe) { + return recipe.getType(); + } + + public static Identifier getId(Recipe recipe) { + return new Identifier(recipe.getClass().hashCode() + ""); + } + public enum CompatibilityCraftingRecipeCategory { BUILDING, REDSTONE, diff --git a/info.properties b/info.properties index 30f252fa1..694c348f4 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.1 +mod_version=1.8.2 maven_group=ml.pkom \ No newline at end of file From ebe8ac763c9fde5a2901188cfffa0742e7cfc952 Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Wed, 8 Nov 2023 22:00:53 +0900 Subject: [PATCH 196/622] gradle --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3eb089a14..a71f99374 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,9 +6,9 @@ minecraft_version=1.20.2 architectury_version=10.0.8 # https://fabricmc.net/develop/ -fabric_loader_version=0.14.22 +fabric_loader_version=0.14.24 yarn_mappings=1.20.2+build.4 -fabric_api_version=0.90.0+1.20.2 +fabric_api_version=0.90.7+1.20.2 # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.20.2-48.0.20 From 4ddf1d4871f646a834a14f08e381bcf9bdedaead Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sat, 11 Nov 2023 00:07:55 +0900 Subject: [PATCH 197/622] fix PersistentStateUtil --- .../api/util/PersistentStateUtil.java | 27 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PersistentStateUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PersistentStateUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PersistentStateUtil.java new file mode 100644 index 000000000..2ed6c444d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PersistentStateUtil.java @@ -0,0 +1,27 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.datafixer.DataFixTypes; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.PersistentState; +import net.minecraft.world.PersistentStateManager; +import net.minecraft.world.World; + +import java.util.function.Function; +import java.util.function.Supplier; + +public class PersistentStateUtil { + public static T getOrCreate(PersistentStateManager manager, String id, Supplier supplier, Function function) { + PersistentState.Type type = new PersistentState.Type<>(supplier, function, DataFixTypes.LEVEL); + return manager.getOrCreate(type, id); + } + + public static PersistentStateManager getManagerFromServer(MinecraftServer server) { + return server.getWorld(World.OVERWORLD).getPersistentStateManager(); + } + + public static PersistentStateManager getManagerFromWorld(ServerWorld world) { + return world.getPersistentStateManager(); + } +} \ No newline at end of file diff --git a/info.properties b/info.properties index 694c348f4..e80c5edb9 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.2 +mod_version=1.8.3 maven_group=ml.pkom \ No newline at end of file From 0a4bc332175bd55a51cd6f8b2876e9a6562750b5 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 26 Nov 2023 20:35:37 +0900 Subject: [PATCH 198/622] getAllRecipes fix 1.20.2 --- .../java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java index 54731fafc..d291f2873 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java @@ -32,8 +32,13 @@ public static ItemStack getOutput(Recipe recipe, World public static List> getAllRecipes(World world) { Collection> recipes = world.getRecipeManager().values(); List> outRecipes = new ArrayList<>(); - for (RecipeEntry recipeEntry : recipes) { - outRecipes.add(recipeEntry.value()); + for (Object recipeEntryObj : recipes) { + if (recipeEntryObj instanceof RecipeEntry) { + RecipeEntry recipeEntry = (RecipeEntry) recipeEntryObj; + if (recipeEntry.value() instanceof Recipe) { + outRecipes.add(recipeEntry.value()); + } + } } return outRecipes; } From 4706e88418038d0f1d1de07aaf504ea4726217a8 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 26 Nov 2023 20:45:41 +0900 Subject: [PATCH 199/622] add PacketByteUtil API --- .../api/network/PacketByteUtil.java | 158 ++++++++++++++++++ info.properties | 2 +- 2 files changed, 159 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java index 3994a8b7f..46cf58c3e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java @@ -3,6 +3,8 @@ import io.netty.buffer.Unpooled; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; +import net.minecraft.nbt.NbtTagSizeTracker; import net.minecraft.network.PacketByteBuf; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -93,6 +95,162 @@ public static void writeVar(PacketByteBuf buf, Object obj) { writeMap(buf, map); } } + + public static PacketByteBuf writeNbt(PacketByteBuf buf, NbtCompound nbt) { + return buf.writeNbt(nbt); + } + + public static NbtCompound readNbt(PacketByteBuf buf) { + return buf.readNbt(); + } + + public static PacketByteBuf writeItemStack(PacketByteBuf buf, ItemStack stack) { + return buf.writeItemStack(stack); + } + + public static ItemStack readItemStack(PacketByteBuf buf) { + return buf.readItemStack(); + } + + public static PacketByteBuf writeIdentifier(PacketByteBuf buf, Identifier identifier) { + return buf.writeIdentifier(identifier); + } + + public static Identifier readIdentifier(PacketByteBuf buf) { + return buf.readIdentifier(); + } + + public static PacketByteBuf writeText(PacketByteBuf buf, Text text) { + return buf.writeText(text); + } + + public static Text readText(PacketByteBuf buf) { + return buf.readText(); + } + + public static PacketByteBuf writeBlockPos(PacketByteBuf buf, BlockPos pos) { + return buf.writeBlockPos(pos); + } + + public static BlockPos readBlockPos(PacketByteBuf buf) { + return buf.readBlockPos(); + } + + public static PacketByteBuf writeUuid(PacketByteBuf buf, UUID uuid) { + return buf.writeUuid(uuid); + } + + public static UUID readUuid(PacketByteBuf buf) { + return buf.readUuid(); + } + + public static PacketByteBuf writeVarInt(PacketByteBuf buf, int i) { + return buf.writeVarInt(i); + } + + public static int readVarInt(PacketByteBuf buf) { + return buf.readVarInt(); + } + + public static PacketByteBuf writeVarLong(PacketByteBuf buf, long l) { + return buf.writeVarLong(l); + } + + public static long readVarLong(PacketByteBuf buf) { + return buf.readVarLong(); + } + + public static PacketByteBuf writeBoolean(PacketByteBuf buf, boolean b) { + return buf.writeBoolean(b); + } + + public static boolean readBoolean(PacketByteBuf buf) { + return buf.readBoolean(); + } + + public static PacketByteBuf writeByte(PacketByteBuf buf, byte b) { + return buf.writeByte(b); + } + + public static byte readByte(PacketByteBuf buf) { + return buf.readByte(); + } + + public static PacketByteBuf writeShort(PacketByteBuf buf, short s) { + return buf.writeShort(s); + } + + public static short readShort(PacketByteBuf buf) { + return buf.readShort(); + } + + public static PacketByteBuf writeInt(PacketByteBuf buf, int i) { + return buf.writeInt(i); + } + + public static int readInt(PacketByteBuf buf) { + return buf.readInt(); + } + + public static PacketByteBuf writeLong(PacketByteBuf buf, long l) { + return buf.writeLong(l); + } + + public static long readLong(PacketByteBuf buf) { + return buf.readLong(); + } + + public static PacketByteBuf writeFloat(PacketByteBuf buf, float f) { + return buf.writeFloat(f); + } + + public static float readFloat(PacketByteBuf buf) { + return buf.readFloat(); + } + + public static PacketByteBuf writeDouble(PacketByteBuf buf, double d) { + return buf.writeDouble(d); + } + + public static double readDouble(PacketByteBuf buf) { + return buf.readDouble(); + } + + public static PacketByteBuf writeByteArray(PacketByteBuf buf, byte[] bytes) { + return buf.writeByteArray(bytes); + } + + public static byte[] readByteArray(PacketByteBuf buf) { + return buf.readByteArray(); + } + + public static PacketByteBuf writeString(PacketByteBuf buf, String s) { + return buf.writeString(s); + } + + public static String readString(PacketByteBuf buf) { + return buf.readString(); + } + + public static PacketByteBuf writeIntArray(PacketByteBuf buf, int[] ints) { + return buf.writeIntArray(ints); + } + + public static int[] readIntArray(PacketByteBuf buf) { + return buf.readIntArray(); + } + + public static PacketByteBuf writeLongArray(PacketByteBuf buf, long[] longs) { + return buf.writeLongArray(longs); + } + + public static long[] readLongArray(PacketByteBuf buf) { + return buf.readLongArray(); + } + + public static NbtElement readUnlimitedNbt(PacketByteBuf buf) { + return buf.readNbt(NbtTagSizeTracker.ofUnlimitedBytes()); + } } diff --git a/info.properties b/info.properties index e80c5edb9..68747a1cb 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.3 +mod_version=1.8.4 maven_group=ml.pkom \ No newline at end of file From 0e31310c77f991fde9a54719fefa5d3c86b8255a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 3 Dec 2023 21:08:36 +0900 Subject: [PATCH 200/622] support neoforge --- build.gradle | 6 +- common/build.gradle | 2 +- .../mcpitanlibarch/api/util/PlatformUtil.java | 6 +- fabric/build.gradle | 6 +- forge/build.gradle | 6 +- .../forge/MCPitanLibarchForge.java | 2 - gradle.properties | 8 +- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 98 +++++++++++++++++++ neoforge/gradle.properties | 1 + .../neoforge/MCPitanLibarchNeoForge.java | 22 +++++ .../client/MCPitanLibarchNeoForgeClient.java | 10 ++ .../src/main/resources/META-INF/mods.toml | 64 ++++++++++++ .../main/resources/mcpitanlibarch.mixins.json | 13 +++ neoforge/src/main/resources/pack.mcmeta | 8 ++ quilt/build.gradle | 6 +- settings.gradle | 4 +- 17 files changed, 246 insertions(+), 18 deletions(-) create mode 100644 neoforge/build.gradle create mode 100644 neoforge/gradle.properties create mode 100644 neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java create mode 100644 neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibarchNeoForgeClient.java create mode 100644 neoforge/src/main/resources/META-INF/mods.toml create mode 100644 neoforge/src/main/resources/mcpitanlibarch.mixins.json create mode 100644 neoforge/src/main/resources/pack.mcmeta diff --git a/build.gradle b/build.gradle index da2f96c4c..ac72317e7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false } architectury { @@ -14,6 +14,10 @@ subprojects { silentMojangMappingsLicense() } + repositories { + maven { url "https://maven.neoforged.net/releases/" } + } + dependencies { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" // The following line declares the mojmap mappings, you may use other mappings as well diff --git a/common/build.gradle b/common/build.gradle index ee1ded13c..5f3806e93 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,7 +7,7 @@ dependencies { } architectury { - common(forgeEnabled.toBoolean()) + common("fabric", "forge", "neoforge") } loom { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java index 975164401..429891494 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java @@ -17,7 +17,11 @@ public static boolean isFabric() { } public static boolean isForge() { - return Platform.isForge(); + return Platform.isMinecraftForge(); + } + + public static boolean isNeoForge() { + return Platform.isNeoForge(); } public static boolean isModLoaded(String id) { diff --git a/fabric/build.gradle b/fabric/build.gradle index 7c6b990b2..c3b5fbca3 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -46,18 +46,18 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + archiveClassifier = "dev-shadow" } remapJar { injectAccessWidener = true inputFile.set shadowJar.archiveFile dependsOn shadowJar - classifier null + archiveClassifier = null } jar { - classifier "dev" + archiveClassifier = "dev" } sourcesJar { diff --git a/forge/build.gradle b/forge/build.gradle index f153aadbc..9014ad608 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -53,17 +53,17 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + archiveClassifier = "dev-shadow" } remapJar { inputFile.set shadowJar.archiveFile dependsOn shadowJar - classifier null + archiveClassifier = null } jar { - classifier "dev" + archiveClassifier = "dev" } sourcesJar { diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java index be5f0e929..3e5997584 100644 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java +++ b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java @@ -3,9 +3,7 @@ import dev.architectury.platform.Platform; import dev.architectury.platform.forge.EventBuses; import ml.pkom.mcpitanlibarch.MCPitanLibarch; -import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; import ml.pkom.mcpitanlibarch.forge.client.MCPitanLibarchForgeClient; -import ml.pkom.mcpitanlibarch.test.ExampleMod; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; diff --git a/gradle.properties b/gradle.properties index a71f99374..49e5abbd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.20.2 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=10.0.8 +architectury_version=10.0.16 # https://fabricmc.net/develop/ fabric_loader_version=0.14.24 @@ -17,6 +17,10 @@ forge_version=1.20.2-48.0.20 quilt_loader_version=0.21.0 quilt_fabric_api_version=6.0.2 +# https://neoforged.net/ +neoforge_version=20.2.78-beta + fabricEnabled=true forgeEnabled=true -quiltEnabled=false \ No newline at end of file +quiltEnabled=false +neoforgeEnabled=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b..e411586a5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 000000000..95bb9530b --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,98 @@ +plugins { + id "com.github.johnrengelman.shadow" version "7.1.2" +} +architectury { + platformSetupLoomIde() + neoForge() +} + +loom { + accessWidenerPath = project(":common").loom.accessWidenerPath + + /* + forge { + convertAccessWideners = true + extraAccessWideners.add loom.accessWidenerPath.get().asFile.name + + mixinConfig "mcpitanlibarch-common.mixins.json" + mixinConfig "mcpitanlibarch.mixins.json" + } + + */ +} + +configurations { + common + shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentNeoForge.extendsFrom common +} + +dependencies { + neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}" + // Remove the next line if you don't want to depend on the API + modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" + + common(project(path: ":common", configuration: "namedElements")) { transitive false } + shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } + + shadowCommon 'org.yaml:snakeyaml:2.0' + compileOnly 'org.yaml:snakeyaml:2.0' +} + +processResources { + inputs.property "version", project.version + + filesMatching("META-INF/mods.toml") { + expand "version": project.version + } + + project.version = project.version + "-neoforge" +} + +shadowJar { + exclude "fabric.mod.json" + exclude "architectury.common.json" + + configurations = [project.configurations.shadowCommon] + archiveClassifier = "dev-shadow" +} + +remapJar { + inputFile.set shadowJar.archiveFile + dependsOn shadowJar + archiveClassifier = null + + atAccessWideners.add(loom.accessWidenerPath.get().asFile.name) +} + +jar { + archiveClassifier = "dev" +} + +sourcesJar { + def commonSources = project(":common").sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } +} + +components.java { + withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { + skip() + } +} + +publishing { + publications { + mavenNeoForge(MavenPublication) { + artifactId = info.archives_base_name + "-" + project.name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} \ No newline at end of file diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties new file mode 100644 index 000000000..2914393db --- /dev/null +++ b/neoforge/gradle.properties @@ -0,0 +1 @@ +loom.platform=neoforge \ No newline at end of file diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java new file mode 100644 index 000000000..b2beb0b2d --- /dev/null +++ b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java @@ -0,0 +1,22 @@ +package ml.pkom.mcpitanlibarch.neoforge; + +import dev.architectury.platform.Platform; +import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import ml.pkom.mcpitanlibarch.neoforge.client.MCPitanLibarchNeoForgeClient; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; + +@Mod(MCPitanLibarch.MOD_ID) +public class MCPitanLibarchNeoForge { + public MCPitanLibarchNeoForge() { + // Submit our event bus to let architectury register our content on the right time + EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + //if (PlatformUtil.isDevelopmentEnvironment()) + // EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + + MCPitanLibarch.init(); + + if (Platform.getEnv().isClient()) + FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchNeoForgeClient::clientInit); + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibarchNeoForgeClient.java b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibarchNeoForgeClient.java new file mode 100644 index 000000000..870e75786 --- /dev/null +++ b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibarchNeoForgeClient.java @@ -0,0 +1,10 @@ +package ml.pkom.mcpitanlibarch.neoforge.client; + +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; + +public class MCPitanLibarchNeoForgeClient { + public static void clientInit(FMLClientSetupEvent event) { + //if (PlatformUtil.isDevelopmentEnvironment()) + // ExampleModClient.init(); + } +} diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml new file mode 100644 index 000000000..64f70fc19 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,64 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader = "javafml" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the forge version +loaderVersion = "[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license = "MIT" +# A URL to refer people to when problems occur with this mod +issueTrackerURL = "https://github.com/Pitan76/mcpitanlibarch/issue" +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId = "mcpitanlibarch" #mandatory +# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it +# ${version} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata +# see the associated build.gradle script for how to populate this completely automatically during a build +version = "${version}" #mandatory +# A display name for the mod +displayName = "MCPitanLib" #mandatory +# A URL to query for updates for this mod. See the JSON update specification +#updateJSONURL="http://myurl.me/" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +displayURL = "https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch" +# A file name (in the root of the mod JAR) containing a logo for display +logoFile = "icon.png" #optional +# A text field displayed in the mod UI +#credits="Thanks for this example mod goes to Java" #optional +# A text field displayed in the mod UI +authors = "Pitan" #optional +# The description text for the mod (multi line!) (#mandatory) +description = ''' +Pitan's Minecraft Mod Library +''' +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies.mcpitanlibarch]] #optional +# the modid of the dependency +modId = "forge" #mandatory +# Does this dependency have to exist - if not, ordering below must be specified +mandatory = true #mandatory +# The version range of the dependency +versionRange = "[40,)" #mandatory +# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory +ordering = "NONE" +# Side this dependency is applied on - BOTH, CLIENT or SERVER +side = "BOTH" +# Here's another dependency +[[dependencies.mcpitanlibarch]] +modId = "minecraft" +mandatory = true +# This version range declares a minimum of the current minecraft version up to but not including the next major version +versionRange = "[1.20,)" +ordering = "NONE" +side = "BOTH" + +[[mixins]] +config = "mcpitanlibarch-common.mixins.json" + +[[mixins]] +config = "mcpitanlibarch.mixins.json" \ No newline at end of file diff --git a/neoforge/src/main/resources/mcpitanlibarch.mixins.json b/neoforge/src/main/resources/mcpitanlibarch.mixins.json new file mode 100644 index 000000000..f00451cf3 --- /dev/null +++ b/neoforge/src/main/resources/mcpitanlibarch.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "ml.pkom.mcpitanlibarch.forge.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta new file mode 100644 index 000000000..547096ba2 --- /dev/null +++ b/neoforge/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": "mcpitanlibarch resources", + "pack_format": 8, + "forge:resource_pack_format": 8, + "forge:data_pack_format": 9 + } +} diff --git a/quilt/build.gradle b/quilt/build.gradle index ee067a98e..57bde079b 100644 --- a/quilt/build.gradle +++ b/quilt/build.gradle @@ -50,18 +50,18 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + archiveClassifier = "dev-shadow" } remapJar { injectAccessWidener = true inputFile.set shadowJar.archiveFile dependsOn shadowJar - classifier null + archiveClassifier = null } jar { - classifier "dev" + archiveClassifier = "dev" } sourcesJar { diff --git a/settings.gradle b/settings.gradle index 942e06022..588050bed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,4 +13,6 @@ if (fabricEnabled.toBoolean()) if (forgeEnabled.toBoolean()) include("forge") if (quiltEnabled.toBoolean()) - include("quilt") \ No newline at end of file + include("quilt") +if (neoforgeEnabled.toBoolean()) + include("neoforge") From cab047a78ee6f64c629ed4a14fd57696c407acac Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:08:00 +0900 Subject: [PATCH 201/622] support neoforge --- .../ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java index b2beb0b2d..404162a17 100644 --- a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java +++ b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java @@ -10,7 +10,7 @@ public class MCPitanLibarchNeoForge { public MCPitanLibarchNeoForge() { // Submit our event bus to let architectury register our content on the right time - EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + //EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); //if (PlatformUtil.isDevelopmentEnvironment()) // EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); From 381e2d24d7a55f371b1a638961e51490da23a545 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:08:31 +0900 Subject: [PATCH 202/622] gradle 1.20.4 --- build.gradle | 6 +++++- .../gui/widget/CompatibleTexturedButtonWidget.java | 2 +- .../gui/widget/RedrawableTexturedButtonWidget.java | 2 +- gradle.properties | 14 +++++++------- mappings/yarnpatch.tiny | 3 +++ 5 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 mappings/yarnpatch.tiny diff --git a/build.gradle b/build.gradle index ac72317e7..badc7e927 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,11 @@ subprojects { // The following line declares the mojmap mappings, you may use other mappings as well // mappings loom.officialMojangMappings() // The following line declares the yarn mappings you may select this one as well. - mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" + //mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" + mappings loom.layered() { + it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2") + it.mappings file("../mappings/yarnpatch.tiny") + } // https://mvnrepository.com/artifact/org.yaml/snakeyaml implementation 'org.yaml:snakeyaml:2.0' diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java index 38e49e360..3a730b501 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -44,7 +44,7 @@ public void setPos(int x, int y) { } @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { int i = v; if (!this.isNarratable()) { i = v + hoveredVOffset * 2; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java index 2cc49a0d4..e69d16b45 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java @@ -23,7 +23,7 @@ public RedrawableTexturedButtonWidget(int x, int y, int width, int height, int u } public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) { - super.renderButton(context, mouseX, mouseY, delta); + super.renderWidget(context, mouseX, mouseY, delta); } public void setTexture(Identifier texture) { diff --git a/gradle.properties b/gradle.properties index 49e5abbd9..37dbf34d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,24 +1,24 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.20.2 +minecraft_version=1.20.4 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=10.0.16 +architectury_version=11.0.8 # https://fabricmc.net/develop/ -fabric_loader_version=0.14.24 -yarn_mappings=1.20.2+build.4 -fabric_api_version=0.90.7+1.20.2 +fabric_loader_version=0.15.1 +yarn_mappings=1.20.4+build.1 +fabric_api_version=0.91.2+1.20.4 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.20.2-48.0.20 +forge_version=1.20.4-49.0.3 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.21.0 quilt_fabric_api_version=6.0.2 # https://neoforged.net/ -neoforge_version=20.2.78-beta +neoforge_version=20.4.5-beta fabricEnabled=true forgeEnabled=true diff --git a/mappings/yarnpatch.tiny b/mappings/yarnpatch.tiny new file mode 100644 index 000000000..c47c3f32f --- /dev/null +++ b/mappings/yarnpatch.tiny @@ -0,0 +1,3 @@ +tiny 2 0 intermediary named +c net/minecraft/class_1927 net/minecraft/world/explosion/Explosion + m ()Lnet/minecraft/class_243; method_55109 getPositionYarn From c7759e141af90325d56d694a29a86927c6f3dff1 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 11 Dec 2023 21:19:42 +0900 Subject: [PATCH 203/622] Fix PacketByteUtil --- .../api/network/PacketByteUtil.java | 15 ++++++++------- info.properties | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java index 46cf58c3e..0154bc2e0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java @@ -1,5 +1,6 @@ package ml.pkom.mcpitanlibarch.api.network; +import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; @@ -160,7 +161,7 @@ public static long readVarLong(PacketByteBuf buf) { return buf.readVarLong(); } - public static PacketByteBuf writeBoolean(PacketByteBuf buf, boolean b) { + public static ByteBuf writeBoolean(PacketByteBuf buf, boolean b) { return buf.writeBoolean(b); } @@ -168,7 +169,7 @@ public static boolean readBoolean(PacketByteBuf buf) { return buf.readBoolean(); } - public static PacketByteBuf writeByte(PacketByteBuf buf, byte b) { + public static ByteBuf writeByte(PacketByteBuf buf, byte b) { return buf.writeByte(b); } @@ -176,7 +177,7 @@ public static byte readByte(PacketByteBuf buf) { return buf.readByte(); } - public static PacketByteBuf writeShort(PacketByteBuf buf, short s) { + public static ByteBuf writeShort(PacketByteBuf buf, short s) { return buf.writeShort(s); } @@ -184,7 +185,7 @@ public static short readShort(PacketByteBuf buf) { return buf.readShort(); } - public static PacketByteBuf writeInt(PacketByteBuf buf, int i) { + public static ByteBuf writeInt(PacketByteBuf buf, int i) { return buf.writeInt(i); } @@ -192,7 +193,7 @@ public static int readInt(PacketByteBuf buf) { return buf.readInt(); } - public static PacketByteBuf writeLong(PacketByteBuf buf, long l) { + public static ByteBuf writeLong(PacketByteBuf buf, long l) { return buf.writeLong(l); } @@ -200,7 +201,7 @@ public static long readLong(PacketByteBuf buf) { return buf.readLong(); } - public static PacketByteBuf writeFloat(PacketByteBuf buf, float f) { + public static ByteBuf writeFloat(PacketByteBuf buf, float f) { return buf.writeFloat(f); } @@ -208,7 +209,7 @@ public static float readFloat(PacketByteBuf buf) { return buf.readFloat(); } - public static PacketByteBuf writeDouble(PacketByteBuf buf, double d) { + public static ByteBuf writeDouble(PacketByteBuf buf, double d) { return buf.writeDouble(d); } diff --git a/info.properties b/info.properties index 68747a1cb..3be257a6c 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.4 +mod_version=1.8.4.1 maven_group=ml.pkom \ No newline at end of file From 453da77473089825129c93bb61cae641a0c8ab5e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:37:54 +0900 Subject: [PATCH 204/622] Add APIs --- .../api/block/ExtendBlockEntityProvider.java | 11 +++++++++-- .../mcpitanlibarch/api/util/IngredientUtil.java | 16 ++++++++++++++++ .../api/util/SimpleInventoryUtil.java | 11 +++++++++++ info.properties | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/IngredientUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SimpleInventoryUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java index 0599a54a5..58cd78b24 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java @@ -49,9 +49,16 @@ default BlockEntityTicker getTicker(World world, Bloc return BlockEntityProvider.super.getTicker(world, state, type); } + @Nullable + default ExtendBlockEntityTicker getCompatibleTicker(World world, BlockState state, BlockEntityType type) { + BlockEntityTicker ticker = getTicker(world, state, type); + if (ticker instanceof ExtendBlockEntityTicker) + return (ExtendBlockEntityTicker) ticker; + + return null; + } + default boolean isTick() { return false; } - - } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/IngredientUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/IngredientUtil.java new file mode 100644 index 000000000..515266484 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/IngredientUtil.java @@ -0,0 +1,16 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.Registries; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; + +public class IngredientUtil { + public static Ingredient fromTagByIdentifier(Identifier id) { + return Ingredient.fromTag(TagKey.of(Registries.ITEM.getKey(), id)); + } + + public static Ingredient fromTagByString(String id) { + return fromTagByIdentifier(new Identifier(id)); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SimpleInventoryUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SimpleInventoryUtil.java new file mode 100644 index 000000000..26387fa13 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SimpleInventoryUtil.java @@ -0,0 +1,11 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.inventory.SimpleInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; + +public class SimpleInventoryUtil { + public static DefaultedList getHeldStacks(SimpleInventory inventory) { + return inventory.getHeldStacks(); + } +} diff --git a/info.properties b/info.properties index 3be257a6c..f769aaa02 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.4.1 +mod_version=1.8.5 maven_group=ml.pkom \ No newline at end of file From 6d5a8342b8cbb70a27c592f7cd9cf8398d15657e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 12 Jan 2024 21:45:55 +0900 Subject: [PATCH 205/622] include architectury api --- fabric/build.gradle | 1 + forge/build.gradle | 1 + neoforge/build.gradle | 1 + 3 files changed, 3 insertions(+) diff --git a/fabric/build.gradle b/fabric/build.gradle index c3b5fbca3..d86596205 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -24,6 +24,7 @@ dependencies { modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" + include "dev.architectury:architectury-fabric:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } diff --git a/forge/build.gradle b/forge/build.gradle index 9014ad608..1e9e1fa35 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -30,6 +30,7 @@ dependencies { forge "net.minecraftforge:forge:${rootProject.forge_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" + include "dev.architectury:architectury-forge:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 95bb9530b..3bb49b71a 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -33,6 +33,7 @@ dependencies { neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" + include "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } From 2d9e8eb1d27e920d94097dcc55d6a0bd3dcdf604 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 12 Jan 2024 22:57:14 +0900 Subject: [PATCH 206/622] cancel include --- fabric/build.gradle | 1 - forge/build.gradle | 1 - neoforge/build.gradle | 1 - 3 files changed, 3 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index d86596205..c3b5fbca3 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -24,7 +24,6 @@ dependencies { modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}" - include "dev.architectury:architectury-fabric:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } diff --git a/forge/build.gradle b/forge/build.gradle index 1e9e1fa35..9014ad608 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -30,7 +30,6 @@ dependencies { forge "net.minecraftforge:forge:${rootProject.forge_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" - include "dev.architectury:architectury-forge:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 3bb49b71a..95bb9530b 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -33,7 +33,6 @@ dependencies { neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" - include "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } From d881ef82bde5b962d443745bc63b97c7ddfc389b Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 30 Jan 2024 16:25:22 +0900 Subject: [PATCH 207/622] add APIs --- .../java/ml/pkom/easyapi/config/Config.java | 4 ++ .../mcpitanlibarch/api/entity/Player.java | 4 ++ .../api/packet/UpdatePacketType.java | 26 ++++++++++ .../api/tile/ExtendBlockEntity.java | 21 ++++++++- .../api/util/ActionResultUtil.java | 30 ++++++++++++ .../mcpitanlibarch/api/util/PlayerUtil.java | 25 ++++++++++ .../mcpitanlibarch/api/util/WorldUtil.java | 47 +++++++++++++++++++ .../mcpitanlibarch/api/util/math/PosUtil.java | 8 ++++ .../api/world/CompatiblePersistentState.java | 18 +++++++ info.properties | 2 +- 10 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/packet/UpdatePacketType.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ActionResultUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/world/CompatiblePersistentState.java diff --git a/common/src/main/java/ml/pkom/easyapi/config/Config.java b/common/src/main/java/ml/pkom/easyapi/config/Config.java index 8d3e8e4ce..3d80d0693 100644 --- a/common/src/main/java/ml/pkom/easyapi/config/Config.java +++ b/common/src/main/java/ml/pkom/easyapi/config/Config.java @@ -36,6 +36,10 @@ public Config(Config config) { configMap = config.configMap; }; + public boolean has(String key) { + return configMap.containsKey(key); + } + /** * マップのキーから値を取得 * "."でパスを区切る diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index 8af9ae802..f85c2e31e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -273,4 +273,8 @@ public void incrementStat(Stat stat) { public void incrementStat(StatType type, T object) { getEntity().incrementStat(type.getOrCreateStat(object)); } + + public void teleport(double x, double y, double z) { + getEntity().teleport(x, y, z); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/packet/UpdatePacketType.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/packet/UpdatePacketType.java new file mode 100644 index 000000000..c2f6a40f1 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/packet/UpdatePacketType.java @@ -0,0 +1,26 @@ +package ml.pkom.mcpitanlibarch.api.packet; + +public class UpdatePacketType { + public static final UpdatePacketType NONE = new UpdatePacketType("NONE"); + public static final UpdatePacketType BLOCK_ENTITY_UPDATE_S2C = new UpdatePacketType("BLOCK_ENTITY_UPDATE_S2C"); + + public final String name; + + public UpdatePacketType(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public UpdatePacketType fromName(String name) { + switch (name) { + case "NONE": + return NONE; + case "BLOCK_ENTITY_UPDATE_S2C": + return BLOCK_ENTITY_UPDATE_S2C; + } + return null; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java index d1ae1a077..0b913d62a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java @@ -1,14 +1,18 @@ package ml.pkom.mcpitanlibarch.api.tile; import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; -import ml.pkom.mcpitanlibarch.api.nbt.NbtTag; +import ml.pkom.mcpitanlibarch.api.packet.UpdatePacketType; import ml.pkom.mcpitanlibarch.api.world.ExtendWorld; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.nbt.NbtCompound; +import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; public class ExtendBlockEntity extends BlockEntity { public ExtendWorld world; @@ -20,6 +24,21 @@ public ExtendBlockEntity(BlockEntityType type, TileCreateEvent event) { this(type, event.getBlockPos(), event.getBlockState()); } + @Nullable + @Override + @Deprecated + public Packet toUpdatePacket() { + switch (getUpdatePacketType().name) { + case "BLOCK_ENTITY_UPDATE_S2C": + return BlockEntityUpdateS2CPacket.create(this); + } + return super.toUpdatePacket(); + } + + public UpdatePacketType getUpdatePacketType() { + return UpdatePacketType.NONE; + } + public void writeNbtOverride(NbtCompound nbt) { super.writeNbt(nbt); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ActionResultUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ActionResultUtil.java new file mode 100644 index 000000000..8977a4843 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ActionResultUtil.java @@ -0,0 +1,30 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import net.minecraft.util.ActionResult; +import net.minecraft.util.TypedActionResult; + +public class ActionResultUtil { + + public static TypedActionResult typedActionResult(ActionResult result, T t, boolean swingHand) { + switch (result) { + case PASS: + return TypedActionResult.pass(t); + case SUCCESS: + return TypedActionResult.success(t, swingHand); + case FAIL: + return TypedActionResult.fail(t); + case CONSUME: + case CONSUME_PARTIAL: + return TypedActionResult.consume(t); + } + return TypedActionResult.pass(t); + } + + public static TypedActionResult typedActionResult(ActionResult result, T t) { + return typedActionResult(result, t, true); + } + + public static ActionResult actionResult(TypedActionResult result) { + return result.getResult(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java index 6d8823b66..c6cbac3c0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.text.Text; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import java.util.ArrayList; @@ -71,4 +72,28 @@ public static boolean isExistByIP(World world, String ip) { public static void sendMessage(Player player, String message) { player.sendMessage(TextUtil.literal(message)); } + + public static float getYaw(Player player) { + return player.getYaw(); + } + + public static float getPitch(Player player) { + return player.getPitch(); + } + + public static BlockPos getBlockPos(Player player) { + return player.getBlockPos(); + } + + public static World getWorld(Player player) { + return player.getWorld(); + } + + public static boolean isClient(Player player) { + return player.isClient(); + } + + public static void teleport(Player player, double x, double y, double z) { + player.teleport(x, y, z); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index 1aa6794a7..5f409e491 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -8,10 +8,16 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.world.ChunkTicketType; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; @@ -84,4 +90,45 @@ public static void playSound(World world, @Nullable Player player, BlockPos pos, public static void sendEntityStatus(World world, Entity entity, byte status) { world.sendEntityStatus(entity, status); } + + public static BlockPos getSpawnPos(World world) { + return world.getSpawnPos(); + } + + public static World getWorld(World world, Identifier worldId) { + if (isClient(world)) return null; + return getWorld(world.getServer(), worldId); + } + + public static World getOverworld(MinecraftServer server) { + return server.getWorld(World.OVERWORLD); + } + + public static World getNether(MinecraftServer server) { + return server.getWorld(World.NETHER); + } + + public static World getEnd(MinecraftServer server) { + return server.getWorld(World.END); + } + + public static World getWorld(MinecraftServer server, Identifier worldId) { + return server.getWorld(RegistryKey.of(RegistryKeys.WORLD, worldId)); + } + + public static Identifier getWorldId(World world) { + return world.getRegistryKey().getValue(); + } + + public static boolean equals(World world, World world2) { + return Objects.equals(getWorldId(world), getWorldId(world2)); + } + + public static void addTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius, T argument) { + world.getChunkManager().addTicket(type, pos, radius, argument); + } + + public static void removeTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius, T argument) { + world.getChunkManager().removeTicket(type, pos, radius, argument); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java index cf83c5460..6bd9ed029 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java @@ -15,4 +15,12 @@ public static BlockPos flooredBlockPos(Position pos) { public static BlockPos flooredBlockPos(Vec3d pos) { return BlockPos.ofFloored(pos); } + + public static double getSquaredDistance(BlockPos pos1, BlockPos pos2) { + return pos1.getSquaredDistance(pos2); + } + + public static double getSquaredDistance(BlockPos pos1, double x, double y, double z) { + return pos1.getSquaredDistance(x, y, z); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/CompatiblePersistentState.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/CompatiblePersistentState.java new file mode 100644 index 000000000..d7a50e4f6 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/CompatiblePersistentState.java @@ -0,0 +1,18 @@ +package ml.pkom.mcpitanlibarch.api.world; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.world.PersistentState; + +public abstract class CompatiblePersistentState extends PersistentState { + // 1.16 + public CompatiblePersistentState(String key) { + super(); + } + + public CompatiblePersistentState() { + super(); + } + + // 1.16 + public abstract void readNbt(NbtCompound tag); +} diff --git a/info.properties b/info.properties index f769aaa02..6dc2b24a9 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.5 +mod_version=1.8.6 maven_group=ml.pkom \ No newline at end of file From 751e92afe4f88e30d6187fc3d302c922969b2bc5 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:18:53 +0900 Subject: [PATCH 208/622] fix apis, add apis --- .../api/command/ConfigCommand.java | 151 ++++++++++++++++++ .../mcpitanlibarch/api/entity/Player.java | 8 + .../api/item/CompatibleItemSettings.java | 9 ++ .../api/item/CreativeTabManager.java | 49 +++++- .../api/item/ExtendSettings.java | 9 +- .../api/item/tool/CompatiblePickaxeItem.java | 33 ++++ .../api/item/tool/CompatibleToolMaterial.java | 6 + info.properties | 2 +- 8 files changed, 262 insertions(+), 5 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleToolMaterial.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java new file mode 100644 index 000000000..0a3193c05 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java @@ -0,0 +1,151 @@ +package ml.pkom.mcpitanlibarch.api.command; + +import com.mojang.brigadier.arguments.StringArgumentType; +import ml.pkom.easyapi.config.Config; +import ml.pkom.mcpitanlibarch.api.command.argument.StringCommand; +import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import ml.pkom.mcpitanlibarch.api.event.StringCommandEvent; +import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import org.jetbrains.annotations.Nullable; + +import java.io.File; +import java.util.function.Supplier; + +public class ConfigCommand extends LiteralCommand { + + public final Config config; + public File file; + public Supplier defaultConfigFunction; + public String prefix = "[MCPitanLib]"; + + public ConfigCommand(Config config, File file, String prefix) { + this.config = config; + this.file = file; + this.prefix = prefix; + } + + public ConfigCommand(Config config, File file, String prefix, @Nullable Supplier supplier) { + this.config = config; + this.file = file; + this.defaultConfigFunction = supplier; + this.prefix = prefix; + } + + public ConfigCommand(Config config, File file, @Nullable Supplier supplier) { + this.config = config; + this.file = file; + this.defaultConfigFunction = supplier; + } + + public ConfigCommand(Config config, File file) { + this.config = config; + this.file = file; + } + + public ConfigCommand(Config config) { + this.config = config; + } + + @Override + public void init(CommandSettings settings) { + settings.permissionLevel(3); + + addArgumentCommand("set", new StringCommand() { + @Override + public String getArgumentName() { + return "key"; + } + + @Override + public void init(CommandSettings settings) { + + addArgumentCommand("value", new StringCommand() { + @Override + public String getArgumentName() { + return "value"; + } + + @Override + public void execute(StringCommandEvent event) { + String key = StringArgumentType.getString(event.context, "key"); + String value = StringArgumentType.getString(event.context, "value"); + if (config.get(key) == null) { + event.sendFailure(TextUtil.literal(prefix + " Key not found.")); + return; + } + if (config.get(key).getClass() == String.class) { + config.setString(key, value); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else if (config.get(key).getClass() == Integer.class) { + config.setInt(key, Integer.parseInt(value)); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else if (config.get(key).getClass() == Double.class) { + config.setDouble(key, Double.parseDouble(value)); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else if (config.get(key).getClass() == Boolean.class) { + config.setBoolean(key, Boolean.parseBoolean(value)); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else { + event.sendFailure(TextUtil.literal(prefix + " Not supported type.")); + } + if (file != null) + config.save(file); + } + }); + } + + @Override + public void execute(StringCommandEvent event) { + } + }); + + addArgumentCommand("get", new StringCommand() { + @Override + public String getArgumentName() { + return "key"; + } + + @Override + public void execute(StringCommandEvent event) { + String key = StringArgumentType.getString(event.context, "key"); + if (config.get(key) == null) { + event.sendFailure(TextUtil.literal(prefix + " Key not found.")); + return; + } + event.sendSuccess(TextUtil.literal(prefix + " " + key + ": " + config.get(key).toString()), false); + } + }); + + addArgumentCommand("list", new LiteralCommand() { + @Override + public void execute(ServerCommandEvent event) { + event.sendSuccess(TextUtil.literal(prefix + " Config List"), false); + for (String key : config.configMap.keySet()) { + event.sendSuccess(TextUtil.literal(" - " + key + ": " + config.get(key).toString()), false); + } + } + }); + + if (defaultConfigFunction != null) { + addArgumentCommand("reset", new LiteralCommand() { + @Override + public void execute(ServerCommandEvent event) { + config.configMap.clear(); + defaultConfigFunction.get(); + if (file != null) + config.save(file); + event.sendSuccess(TextUtil.literal(prefix + " Reset config."), false); + } + }); + } + } + + @Override + public void execute(ServerCommandEvent event) { + + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index f85c2e31e..29e756919 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -277,4 +277,12 @@ public void incrementStat(StatType type, T object) { public void teleport(double x, double y, double z) { getEntity().teleport(x, y, z); } + + public ItemStack getMainHandStack() { + return getStackInHand(Hand.MAIN_HAND); + } + + public ItemStack getOffHandStack() { + return getStackInHand(Hand.OFF_HAND); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java index 7fd0a68aa..e3e1fdaa6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java @@ -6,6 +6,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; +import java.util.function.Supplier; + public class CompatibleItemSettings { private final ExtendSettings settings = new ExtendSettings(); @@ -14,6 +16,7 @@ public static CompatibleItemSettings of() { } // ～1.19.2 + @Deprecated public CompatibleItemSettings addGroup(ItemGroup itemGroup) { settings.addGroup(itemGroup); return this; @@ -21,11 +24,17 @@ public CompatibleItemSettings addGroup(ItemGroup itemGroup) { // 1.19.3～ // identifier: Item ID + @Deprecated public CompatibleItemSettings addGroup(ItemGroup itemGroup, Identifier identifier) { settings.addGroup(itemGroup, identifier); return this; } + public CompatibleItemSettings addGroup(Supplier itemGroup, Identifier identifier) { + settings.addGroup(itemGroup, identifier); + return this; + } + public CompatibleItemSettings maxCount(int maxCount) { settings.maxCount(maxCount); return this; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java index 9ab27b388..2a5733342 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.function.Supplier; public class CreativeTabManager { private static List bookingItems = new ArrayList<>(); @@ -15,35 +16,67 @@ public class CreativeTabManager { // グループ予約済みアイテム public static class BookingItem { + @Deprecated public ItemGroup itemGroup; + + public Supplier itemGroupSupplier; public Identifier identifier; + + @Deprecated private BookingItem(ItemGroup itemGroup, Identifier identifier) { this.itemGroup = itemGroup; this.identifier = identifier; } + + private BookingItem(Supplier itemGroup, Identifier identifier) { + this.itemGroupSupplier = itemGroup; + this.identifier = identifier; + } + + public ItemGroup getItemGroup() { + if (itemGroupSupplier != null) + return itemGroupSupplier.get(); + return itemGroup; + } } // グループ予約済みアイテムスタック public static class BookingStack { + @Deprecated public ItemGroup itemGroup; + + public Supplier itemGroupSupplier; public ItemStack stack; + + @Deprecated private BookingStack(ItemGroup itemGroup, ItemStack stack) { this.itemGroup = itemGroup; this.stack = stack; } + + private BookingStack(Supplier itemGroup, ItemStack stack) { + this.itemGroupSupplier = itemGroup; + this.stack = stack; + } + + public ItemGroup getItemGroup() { + if (itemGroupSupplier != null) + return itemGroupSupplier.get(); + return itemGroup; + } } public static void allRegister() { if (!bookingItems.isEmpty()) { for (BookingItem bookingItem : bookingItems) { - CreativeTabRegistry.appendBuiltin(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtil.fromId(bookingItem.identifier)); } bookingItems = new ArrayList<>(); } if (!bookingStacks.isEmpty()) { for (BookingStack bookingStack : bookingStacks) { - CreativeTabRegistry.appendBuiltinStack(bookingStack.itemGroup, bookingStack.stack); + CreativeTabRegistry.appendBuiltinStack(bookingStack.getItemGroup(), bookingStack.stack); } bookingStacks = new ArrayList<>(); } @@ -53,17 +86,27 @@ public static void register(Identifier identifier) { if (bookingItems.isEmpty()) return; for (BookingItem bookingItem : bookingItems) { if (!bookingItem.identifier.toString().equals(identifier.toString())) continue; - CreativeTabRegistry.appendBuiltin(bookingItem.itemGroup, ItemUtil.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtil.fromId(bookingItem.identifier)); bookingItems.remove(bookingItem); break; } } + @Deprecated public static void addItem(ItemGroup itemGroup, Identifier identifier) { bookingItems.add(new BookingItem(itemGroup, identifier)); } + @Deprecated public static void addStack(ItemGroup itemGroup, ItemStack stack) { bookingStacks.add(new BookingStack(itemGroup, stack)); } + + public static void addItem(Supplier itemGroup, Identifier identifier) { + bookingItems.add(new BookingItem(itemGroup, identifier)); + } + + public static void addStack(Supplier itemGroup, ItemStack stack) { + bookingStacks.add(new BookingStack(itemGroup, stack)); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java index 3cf61c0af..c785ae8c4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java @@ -4,19 +4,26 @@ import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; +import java.util.function.Supplier; + public class ExtendSettings extends Item.Settings { // ～1.19.2 + @Deprecated public ExtendSettings addGroup(ItemGroup itemGroup) { return this; } // 1.19.3～ // identifier: Item ID + @Deprecated public ExtendSettings addGroup(ItemGroup itemGroup, Identifier identifier) { CreativeTabManager.addItem(itemGroup, identifier); return this; } - + public ExtendSettings addGroup(Supplier itemGroup, Identifier identifier) { + CreativeTabManager.addItem(itemGroup, identifier); + return this; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java new file mode 100644 index 000000000..f7663da8e --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java @@ -0,0 +1,33 @@ +package ml.pkom.mcpitanlibarch.api.item.tool; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.item.PickaxeItem; + +public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { + public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleToolMaterial.java new file mode 100644 index 000000000..5a5636e9d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleToolMaterial.java @@ -0,0 +1,6 @@ +package ml.pkom.mcpitanlibarch.api.item.tool; + +import net.minecraft.item.ToolMaterial; + +public interface CompatibleToolMaterial extends ToolMaterial { +} diff --git a/info.properties b/info.properties index 6dc2b24a9..a75bdab75 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.6 +mod_version=1.8.7 maven_group=ml.pkom \ No newline at end of file From e19738c5acf87ecee82d423d4109df3c4bfef7ef Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:52:08 +0900 Subject: [PATCH 209/622] add apis --- .../api/command/ConfigCommand.java | 6 ++-- .../api/item/tool/CompatibleAxeItem.java | 34 +++++++++++++++++++ .../api/item/tool/CompatibleHoeItem.java | 34 +++++++++++++++++++ .../api/item/tool/CompatibleShovelItem.java | 34 +++++++++++++++++++ .../api/item/tool/CompatibleSwordItem.java | 34 +++++++++++++++++++ info.properties | 2 +- 6 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java index 0a3193c05..9fd2a0223 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java @@ -15,7 +15,7 @@ public class ConfigCommand extends LiteralCommand { public final Config config; public File file; - public Supplier defaultConfigFunction; + public Supplier defaultConfigFunction; public String prefix = "[MCPitanLib]"; public ConfigCommand(Config config, File file, String prefix) { @@ -24,14 +24,14 @@ public ConfigCommand(Config config, File file, String prefix) { this.prefix = prefix; } - public ConfigCommand(Config config, File file, String prefix, @Nullable Supplier supplier) { + public ConfigCommand(Config config, File file, String prefix, @Nullable Supplier supplier) { this.config = config; this.file = file; this.defaultConfigFunction = supplier; this.prefix = prefix; } - public ConfigCommand(Config config, File file, @Nullable Supplier supplier) { + public ConfigCommand(Config config, File file, @Nullable Supplier supplier) { this.config = config; this.file = file; this.defaultConfigFunction = supplier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java new file mode 100644 index 000000000..2c7774e9c --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java @@ -0,0 +1,34 @@ +package ml.pkom.mcpitanlibarch.api.item.tool; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.minecraft.block.BlockState; +import net.minecraft.item.AxeItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.PickaxeItem; + +public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { + public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java new file mode 100644 index 000000000..e0b9cc8e5 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java @@ -0,0 +1,34 @@ +package ml.pkom.mcpitanlibarch.api.item.tool; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.minecraft.block.BlockState; +import net.minecraft.item.AxeItem; +import net.minecraft.item.HoeItem; +import net.minecraft.item.ItemStack; + +public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { + public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java new file mode 100644 index 000000000..21f148427 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java @@ -0,0 +1,34 @@ +package ml.pkom.mcpitanlibarch.api.item.tool; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.minecraft.block.BlockState; +import net.minecraft.item.AxeItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ShovelItem; + +public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { + public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java new file mode 100644 index 000000000..caea5ed36 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java @@ -0,0 +1,34 @@ +package ml.pkom.mcpitanlibarch.api.item.tool; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.minecraft.block.BlockState; +import net.minecraft.item.AxeItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.SwordItem; + +public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { + public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } +} diff --git a/info.properties b/info.properties index a75bdab75..f67c576c2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.7 +mod_version=1.8.8 maven_group=ml.pkom \ No newline at end of file From 59fef02dd7120b97a5fdf271ffa187f5ba5e57f3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 7 Feb 2024 22:09:10 +0900 Subject: [PATCH 210/622] add apis --- .../api/command/ConfigCommand.java | 112 +++++++++++------- info.properties | 2 +- 2 files changed, 68 insertions(+), 46 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java index 9fd2a0223..c4161b31c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java @@ -50,73 +50,95 @@ public ConfigCommand(Config config) { public void init(CommandSettings settings) { settings.permissionLevel(3); - addArgumentCommand("set", new StringCommand() { + addArgumentCommand("set", new LiteralCommand() { @Override - public String getArgumentName() { - return "key"; + public void init(CommandSettings settings) { + + addArgumentCommand("key", new StringCommand() { + @Override + public String getArgumentName() { + return "key"; + } + + + @Override + public void init(CommandSettings settings) { + + addArgumentCommand("value", new StringCommand() { + @Override + public String getArgumentName() { + return "value"; + } + + @Override + public void execute(StringCommandEvent event) { + String key = StringArgumentType.getString(event.context, "key"); + String value = StringArgumentType.getString(event.context, "value"); + if (config.get(key) == null) { + event.sendFailure(TextUtil.literal(prefix + " Key not found.")); + return; + } + if (config.get(key).getClass() == String.class) { + config.setString(key, value); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else if (config.get(key).getClass() == Integer.class) { + config.setInt(key, Integer.parseInt(value)); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else if (config.get(key).getClass() == Double.class) { + config.setDouble(key, Double.parseDouble(value)); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else if (config.get(key).getClass() == Boolean.class) { + config.setBoolean(key, Boolean.parseBoolean(value)); + event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); + + } else { + event.sendFailure(TextUtil.literal(prefix + " Not supported type.")); + } + if (file != null) + config.save(file); + } + }); + } + + @Override + public void execute(StringCommandEvent event) { + } + }); } @Override - public void init(CommandSettings settings) { + public void execute(ServerCommandEvent event) { + + } + }); - addArgumentCommand("value", new StringCommand() { + addArgumentCommand("get", new LiteralCommand() { + @Override + public void init(CommandSettings settings) { + addArgumentCommand("key", new StringCommand() { @Override public String getArgumentName() { - return "value"; + return "key"; } @Override public void execute(StringCommandEvent event) { String key = StringArgumentType.getString(event.context, "key"); - String value = StringArgumentType.getString(event.context, "value"); if (config.get(key) == null) { event.sendFailure(TextUtil.literal(prefix + " Key not found.")); return; } - if (config.get(key).getClass() == String.class) { - config.setString(key, value); - event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); - - } else if (config.get(key).getClass() == Integer.class) { - config.setInt(key, Integer.parseInt(value)); - event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); - - } else if (config.get(key).getClass() == Double.class) { - config.setDouble(key, Double.parseDouble(value)); - event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); - - } else if (config.get(key).getClass() == Boolean.class) { - config.setBoolean(key, Boolean.parseBoolean(value)); - event.sendSuccess(TextUtil.literal(prefix + " Set " + key + " to " + value), false); - - } else { - event.sendFailure(TextUtil.literal(prefix + " Not supported type.")); - } - if (file != null) - config.save(file); + event.sendSuccess(TextUtil.literal(prefix + " " + key + ": " + config.get(key).toString()), false); } }); } @Override - public void execute(StringCommandEvent event) { - } - }); - - addArgumentCommand("get", new StringCommand() { - @Override - public String getArgumentName() { - return "key"; - } + public void execute(ServerCommandEvent event) { - @Override - public void execute(StringCommandEvent event) { - String key = StringArgumentType.getString(event.context, "key"); - if (config.get(key) == null) { - event.sendFailure(TextUtil.literal(prefix + " Key not found.")); - return; - } - event.sendSuccess(TextUtil.literal(prefix + " " + key + ": " + config.get(key).toString()), false); } }); diff --git a/info.properties b/info.properties index f67c576c2..b6e970562 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.8 +mod_version=1.8.9 maven_group=ml.pkom \ No newline at end of file From cdfefd729b4627aa860b05c3da79ed804a46363e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 8 Feb 2024 17:18:47 +0900 Subject: [PATCH 211/622] add APIs --- .../mcpitanlibarch/api/block/ExtendBlock.java | 38 ++++++++++++-- .../api/event/block/BlockBreakEvent.java | 46 +++++++++++++++++ .../api/event/block/BlockPlacedEvent.java | 49 +++++++++++++++++++ .../api/event/block/BlockUseEvent.java | 4 ++ .../api/event/block/PickStackEvent.java | 44 +++++++++++++++++ .../api/event/item/CraftEvent.java | 27 ++++++++++ .../api/event/item/ItemFinishUsingEvent.java | 4 ++ .../api/event/item/ItemUseEvent.java | 5 +- .../api/event/item/ItemUseOnEntityEvent.java | 4 ++ .../mcpitanlibarch/api/item/ExtendItem.java | 10 ++++ .../api/item/tool/CompatibleAxeItem.java | 5 ++ .../api/item/tool/CompatibleHoeItem.java | 5 ++ .../api/item/tool/CompatiblePickaxeItem.java | 5 ++ .../api/item/tool/CompatibleShovelItem.java | 6 ++- .../api/item/tool/CompatibleSwordItem.java | 5 ++ .../mcpitanlibarch/api/util/WorldUtil.java | 12 +++++ .../api/util/client/ScreenUtil.java | 9 ++++ 17 files changed, 272 insertions(+), 6 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockBreakEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockPlacedEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/CraftEvent.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index d1657e932..8a7294d17 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -1,14 +1,13 @@ package ml.pkom.mcpitanlibarch.api.block; -import ml.pkom.mcpitanlibarch.api.event.block.BlockScheduledTickEvent; -import ml.pkom.mcpitanlibarch.api.event.block.BlockUseEvent; -import ml.pkom.mcpitanlibarch.api.event.block.OutlineShapeEvent; -import ml.pkom.mcpitanlibarch.api.event.block.ScreenHandlerCreateEvent; +import ml.pkom.mcpitanlibarch.api.event.block.*; import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; @@ -23,6 +22,7 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; +import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; public class ExtendBlock extends Block { @@ -86,4 +86,34 @@ public ScreenHandler createScreenHandler(ScreenHandlerCreateEvent event) { public Text getScreenTitle() { return TextUtil.literal(""); } + + @Override + @Deprecated + public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack itemStack) { + onPlaced(new BlockPlacedEvent(world, pos, state, placer, itemStack)); + } + + public void onPlaced(BlockPlacedEvent event) { + super.onPlaced(event.world, event.pos, event.state, event.placer, event.stack); + } + + @Override + @Deprecated + public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { + return onBreak(new BlockBreakEvent(world, pos, state, player)); + } + + public BlockState onBreak(BlockBreakEvent event) { + return super.onBreak(event.world, event.pos, event.state, event.getPlayerEntity()); + } + + @Override + @Deprecated + public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) { + return getPickStack(new PickStackEvent(world, pos, state)); + } + + public ItemStack getPickStack(PickStackEvent event) { + return super.getPickStack(event.worldView, event.pos, event.state); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockBreakEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockBreakEvent.java new file mode 100644 index 000000000..1be1588d5 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockBreakEvent.java @@ -0,0 +1,46 @@ +package ml.pkom.mcpitanlibarch.api.event.block; + +import ml.pkom.mcpitanlibarch.api.entity.Player; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockBreakEvent extends BaseEvent { + public World world; + public BlockPos pos; + public BlockState state; + public Player player; + + public BlockBreakEvent(World world, BlockPos pos, BlockState state, PlayerEntity player) { + this.world = world; + this.pos = pos; + this.state = state; + this.player = new Player(player); + } + + public BlockPos getPos() { + return pos; + } + + public BlockState getState() { + return state; + } + + public Player getPlayer() { + return player; + } + + public PlayerEntity getPlayerEntity() { + return player.getPlayerEntity(); + } + + public World getWorld() { + return world; + } + + public boolean isClient() { + return world.isClient(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockPlacedEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockPlacedEvent.java new file mode 100644 index 000000000..e69aba827 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockPlacedEvent.java @@ -0,0 +1,49 @@ +package ml.pkom.mcpitanlibarch.api.event.block; + +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class BlockPlacedEvent extends BaseEvent { + + public World world; + public BlockPos pos; + public BlockState state; + public LivingEntity placer; + public ItemStack stack; + + public BlockPlacedEvent(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack itemStack) { + this.world = world; + this.pos = pos; + this.state = state; + this.placer = placer; + this.stack = itemStack; + } + + public BlockState getState() { + return state; + } + + public BlockPos getPos() { + return pos; + } + + public World getWorld() { + return world; + } + + public ItemStack getStack() { + return stack; + } + + public LivingEntity getPlacer() { + return placer; + } + + public boolean isClient() { + return world.isClient(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java index 59f3bb3a2..0e8a63f39 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java @@ -56,4 +56,8 @@ public BlockState getState() { public BlockPos getPos() { return pos; } + + public boolean isClient() { + return world.isClient(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java new file mode 100644 index 000000000..7b569071c --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java @@ -0,0 +1,44 @@ +package ml.pkom.mcpitanlibarch.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; +import org.jetbrains.annotations.Nullable; + +public class PickStackEvent { + + @Deprecated + public WorldView worldView; + + @Deprecated + public BlockView blockView; + + public BlockPos pos; + public BlockState state; + + + public PickStackEvent(WorldView world, BlockPos pos, BlockState state) { + } + + public PickStackEvent(BlockView world, BlockPos pos, BlockState state) { + } + + public BlockState getState() { + return state; + } + + public BlockPos getPos() { + return pos; + } + + @Nullable + public BlockView getBlockView() { + return blockView; + } + + @Nullable + public WorldView getWorldView() { + return worldView; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/CraftEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/CraftEvent.java new file mode 100644 index 000000000..eb9a25cb1 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/CraftEvent.java @@ -0,0 +1,27 @@ +package ml.pkom.mcpitanlibarch.api.event.item; + +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class CraftEvent { + + public ItemStack stack; + public World world; + + public CraftEvent(ItemStack stack, World world) { + this.stack = stack; + this.world = world; + } + + public ItemStack getStack() { + return stack; + } + + public World getWorld() { + return world; + } + + public boolean isClient() { + return world.isClient(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java index a0dc5c5ac..6e68eaa8a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java @@ -27,4 +27,8 @@ public World getWorld() { public LivingEntity getUser() { return user; } + + public boolean isClient() { + return world.isClient(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java index 7174881f9..abcd3998d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java @@ -32,8 +32,11 @@ public Hand getHand() { public World getWorld() { return world; } - public Player getUser() { return user; } + + public boolean isClient() { + return world.isClient(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java index d27ca6563..9a100811f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java @@ -36,4 +36,8 @@ public Player getUser() { public LivingEntity getEntity() { return entity; } + + public boolean isClient() { + return user.isClient(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java index a95f4216d..3bad0c7b1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java @@ -98,4 +98,14 @@ public boolean hasRecipeRemainder(Dummy dummy) { public void appendTooltip(ItemAppendTooltipEvent event) { super.appendTooltip(event.stack, event.world, event.tooltip, event.context); } + + @Deprecated + @Override + public void onCraft(ItemStack stack, World world) { + onCraft(new CraftEvent(stack, world)); + } + + public void onCraft(CraftEvent event) { + super.onCraft(event.stack, event.world); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java index 2c7774e9c..170fa5718 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java @@ -6,12 +6,17 @@ import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterial; public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } + public CompatibleAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + public boolean overrideIsSuitableFor(BlockState state) { return super.isSuitableFor(state); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java index e0b9cc8e5..70961ea65 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java @@ -6,12 +6,17 @@ import net.minecraft.item.AxeItem; import net.minecraft.item.HoeItem; import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolMaterial; public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } + public CompatibleHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + public boolean overrideIsSuitableFor(BlockState state) { return super.isSuitableFor(state); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java index f7663da8e..b8e0ce54c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java @@ -5,12 +5,17 @@ import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterial; public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } + public CompatiblePickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + public boolean overrideIsSuitableFor(BlockState state) { return super.isSuitableFor(state); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java index 21f148427..60adc5050 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java @@ -3,15 +3,19 @@ import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; -import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.ShovelItem; +import net.minecraft.item.ToolMaterial; public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } + public CompatibleShovelItem(ToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + public boolean overrideIsSuitableFor(BlockState state) { return super.isSuitableFor(state); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java index caea5ed36..2dd96c05d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java @@ -6,12 +6,17 @@ import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolMaterial; public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } + public CompatibleSwordItem(ToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + super(material, attackDamage, attackSpeed, settings.build()); + } + public boolean overrideIsSuitableFor(BlockState state) { return super.isSuitableFor(state); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index 5f409e491..9ef1a193b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -131,4 +131,16 @@ public static void addTicket(ServerWorld world, ChunkTicketType type, Chu public static void removeTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius, T argument) { world.getChunkManager().removeTicket(type, pos, radius, argument); } + + public static boolean isReceivingRedstonePower(World world, BlockPos pos) { + return world.isReceivingRedstonePower(pos); + } + + public static int getBottomY(World world) { + return world.getBottomY(); + } + + public static int getTopY(World world) { + return world.getTopY(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java index 735023e3f..e29b08f53 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java @@ -6,6 +6,7 @@ import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -129,5 +130,13 @@ public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, in public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, float u, float v, int width, int height) { drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, 256, 256); } + + public static TextRenderer getTextRenderer() { + return MinecraftClient.getInstance().textRenderer; + } + } + + public static int getWidth(Text text) { + return RendererUtil.getTextRenderer().getWidth(text); } } From 489d25c627785a3af98a7d11a0d204d82b270e6a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 8 Feb 2024 23:38:11 +0900 Subject: [PATCH 212/622] add APIs, fix APIs --- .../mcpitanlibarch/api/block/ExtendBlock.java | 12 +++++- .../api/event/block/StateReplacedEvent.java | 43 +++++++++++++++++++ .../api/item/tool/CompatibleAxeItem.java | 2 +- .../api/item/tool/CompatibleHoeItem.java | 2 +- .../api/item/tool/CompatiblePickaxeItem.java | 2 +- .../api/item/tool/CompatibleShovelItem.java | 2 +- .../api/item/tool/CompatibleSwordItem.java | 2 +- .../mcpitanlibarch/api/util/WorldUtil.java | 4 ++ .../api/util/event/BlockEventGenerator.java | 20 +++++++++ .../api/util/event/ItemEventGenerator.java | 12 ++++++ info.properties | 2 +- 11 files changed, 96 insertions(+), 7 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/BlockEventGenerator.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/ItemEventGenerator.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index 8a7294d17..0ff501058 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -41,7 +41,7 @@ public VoxelShape getOutlineShape(OutlineShapeEvent event) { @Deprecated @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return super.getOutlineShape(state, world, pos, context); + return getOutlineShape(new OutlineShapeEvent(state, world, pos, context)); } public void scheduledTick(BlockScheduledTickEvent event) { @@ -116,4 +116,14 @@ public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) { public ItemStack getPickStack(PickStackEvent event) { return super.getPickStack(event.worldView, event.pos, event.state); } + + @Override + @Deprecated + public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { + onStateReplaced(new StateReplacedEvent(state, world, pos, newState, moved)); + } + + public void onStateReplaced(StateReplacedEvent event) { + super.onStateReplaced(event.state, event.world, event.pos, event.newState, event.moved); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java new file mode 100644 index 000000000..16fc2c6e3 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java @@ -0,0 +1,43 @@ +package ml.pkom.mcpitanlibarch.api.event.block; + +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class StateReplacedEvent extends BaseEvent { + + public BlockState state; + public World world; + public BlockPos pos; + public BlockState newState; + public boolean moved; + + public StateReplacedEvent(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { + super(); + } + + public BlockState getState() { + return state; + } + + public World getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public BlockState getNewState() { + return newState; + } + + public boolean isMoved() { + return moved; + } + + public boolean isClient() { + return world.isClient(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java index 170fa5718..dbb4a43e5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java @@ -13,7 +13,7 @@ public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, fl super(material, attackDamage, attackSpeed, settings.build()); } - public CompatibleAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { + public CompatibleAxeItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java index 70961ea65..45758e496 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java @@ -13,7 +13,7 @@ public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, floa super(material, attackDamage, attackSpeed, settings.build()); } - public CompatibleHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + public CompatibleHoeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java index b8e0ce54c..0aa7f3863 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java @@ -12,7 +12,7 @@ public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, super(material, attackDamage, attackSpeed, settings.build()); } - public CompatiblePickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + public CompatiblePickaxeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java index 60adc5050..b466617cb 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java @@ -12,7 +12,7 @@ public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, super(material, attackDamage, attackSpeed, settings.build()); } - public CompatibleShovelItem(ToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { + public CompatibleShovelItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java index 2dd96c05d..de76d31e9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java @@ -13,7 +13,7 @@ public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, fl super(material, attackDamage, attackSpeed, settings.build()); } - public CompatibleSwordItem(ToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { + public CompatibleSwordItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, attackDamage, attackSpeed, settings.build()); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java index 9ef1a193b..fd9fc4617 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java @@ -143,4 +143,8 @@ public static int getBottomY(World world) { public static int getTopY(World world) { return world.getTopY(); } + + public static int getDimensionHeight(World world) { + return world.getDimension().height(); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/BlockEventGenerator.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/BlockEventGenerator.java new file mode 100644 index 000000000..d7429378a --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/BlockEventGenerator.java @@ -0,0 +1,20 @@ +package ml.pkom.mcpitanlibarch.api.util.event; + +import ml.pkom.mcpitanlibarch.api.event.block.BlockBreakEvent; +import ml.pkom.mcpitanlibarch.api.event.block.BlockPlacedEvent; +import ml.pkom.mcpitanlibarch.api.event.block.StateReplacedEvent; +import net.minecraft.block.Block; + +public class BlockEventGenerator { + public static void onPlaced(Block block, BlockPlacedEvent e) { + block.onPlaced(e.world, e.pos, e.state, e.placer, e.stack); + } + + public static void onBreak(Block block, BlockBreakEvent e) { + block.onBreak(e.world, e.pos, e.state, e.getPlayerEntity()); + } + + public static void onStateReplaced(Block block, StateReplacedEvent e) { + block.onStateReplaced(e.state, e.world, e.pos, e.newState, e.moved); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/ItemEventGenerator.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/ItemEventGenerator.java new file mode 100644 index 000000000..4bc9991a2 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/ItemEventGenerator.java @@ -0,0 +1,12 @@ +package ml.pkom.mcpitanlibarch.api.util.event; + +import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.TypedActionResult; + +public class ItemEventGenerator { + public static TypedActionResult onRightClick(Item item, ItemUseEvent e) { + return item.use(e.world, e.user.getPlayerEntity(), e.hand); + } +} diff --git a/info.properties b/info.properties index b6e970562..93489e298 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.8.9 +mod_version=1.9.0 maven_group=ml.pkom \ No newline at end of file From b3e4265d6005a508483a76ba9140d42ec2c48a17 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Fri, 9 Feb 2024 10:58:23 +0900 Subject: [PATCH 213/622] fix APIs add Debug mode --- .../java/ml/pkom/easyapi/config/Config.java | 85 +++++++++++++++++++ .../pkom/mcpitanlibarch/MCPitanLibarch.java | 38 +++++++-- .../mcpitanlibarch/api/block/ExtendBlock.java | 10 +-- .../api/event/block/StateReplacedEvent.java | 6 +- .../event/block/result/BlockBreakResult.java | 15 ++++ .../pkom/mcpitanlibarch/debug/DebugTool.java | 27 ++++++ info.properties | 2 +- 7 files changed, 171 insertions(+), 12 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/result/BlockBreakResult.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/debug/DebugTool.java diff --git a/common/src/main/java/ml/pkom/easyapi/config/Config.java b/common/src/main/java/ml/pkom/easyapi/config/Config.java index 3d80d0693..108f5a536 100644 --- a/common/src/main/java/ml/pkom/easyapi/config/Config.java +++ b/common/src/main/java/ml/pkom/easyapi/config/Config.java @@ -128,6 +128,80 @@ public boolean getBoolean(String key) { } } + /** + * マップのキーから値を取得、存在しない場合はデフォルト値を返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public Object getOrDefault(String key, Object defaultValue) { + if (has(key)) { + return get(key); + } + return defaultValue; + } + + /** + * マップのキーから値(文字列)を取得、存在しない場合はデフォルト値を返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public String getStringOrDefault(String key, String defaultValue) { + if (has(key)) { + return getString(key); + } + return defaultValue; + } + + /** + * マップのキーから値(数値)を取得、存在しない場合はデフォルト値を返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public int getIntOrDefault(String key, int defaultValue) { + if (has(key)) { + return getInt(key); + } + return defaultValue; + } + + /** + * マップのキーから値(数値)を取得、存在しない場合はデフォルト値を返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public double getDoubleOrDefault(String key, double defaultValue) { + if (has(key)) { + return getDouble(key); + } + return defaultValue; + } + /** + * マップのキーから値(真偽値)を取得、存在しない場合はデフォルト値を返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public boolean getBooleanOrDefault(String key, boolean defaultValue) { + if (has(key)) { + return getBoolean(key); + } + return defaultValue; + } + /** * マップのキーに値をセット * "."でパスを区切る @@ -219,6 +293,17 @@ public boolean setBoolean(String key, boolean value) { return set(key, value); } + /** + * マップのキーから値を削除 + * "."でパスを区切る + * + * @param key キー + * @return 真偽値 + */ + public boolean remove(String key) { + return configMap.remove(key) != null; + } + /** * StringをFileにして読み込み、継承先で処理 * diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index df8f887e4..08d57371a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -2,7 +2,10 @@ import ml.pkom.easyapi.config.Config; import ml.pkom.easyapi.config.JsonConfig; +import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; +import ml.pkom.mcpitanlibarch.debug.DebugTool; +import net.minecraft.util.Identifier; import java.io.File; import java.util.ArrayList; @@ -20,15 +23,28 @@ public class MCPitanLibarch { public static List itemBlackList = new ArrayList<>(); public static List blockBlackList = new ArrayList<>(); + // MCPitanLibのアイテム、ブロック、タイルエンティティの登録 + public static ArchRegistry registry = ArchRegistry.createRegistry(MOD_ID); + + /** + * MCPitanLibの初期化 + */ public static void init() { configInit(); - /* - if (PlatformUtil.isDevelopmentEnvironment()) { + + if (PlatformUtil.isDevelopmentEnvironment() || (config.has("debugMode") && config.getBoolean("debugMode"))) { + System.out.println("MCPitanLib: Debug Mode"); + DebugTool.register(); + registry.allRegister(); + /* ExampleMod.init(); + */ } - */ } + /** + * Configの初期化 + */ public static void configInit() { try { if (configLoaded) return; @@ -39,14 +55,18 @@ public static void configInit() { config.setString("item", "examplemod:hogehoge_item,examplemod:fuga_item"); config.setString("block", "examplemod:hogehoge_block,examplemod:fuga_block"); + config.setBoolean("debugMode", false); if (configFile.exists()) config.load(configFile); - if (config.configMap.containsKey("item")) + if (!config.has("debugMode")) + config.setBoolean("debugMode", false); + + if (config.has("item")) itemBlackList.addAll(Arrays.asList(config.getString("item").split(","))); - if (config.configMap.containsKey("block")) + if (config.has("block")) blockBlackList.addAll(Arrays.asList(config.getString("block").split(","))); config.save(configFile); @@ -55,4 +75,12 @@ public static void configInit() { } } + /** + * Identifierを生成 + * @param path パス + * @return Identifier + */ + public static Identifier id(String path) { + return new Identifier(MOD_ID, path); + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index 0ff501058..edad56e32 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -1,6 +1,7 @@ package ml.pkom.mcpitanlibarch.api.block; import ml.pkom.mcpitanlibarch.api.event.block.*; +import ml.pkom.mcpitanlibarch.api.event.block.result.BlockBreakResult; import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -21,8 +22,6 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; - -import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; public class ExtendBlock extends Block { @@ -100,11 +99,12 @@ public void onPlaced(BlockPlacedEvent event) { @Override @Deprecated public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) { - return onBreak(new BlockBreakEvent(world, pos, state, player)); + return onBreak(new BlockBreakEvent(world, pos, state, player)).state; } - public BlockState onBreak(BlockBreakEvent event) { - return super.onBreak(event.world, event.pos, event.state, event.getPlayerEntity()); + public BlockBreakResult onBreak(BlockBreakEvent event) { + BlockState state = super.onBreak(event.world, event.pos, event.state, event.getPlayerEntity()); + return new BlockBreakResult(state); } @Override diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java index 16fc2c6e3..77a0d2efc 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java @@ -14,7 +14,11 @@ public class StateReplacedEvent extends BaseEvent { public boolean moved; public StateReplacedEvent(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { - super(); + this.state = state; + this.world = world; + this.pos = pos; + this.newState = newState; + this.moved = moved; } public BlockState getState() { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/result/BlockBreakResult.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/result/BlockBreakResult.java new file mode 100644 index 000000000..35c8ab0cb --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/result/BlockBreakResult.java @@ -0,0 +1,15 @@ +package ml.pkom.mcpitanlibarch.api.event.block.result; + +import net.minecraft.block.BlockState; + +public class BlockBreakResult { + public BlockState state; + + public BlockBreakResult(BlockState state) { + this.state = state; + } + + public BlockState getState() { + return state; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/debug/DebugTool.java b/common/src/main/java/ml/pkom/mcpitanlibarch/debug/DebugTool.java new file mode 100644 index 000000000..3c32c402d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/debug/DebugTool.java @@ -0,0 +1,27 @@ +package ml.pkom.mcpitanlibarch.debug; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.item.ExtendItem; + +import static ml.pkom.mcpitanlibarch.MCPitanLibarch.*; + +/** + * A tool for debugging. + * Example of condition: item instance DebugTool + */ +public class DebugTool extends ExtendItem { + + public static CompatibleItemSettings defaultSettings = CompatibleItemSettings.of(); + + public DebugTool() { + super(defaultSettings); + } + + public static void debug(String message) { + System.out.println(message); + } + + public static void register() { + registry.registerItem(id("debug_tool"), DebugTool::new); + } +} diff --git a/info.properties b/info.properties index 93489e298..519038be4 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.9.0 +mod_version=1.9.1 maven_group=ml.pkom \ No newline at end of file From 31fef253f5c339f1b33377e17f831bb2df49cdaf Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 9 Feb 2024 11:00:59 +0900 Subject: [PATCH 214/622] 1204 --- .../main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index edad56e32..40dd2b89f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -22,6 +22,7 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; public class ExtendBlock extends Block { From 4b7742d5f793b676c3a2862544a805c3e8f1e3ef Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 11 Feb 2024 21:46:46 +0900 Subject: [PATCH 215/622] Add APIs --- .../mcpitanlibarch/api/util/math/BoxUtil.java | 38 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/BoxUtil.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/BoxUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/BoxUtil.java new file mode 100644 index 000000000..aa85c9ee7 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/BoxUtil.java @@ -0,0 +1,38 @@ +package ml.pkom.mcpitanlibarch.api.util.math; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; + +public class BoxUtil { + public static Box createBox(double x1, double y1, double z1, double x2, double y2, double z2) { + return new Box(x1, y1, z1, x2, y2, z2); + } + + public static Box createBox(double x, double y, double z, double size) { + return new Box(x, y, z, x + size, y + size, z + size); + } + + public static Box createBox(double size) { + return new Box(0, 0, 0, size, size, size); + } + + public static Box createBox(double x1, double y1, double z1, double x2, double y2, double z2, double size) { + return new Box(x1, y1, z1, x2 + size, y2 + size, z2 + size); + } + + public static Box createBox(BlockPos pos) { + return new Box(pos); + } + + public static Box createBox(BlockPos pos1, BlockPos pos2) { + return new Box(pos1.toCenterPos(), pos2.toCenterPos()); + } + + public static Box createBox(BlockPos pos, int size) { + return createBox(pos, pos.add(size, size, size)); + } + + public static Box createBox(BlockPos pos, int sizeX, int sizeY, int sizeZ) { + return createBox(pos, pos.add(sizeX, sizeY, sizeZ)); + } +} diff --git a/info.properties b/info.properties index 519038be4..049fba26a 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.9.1 +mod_version=1.9.2 maven_group=ml.pkom \ No newline at end of file From 522229da0aae8b19e25bd5898eec81661ab3e6f3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 12 Feb 2024 23:05:53 +0900 Subject: [PATCH 216/622] v1.9.3 add APIs, fix APIs embed cloth config api --- .../pkom/mcpitanlibarch/MCPitanLibarch.java | 16 +++++ .../api/event/block/BlockUseEvent.java | 17 +++++ .../api/event/item/ItemUseEvent.java | 17 +++++ .../api/event/item/ItemUseOnBlockEvent.java | 17 +++++ .../api/event/item/ItemUseOnEntityEvent.java | 17 +++++ .../api/event/registry/RegistryEvent.java | 18 +----- .../api/event/registry/RegistryResult.java | 22 +++++++ .../api/event/v0/RecipeManagerRegistry.java | 19 ++++++ .../event/v0/event/RecipeManagerEvent.java | 49 +++++++++++++++ .../api/recipe/CompatibleRecipeEntry.java | 63 +++++++++++++++++++ .../api/registry/ArchRegistry.java | 50 +++++++-------- .../api/util/CompatibleRecipeEntryUtil.java | 13 ++++ .../mixin/RecipeManagerMixin.java | 30 +++++++++ .../pkom/mcpitanlibarch/test/ExampleMod.java | 16 ++--- .../mcpitanlibarch-common.mixins.json | 1 + fabric/build.gradle | 5 ++ gradle.properties | 2 + info.properties | 2 +- 18 files changed, 324 insertions(+), 50 deletions(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryResult.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/RecipeManagerRegistry.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/CompatibleRecipeEntryUtil.java create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/mixin/RecipeManagerMixin.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java index 08d57371a..33619ca63 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java @@ -83,4 +83,20 @@ public static void configInit() { public static Identifier id(String path) { return new Identifier(MOD_ID, path); } + + public static boolean isItemBlackListed(Identifier id) { + try { + return itemBlackList.contains(id.toString()); + } catch (Exception e) { + return false; + } + } + + public static boolean isBlockBlackListed(Identifier id) { + try { + return blockBlackList.contains(id.toString()); + } catch (Exception e) { + return false; + } + } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java index 0e8a63f39..97efd637a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java @@ -5,6 +5,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -60,4 +61,20 @@ public BlockPos getPos() { public boolean isClient() { return world.isClient(); } + + public ActionResult success() { + return ActionResult.SUCCESS; + } + + public ActionResult fail() { + return ActionResult.FAIL; + } + + public ActionResult pass() { + return ActionResult.PASS; + } + + public ActionResult consume() { + return ActionResult.CONSUME; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java index abcd3998d..30a675cd2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; public class ItemUseEvent extends BaseEvent { @@ -39,4 +40,20 @@ public Player getUser() { public boolean isClient() { return world.isClient(); } + + public TypedActionResult success(ItemStack stack) { + return TypedActionResult.success(stack); + } + + public TypedActionResult fail() { + return TypedActionResult.fail(stack); + } + + public TypedActionResult pass() { + return TypedActionResult.pass(stack); + } + + public TypedActionResult consume() { + return TypedActionResult.consume(stack); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java index 8be6ffbb6..063d70c0a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java @@ -5,6 +5,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -65,4 +66,20 @@ public Hand getHand() { public ItemStack getStack() { return stack; } + + public ActionResult success() { + return ActionResult.SUCCESS; + } + + public ActionResult fail() { + return ActionResult.FAIL; + } + + public ActionResult pass() { + return ActionResult.PASS; + } + + public ActionResult consume() { + return ActionResult.CONSUME; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java index 9a100811f..e825bce27 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java @@ -5,6 +5,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; public class ItemUseOnEntityEvent extends BaseEvent { @@ -40,4 +41,20 @@ public LivingEntity getEntity() { public boolean isClient() { return user.isClient(); } + + public ActionResult success() { + return ActionResult.SUCCESS; + } + + public ActionResult fail() { + return ActionResult.FAIL; + } + + public ActionResult pass() { + return ActionResult.PASS; + } + + public ActionResult consume() { + return ActionResult.CONSUME; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java index ed254d10b..6556ba25d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java @@ -1,23 +1,9 @@ package ml.pkom.mcpitanlibarch.api.event.registry; import dev.architectury.registry.registries.RegistrySupplier; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; - -import org.jetbrains.annotations.Nullable; - -public class RegistryEvent extends BaseEvent { - public RegistrySupplier supplier; +public class RegistryEvent extends RegistryResult { public RegistryEvent(RegistrySupplier supplier) { - this.supplier = supplier; - } - - public T get() { - return supplier.get(); - } - - @Nullable - public T getOrNull() { - return supplier.getOrNull(); + super(supplier); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryResult.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryResult.java new file mode 100644 index 000000000..524982dad --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryResult.java @@ -0,0 +1,22 @@ +package ml.pkom.mcpitanlibarch.api.event.registry; + +import dev.architectury.registry.registries.RegistrySupplier; +import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import org.jetbrains.annotations.Nullable; + +public class RegistryResult extends BaseEvent { + public RegistrySupplier supplier; + + public RegistryResult(RegistrySupplier supplier) { + this.supplier = supplier; + } + + public T get() { + return supplier.get(); + } + + @Nullable + public T getOrNull() { + return supplier.getOrNull(); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/RecipeManagerRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/RecipeManagerRegistry.java new file mode 100644 index 000000000..b17acc889 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/RecipeManagerRegistry.java @@ -0,0 +1,19 @@ +package ml.pkom.mcpitanlibarch.api.event.v0; + +import ml.pkom.mcpitanlibarch.api.event.v0.event.RecipeManagerEvent; + +import java.util.ArrayList; +import java.util.List; + +public class RecipeManagerRegistry { + public static List managers = new ArrayList<>(); + + public static void register(CustomRecipeManager manager) { + managers.add(manager); + } + + @FunctionalInterface + public interface CustomRecipeManager { + void apply(RecipeManagerEvent event); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java new file mode 100644 index 000000000..4aa23e342 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java @@ -0,0 +1,49 @@ +package ml.pkom.mcpitanlibarch.api.event.v0.event; + +import com.google.common.collect.ImmutableMap; +import com.google.gson.JsonElement; +import ml.pkom.mcpitanlibarch.api.recipe.CompatibleRecipeEntry; +import net.minecraft.recipe.RecipeEntry; +import net.minecraft.recipe.RecipeType; +import net.minecraft.resource.ResourceManager; +import net.minecraft.util.Identifier; +import net.minecraft.util.profiler.Profiler; + +import java.util.Map; + +public class RecipeManagerEvent { + public Map jsonMap; + public ResourceManager resourceManager; + public Profiler profiler; + + @Deprecated + public Map, ImmutableMap.Builder>> map; + + public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, Map, ImmutableMap.Builder>> map2) { + this.jsonMap = map; + this.resourceManager = resourceManager; + this.profiler = profiler; + this.map = map2; + } + + public Map getJsonMap() { + return jsonMap; + } + + @Deprecated + public Map, ImmutableMap.Builder>> getMap() { + return map; + } + + public Profiler getProfiler() { + return profiler; + } + + public ResourceManager getResourceManager() { + return resourceManager; + } + + public void putCompatibleRecipeEntry(Identifier id, CompatibleRecipeEntry entry) { + map.get(entry.getType()).put(entry.getId(), entry.getRecipeEntry()); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java new file mode 100644 index 000000000..3668d910b --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java @@ -0,0 +1,63 @@ +package ml.pkom.mcpitanlibarch.api.recipe; + +import ml.pkom.mcpitanlibarch.api.util.RecipeUtil; +import net.minecraft.recipe.*; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +public class CompatibleRecipeEntry { + private final RecipeEntry entry; + + public String group = ""; + public RecipeUtil.CompatibilityCraftingRecipeCategory category = null; + + public CompatibleRecipeEntry(RecipeEntry entry) { + this.entry = entry; + } + + public CompatibleRecipeEntry(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ShapelessRecipe shapelessRecipe) { + this.entry = new RecipeEntry<>(id, shapelessRecipe); + this.group = group; + this.category = category; + } + + @Deprecated + public RecipeEntry getRecipeEntry() { + return entry; + } + + public Recipe getRecipe() { + Object object = entry.value(); + if (object instanceof Recipe) { + return (Recipe) object; + } + return null; + } + + public Identifier getId() { + return entry.id(); + } + + public RecipeType getType() { + Recipe recipe = getRecipe(); + if (recipe == null) return null; + + return recipe.getType(); + } + + public RecipeSerializer getSerializer() { + Recipe recipe = getRecipe(); + if (recipe == null) return null; + + return recipe.getSerializer(); + } + + @Nullable + public RecipeUtil.CompatibilityCraftingRecipeCategory getCategory() { + return category; + } + + public String getGroup() { + return group; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 11f724900..4ee97a9ac 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -4,7 +4,7 @@ import ml.pkom.mcpitanlibarch.MCPitanLibarch; import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; -import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; +import ml.pkom.mcpitanlibarch.api.event.registry.RegistryResult; import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; @@ -41,62 +41,62 @@ public static ArchRegistry createRegistry(String MOD_ID) { return new ArchRegistry(MOD_ID); } - public RegistryEvent registerItem(Identifier id, Supplier supplier) { - if (MCPitanLibarch.itemBlackList.contains(id.toString())) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); + public RegistryResult registerItem(Identifier id, Supplier supplier) { + if (MCPitanLibarch.isItemBlackListed(id)) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); CreativeTabManager.register(id); - return new RegistryEvent<>(registrySupplier); + return new RegistryResult<>(registrySupplier); } - public RegistryEvent registerBlock(Identifier id, Supplier supplier) { - if (MCPitanLibarch.blockBlackList.contains(id.toString())) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); - return new RegistryEvent<>(mcplr.registryBlock(id, supplier)); + public RegistryResult registerBlock(Identifier id, Supplier supplier) { + if (MCPitanLibarch.isBlockBlackListed(id)) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); + return new RegistryResult<>(mcplr.registryBlock(id, supplier)); } - public RegistryEvent> registerScreenHandlerType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(mcplr.registryScreenHandlerType(id, supplier)); + public RegistryResult> registerScreenHandlerType(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryScreenHandlerType(id, supplier)); } @Deprecated - public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { + public RegistryResult> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { return registerScreenHandlerType(id, () -> supplier.get().build()); } - public RegistryEvent> registerMenu(Identifier id, Supplier> supplier) { + public RegistryResult> registerMenu(Identifier id, Supplier> supplier) { return registerScreenHandlerType(id, supplier); } - public RegistryEvent> registerBlockEntityType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(mcplr.registryBlockEntityType(id, supplier)); + public RegistryResult> registerBlockEntityType(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryBlockEntityType(id, supplier)); } - public RegistryEvent> registerEntity(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(mcplr.registryEntityType(id, supplier)); + public RegistryResult> registerEntity(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryEntityType(id, supplier)); } @Deprecated - public RegistryEvent registerSoundEvent(Identifier id, Supplier supplier) { - return new RegistryEvent<>(mcplr.registrySoundEvent(id, supplier)); + public RegistryResult registerSoundEvent(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr.registrySoundEvent(id, supplier)); } - public RegistryEvent registerSoundEvent(Identifier id) { + public RegistryResult registerSoundEvent(Identifier id) { return registerSoundEvent(id, () -> SoundEvent.of(id)); } - public RegistryEvent registerSoundEvent(Identifier id, float distanceToTravel) { + public RegistryResult registerSoundEvent(Identifier id, float distanceToTravel) { return registerSoundEvent(id, () -> SoundEvent.of(id, distanceToTravel)); } - public RegistryEvent registerFluid(Identifier id, Supplier supplier) { - return new RegistryEvent<>(mcplr.registryFluid(id, supplier)); + public RegistryResult registerFluid(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr.registryFluid(id, supplier)); } - public RegistryEvent> registerParticleType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(mcplr.registryParticleType(id, supplier)); + public RegistryResult> registerParticleType(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryParticleType(id, supplier)); } - public RegistryEvent registerItemGroup(Identifier id, Supplier supplier) { - return new RegistryEvent<>(mcplr1_20.registryItemGroup(id, supplier)); + public RegistryResult registerItemGroup(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr1_20.registryItemGroup(id, supplier)); } public static void registerFuel(int time, ItemConvertible... item) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/CompatibleRecipeEntryUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/CompatibleRecipeEntryUtil.java new file mode 100644 index 000000000..0f3cc7a0d --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/CompatibleRecipeEntryUtil.java @@ -0,0 +1,13 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import ml.pkom.mcpitanlibarch.api.recipe.CompatibleRecipeEntry; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Ingredient; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.DefaultedList; + +public class CompatibleRecipeEntryUtil { + public static CompatibleRecipeEntry createShapelessRecipe(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { + return new CompatibleRecipeEntry(id, group, category, RecipeUtil.createShapelessRecipe(id, group, category, output, input)); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/RecipeManagerMixin.java b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/RecipeManagerMixin.java new file mode 100644 index 000000000..68d12506b --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/RecipeManagerMixin.java @@ -0,0 +1,30 @@ +package ml.pkom.mcpitanlibarch.mixin; + +import com.google.common.collect.ImmutableMap; +import com.google.gson.JsonElement; +import ml.pkom.mcpitanlibarch.api.event.v0.RecipeManagerRegistry; +import ml.pkom.mcpitanlibarch.api.event.v0.event.RecipeManagerEvent; +import net.minecraft.recipe.RecipeEntry; +import net.minecraft.recipe.RecipeManager; +import net.minecraft.recipe.RecipeType; +import net.minecraft.resource.ResourceManager; +import net.minecraft.util.Identifier; +import net.minecraft.util.profiler.Profiler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +import java.util.Map; + +@Mixin(RecipeManager.class) +public class RecipeManagerMixin { + @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", + at = @At(value = "INVOKE", target = "Ljava/util/Map;entrySet()Ljava/util/Set;", ordinal = 1), + locals = LocalCapture.CAPTURE_FAILHARD) + private void invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, Map, ImmutableMap.Builder>> map2) { + RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, map2))); + } + +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java index 1f315a30a..8d6329a33 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java @@ -4,7 +4,7 @@ import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; import ml.pkom.mcpitanlibarch.api.block.ExtendBlock; import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; -import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; +import ml.pkom.mcpitanlibarch.api.event.registry.RegistryResult; import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandlerTypeBuilder; import ml.pkom.mcpitanlibarch.api.item.DefaultItemGroups; import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; @@ -34,14 +34,14 @@ public static Identifier id(String id) { public static ArchRegistry registry = ArchRegistry.createRegistry(MOD_ID); - public static RegistryEvent> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); + public static RegistryResult> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); - public static RegistryEvent EXAMPLE_ITEM_SUPPLIER; - public static RegistryEvent EXAMPLE_BLOCK_SUPPLIER; - public static RegistryEvent EXAMPLE_BLOCK_ITEM_SUPPLIER; - public static RegistryEvent EXAMPLE_GUI_ITEM_SUPPLIER; - public static RegistryEvent EXAMPLE_GUI_BLOCK_SUPPLIER; - public static RegistryEvent EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER; + public static RegistryResult EXAMPLE_ITEM_SUPPLIER; + public static RegistryResult EXAMPLE_BLOCK_SUPPLIER; + public static RegistryResult EXAMPLE_BLOCK_ITEM_SUPPLIER; + public static RegistryResult EXAMPLE_GUI_ITEM_SUPPLIER; + public static RegistryResult EXAMPLE_GUI_BLOCK_SUPPLIER; + public static RegistryResult EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER; public static void init() { //EntityTypeBuilder.create().setSpawnGroup(SpawnGroup.AMBIENT).setEntityFactory(((type, world) -> new ZombieEntity((EntityType) type, world))); diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlibarch-common.mixins.json index d8e6da905..ddaf49d8a 100644 --- a/common/src/main/resources/mcpitanlibarch-common.mixins.json +++ b/common/src/main/resources/mcpitanlibarch-common.mixins.json @@ -8,6 +8,7 @@ "ItemStackMixin", "ItemUsageContextMixin", "MinecraftServerTimer", + "RecipeManagerMixin", "ServerWorldTimer" ], "client": [ diff --git a/fabric/build.gradle b/fabric/build.gradle index c3b5fbca3..dfc5d9382 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -30,6 +30,11 @@ dependencies { shadowCommon 'org.yaml:snakeyaml:2.0' include 'org.yaml:snakeyaml:2.0' + + modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") { + exclude(group: "net.fabricmc.fabric-api") + } + include("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") } processResources { diff --git a/gradle.properties b/gradle.properties index 37dbf34d6..d1a10ce15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,6 +20,8 @@ quilt_fabric_api_version=6.0.2 # https://neoforged.net/ neoforge_version=20.4.5-beta +cloth_config_version=12.0.119 + fabricEnabled=true forgeEnabled=true quiltEnabled=false diff --git a/info.properties b/info.properties index 049fba26a..d5bb33a36 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.9.2 +mod_version=1.9.3 maven_group=ml.pkom \ No newline at end of file From 2fe9b093303017b9859044637509567db5d0b554 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 12 Feb 2024 23:08:42 +0900 Subject: [PATCH 217/622] cloth config 13.0.121 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d1a10ce15..a86f5981c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ quilt_fabric_api_version=6.0.2 # https://neoforged.net/ neoforge_version=20.4.5-beta -cloth_config_version=12.0.119 +cloth_config_version=13.0.121 fabricEnabled=true forgeEnabled=true From 3bd8283a29753c08fe1747bddd11ca8a84ca8cb3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 12 Feb 2024 23:18:19 +0900 Subject: [PATCH 218/622] fix recipe api --- .../mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java | 4 ++++ .../pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java | 1 + 2 files changed, 5 insertions(+) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java index 4aa23e342..6c3d0b905 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java @@ -46,4 +46,8 @@ public ResourceManager getResourceManager() { public void putCompatibleRecipeEntry(Identifier id, CompatibleRecipeEntry entry) { map.get(entry.getType()).put(entry.getId(), entry.getRecipeEntry()); } + + public void putCompatibleRecipeEntry(CompatibleRecipeEntry entry) { + map.get(entry.getType()).put(entry.getId(), entry.getRecipeEntry()); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java index 3668d910b..ab3934b46 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java @@ -11,6 +11,7 @@ public class CompatibleRecipeEntry { public String group = ""; public RecipeUtil.CompatibilityCraftingRecipeCategory category = null; + @Deprecated public CompatibleRecipeEntry(RecipeEntry entry) { this.entry = entry; } From 49b9029a220e4477e41c7209147c61bc212349ef Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 12 Feb 2024 23:16:58 +0900 Subject: [PATCH 219/622] forge cloth config --- forge/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forge/build.gradle b/forge/build.gradle index 9014ad608..bbb73208b 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -36,6 +36,11 @@ dependencies { shadowCommon 'org.yaml:snakeyaml:2.0' compileOnly 'org.yaml:snakeyaml:2.0' + + modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") { + exclude(group: "net.fabricmc.fabric-api") + } + include("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") } processResources { From c8ffb871e6d40426c20d846efa0f1dd535b2461e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 13 Feb 2024 01:34:52 +0900 Subject: [PATCH 220/622] add APIs, fix APIs --- .../mcpitanlibarch/api/entity/Player.java | 2 - .../api/event/registry/RegistryEvent.java | 1 + .../mcpitanlibarch/api/item/ExtendItem.java | 2 +- .../api/item/ExtendItemProvider.java | 1 - .../api/registry/ArchRegistry.java | 79 +++++------ .../mcpitanlibarch/api/util/TextUtil.java | 14 +- .../mcpitanlibarch/test/ExampleModClient.java | 9 -- .../pitan76/mcpitanlib/MCPitanLib.java} | 13 +- .../api/event/v1}/RecipeManagerRegistry.java | 2 +- .../api/registry/CompatRegistry.java | 123 ++++++++++++++++++ .../api/registry/result}/RegistryResult.java | 5 +- .../api/util/CompatibleRecipeEntryUtil.java | 3 +- .../pitan76/mcpitanlib/api/util/TextUtil.java | 30 +++++ .../core/registry/FuelRegistry.java | 2 +- .../core/registry/MCPLRegistry.java | 2 +- .../core/registry/MCPLRegistry1_20.java | 2 +- .../pitan76/mcpitanlib}/debug/DebugTool.java | 4 +- .../pitan76/mcpitanlib}/mixin/ItemMixin.java | 2 +- .../mcpitanlib}/mixin/ItemStackMixin.java | 2 +- .../mixin/ItemUsageContextMixin.java | 2 +- .../mixin/MinecraftServerTimer.java | 2 +- .../mcpitanlib}/mixin/RecipeManagerMixin.java | 4 +- .../mcpitanlib}/mixin/ServerWorldTimer.java | 2 +- .../mcpitanlib}/test/ExampleCommand.java | 3 +- .../mcpitanlib}/test/ExampleGuiBlock.java | 2 +- .../mcpitanlib}/test/ExampleGuiItem.java | 5 +- .../pitan76/mcpitanlib}/test/ExampleMod.java | 20 ++- .../mcpitanlib/test/ExampleModClient.java | 9 ++ .../mcpitanlib}/test/ExampleScreen.java | 6 +- .../test/ExampleScreenHandler.java | 9 +- .../mcpitanlibarch-common.mixins.json | 2 +- .../mcpitanlib/fabric/MCPitanLibFabric.java} | 8 +- .../mcpitanlib}/fabric/mixin/RecipeMixin.java | 2 +- fabric/src/main/resources/fabric.mod.json | 2 +- .../main/resources/mcpitanlibarch.mixins.json | 2 +- .../forge/MCPitanLibarchForge.java | 23 ---- .../mcpitanlib/forge/MCPitanLibForge.java | 14 ++ .../forge/client/MCPitanLibForgeClient.java} | 4 +- .../main/resources/mcpitanlibarch.mixins.json | 2 +- forge/src/main/resources/pack.mcmeta | 2 +- info.properties | 2 +- .../neoforge/MCPitanLibarchNeoForge.java | 6 +- 42 files changed, 280 insertions(+), 151 deletions(-) delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java rename common/src/main/java/{ml/pkom/mcpitanlibarch/MCPitanLibarch.java => net/pitan76/mcpitanlib/MCPitanLib.java} (87%) rename common/src/main/java/{ml/pkom/mcpitanlibarch/api/event/v0 => net/pitan76/mcpitanlib/api/event/v1}/RecipeManagerRegistry.java (91%) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java rename common/src/main/java/{ml/pkom/mcpitanlibarch/api/event/registry => net/pitan76/mcpitanlib/api/registry/result}/RegistryResult.java (71%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/CompatibleRecipeEntryUtil.java (87%) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/core/registry/FuelRegistry.java (90%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/core/registry/MCPLRegistry.java (98%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/core/registry/MCPLRegistry1_20.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/debug/DebugTool.java (86%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/mixin/ItemMixin.java (99%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/mixin/ItemStackMixin.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/mixin/ItemUsageContextMixin.java (88%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/mixin/MinecraftServerTimer.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/mixin/RecipeManagerMixin.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/mixin/ServerWorldTimer.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/test/ExampleCommand.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/test/ExampleGuiBlock.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/test/ExampleGuiItem.java (85%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/test/ExampleMod.java (73%) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/test/ExampleScreen.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/test/ExampleScreenHandler.java (64%) rename fabric/src/main/java/{ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java => net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java} (63%) rename fabric/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/fabric/mixin/RecipeMixin.java (96%) delete mode 100644 forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java create mode 100644 forge/src/main/java/net/pitan76/mcpitanlib/forge/MCPitanLibForge.java rename forge/src/main/java/{ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java => net/pitan76/mcpitanlib/forge/client/MCPitanLibForgeClient.java} (73%) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java index 29e756919..cab6612fb 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java @@ -5,13 +5,11 @@ import ml.pkom.mcpitanlibarch.api.util.ScreenHandlerUtil; import ml.pkom.mcpitanlibarch.core.player.ItemCooldown; import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.ItemCooldownManager; import net.minecraft.entity.player.PlayerAbilities; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.PacketByteBuf; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java index 6556ba25d..f47c62fa0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java @@ -1,6 +1,7 @@ package ml.pkom.mcpitanlibarch.api.event.registry; import dev.architectury.registry.registries.RegistrySupplier; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; public class RegistryEvent extends RegistryResult { public RegistryEvent(RegistrySupplier supplier) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java index 3bad0c7b1..c6d7c383d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java @@ -2,7 +2,7 @@ import ml.pkom.mcpitanlibarch.Dummy; import ml.pkom.mcpitanlibarch.api.event.item.*; -import ml.pkom.mcpitanlibarch.mixin.ItemUsageContextMixin; +import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java index 904eb1934..23cc52d91 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java @@ -1,6 +1,5 @@ package ml.pkom.mcpitanlibarch.api.item; -import ml.pkom.mcpitanlibarch.Dummy; import ml.pkom.mcpitanlibarch.api.event.item.*; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 4ee97a9ac..9f45cb87f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -1,18 +1,7 @@ package ml.pkom.mcpitanlibarch.api.registry; -import dev.architectury.registry.registries.RegistrySupplier; -import ml.pkom.mcpitanlibarch.MCPitanLibarch; -import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; -import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; -import ml.pkom.mcpitanlibarch.api.event.registry.RegistryResult; +import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; -import ml.pkom.mcpitanlibarch.api.util.BlockUtil; -import ml.pkom.mcpitanlibarch.api.util.ItemUtil; -import ml.pkom.mcpitanlibarch.core.registry.FuelRegistry; -import ml.pkom.mcpitanlibarch.core.registry.MCPLRegistry; -import ml.pkom.mcpitanlibarch.core.registry.MCPLRegistry1_20; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; @@ -24,90 +13,88 @@ import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.registry.CompatRegistry; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; import java.util.function.Supplier; +@Deprecated public class ArchRegistry { + private final CompatRegistry compatRegistry; private final MCPLRegistry mcplr; private final MCPLRegistry1_20 mcplr1_20; public ArchRegistry(String MOD_ID) { - mcplr = new MCPLRegistry(MOD_ID); - mcplr1_20 = new MCPLRegistry1_20(mcplr); + compatRegistry = new CompatRegistry(MOD_ID); + mcplr = compatRegistry.getMcplr(); + mcplr1_20 = compatRegistry.getMcplr1_20(); } public static ArchRegistry createRegistry(String MOD_ID) { return new ArchRegistry(MOD_ID); } - public RegistryResult registerItem(Identifier id, Supplier supplier) { - if (MCPitanLibarch.isItemBlackListed(id)) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); - RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); - CreativeTabManager.register(id); - return new RegistryResult<>(registrySupplier); + public RegistryEvent registerItem(Identifier id, Supplier supplier) { + return new RegistryEvent<>(compatRegistry.registerItem(id, supplier).supplier); } - public RegistryResult registerBlock(Identifier id, Supplier supplier) { - if (MCPitanLibarch.isBlockBlackListed(id)) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); - return new RegistryResult<>(mcplr.registryBlock(id, supplier)); + public RegistryEvent registerBlock(Identifier id, Supplier supplier) { + return new RegistryEvent<>(compatRegistry.registerBlock(id, supplier).supplier); } - public RegistryResult> registerScreenHandlerType(Identifier id, Supplier> supplier) { - return new RegistryResult<>(mcplr.registryScreenHandlerType(id, supplier)); + public RegistryEvent> registerScreenHandlerType(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(compatRegistry.registerScreenHandlerType(id, supplier).supplier); } @Deprecated - public RegistryResult> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { + public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { return registerScreenHandlerType(id, () -> supplier.get().build()); } - public RegistryResult> registerMenu(Identifier id, Supplier> supplier) { + public RegistryEvent> registerMenu(Identifier id, Supplier> supplier) { return registerScreenHandlerType(id, supplier); } - public RegistryResult> registerBlockEntityType(Identifier id, Supplier> supplier) { - return new RegistryResult<>(mcplr.registryBlockEntityType(id, supplier)); + public RegistryEvent> registerBlockEntityType(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(compatRegistry.registerBlockEntityType(id, supplier).supplier); } - public RegistryResult> registerEntity(Identifier id, Supplier> supplier) { - return new RegistryResult<>(mcplr.registryEntityType(id, supplier)); + public RegistryEvent> registerEntity(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(compatRegistry.registerEntity(id, supplier).supplier); } @Deprecated - public RegistryResult registerSoundEvent(Identifier id, Supplier supplier) { - return new RegistryResult<>(mcplr.registrySoundEvent(id, supplier)); + public RegistryEvent registerSoundEvent(Identifier id, Supplier supplier) { + return new RegistryEvent<>(compatRegistry.registerSoundEvent(id, supplier).supplier); } - public RegistryResult registerSoundEvent(Identifier id) { + public RegistryEvent registerSoundEvent(Identifier id) { return registerSoundEvent(id, () -> SoundEvent.of(id)); } - public RegistryResult registerSoundEvent(Identifier id, float distanceToTravel) { + public RegistryEvent registerSoundEvent(Identifier id, float distanceToTravel) { return registerSoundEvent(id, () -> SoundEvent.of(id, distanceToTravel)); } - public RegistryResult registerFluid(Identifier id, Supplier supplier) { - return new RegistryResult<>(mcplr.registryFluid(id, supplier)); + public RegistryEvent registerFluid(Identifier id, Supplier supplier) { + return new RegistryEvent<>(compatRegistry.registerFluid(id, supplier).supplier); } - public RegistryResult> registerParticleType(Identifier id, Supplier> supplier) { - return new RegistryResult<>(mcplr.registryParticleType(id, supplier)); + public RegistryEvent> registerParticleType(Identifier id, Supplier> supplier) { + return new RegistryEvent<>(compatRegistry.registerParticleType(id, supplier).supplier); } - public RegistryResult registerItemGroup(Identifier id, Supplier supplier) { - return new RegistryResult<>(mcplr1_20.registryItemGroup(id, supplier)); + public RegistryEvent registerItemGroup(Identifier id, Supplier supplier) { + return new RegistryEvent<>(compatRegistry.registerItemGroup(id, supplier).supplier); } public static void registerFuel(int time, ItemConvertible... item) { - FuelRegistry.register(time, item); + CompatRegistry.registerFuel(time, item); } public void allRegister() { - // 1.16 Register - mcplr.allRegister1_16(); - - // ItemGroup - CreativeTabManager.allRegister(); + compatRegistry.allRegister(); } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java index 45dee9aba..507f89ce1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java @@ -2,29 +2,29 @@ import net.minecraft.text.*; +@Deprecated public class TextUtil { public static MutableText literal(String string) { - return Text.literal(string); + return net.pitan76.mcpitanlib.api.util.TextUtil.literal(string); } public static MutableText translatable(String key) { - return Text.translatable(key); + return net.pitan76.mcpitanlib.api.util.TextUtil.translatable(key); } public static MutableText translatable(String key, Object... args) { - return Text.translatable(key, args); + return net.pitan76.mcpitanlib.api.util.TextUtil.translatable(key, args); } public static MutableText empty() { - //return Text.empty(); - return literal(""); + return net.pitan76.mcpitanlib.api.util.TextUtil.empty(); } public static MutableText keybind(String string) { - return Text.keybind(string); + return net.pitan76.mcpitanlib.api.util.TextUtil.keybind(string); } public static String txt2str(Text text) { - return text.getString(); + return net.pitan76.mcpitanlib.api.util.TextUtil.txt2str(text); } } \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java b/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java deleted file mode 100644 index 6e727b788..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleModClient.java +++ /dev/null @@ -1,9 +0,0 @@ -package ml.pkom.mcpitanlibarch.test; - -import dev.architectury.registry.menu.MenuRegistry; - -public class ExampleModClient { - public static void init() { - MenuRegistry.registerScreenFactory(ExampleMod.supplierEXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); - } -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java similarity index 87% rename from common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java rename to common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index 33619ca63..17a17d279 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/MCPitanLibarch.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -1,10 +1,10 @@ -package ml.pkom.mcpitanlibarch; +package net.pitan76.mcpitanlib; import ml.pkom.easyapi.config.Config; import ml.pkom.easyapi.config.JsonConfig; import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; -import ml.pkom.mcpitanlibarch.debug.DebugTool; +import net.pitan76.mcpitanlib.debug.DebugTool; import net.minecraft.util.Identifier; import java.io.File; @@ -12,10 +12,11 @@ import java.util.Arrays; import java.util.List; -public class MCPitanLibarch { +public class MCPitanLib { public static final String MOD_ID = "mcpitanlibarch"; - private static final File configFile = new File(PlatformUtil.getConfigFolder().toFile(), MOD_ID + "/blacklist.json"); + private static final File configFile = new File(PlatformUtil.getConfigFolder().toFile(), "mcpitanlib/blacklist.json"); + private static final File oldConfigFile = new File(PlatformUtil.getConfigFolder().toFile(), "mcpitanlibarch/blacklist.json"); public static Config config = new JsonConfig(); private static boolean configLoaded = false; @@ -46,6 +47,10 @@ public static void init() { * Configの初期化 */ public static void configInit() { + if (oldConfigFile.exists() && !configFile.exists()) { + oldConfigFile.renameTo(configFile); + } + try { if (configLoaded) return; configLoaded = true; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/RecipeManagerRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/RecipeManagerRegistry.java similarity index 91% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/RecipeManagerRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/RecipeManagerRegistry.java index b17acc889..33b46fc3a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/RecipeManagerRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/RecipeManagerRegistry.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.event.v0; +package net.pitan76.mcpitanlib.api.event.v1; import ml.pkom.mcpitanlibarch.api.event.v0.event.RecipeManagerEvent; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java new file mode 100644 index 000000000..e79e1d33d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -0,0 +1,123 @@ +package net.pitan76.mcpitanlib.api.registry; + +import dev.architectury.registry.registries.RegistrySupplier; +import net.pitan76.mcpitanlib.MCPitanLib; +import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; +import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; +import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; +import ml.pkom.mcpitanlibarch.api.util.BlockUtil; +import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.pitan76.mcpitanlib.core.registry.FuelRegistry; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemGroup; +import net.minecraft.particle.ParticleType; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; + +import java.util.function.Supplier; + +public class CompatRegistry { + + private final MCPLRegistry mcplr; + private final MCPLRegistry1_20 mcplr1_20; + + public CompatRegistry(String MOD_ID) { + mcplr = new MCPLRegistry(MOD_ID); + mcplr1_20 = new MCPLRegistry1_20(mcplr); + } + + public static CompatRegistry createRegistry(String MOD_ID) { + return new CompatRegistry(MOD_ID); + } + + public RegistryResult registerItem(Identifier id, Supplier supplier) { + if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); + RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); + CreativeTabManager.register(id); + return new RegistryResult<>(registrySupplier); + } + + public RegistryResult registerBlock(Identifier id, Supplier supplier) { + if (MCPitanLib.isBlockBlackListed(id)) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); + return new RegistryResult<>(mcplr.registryBlock(id, supplier)); + } + + public RegistryResult> registerScreenHandlerType(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryScreenHandlerType(id, supplier)); + } + + @Deprecated + public RegistryResult> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { + return registerScreenHandlerType(id, () -> supplier.get().build()); + } + + public RegistryResult> registerMenu(Identifier id, Supplier> supplier) { + return registerScreenHandlerType(id, supplier); + } + + public RegistryResult> registerBlockEntityType(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryBlockEntityType(id, supplier)); + } + + public RegistryResult> registerEntity(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryEntityType(id, supplier)); + } + + @Deprecated + public RegistryResult registerSoundEvent(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr.registrySoundEvent(id, supplier)); + } + + public RegistryResult registerSoundEvent(Identifier id) { + return registerSoundEvent(id, () -> SoundEvent.of(id)); + } + + public RegistryResult registerSoundEvent(Identifier id, float distanceToTravel) { + return registerSoundEvent(id, () -> SoundEvent.of(id, distanceToTravel)); + } + + public RegistryResult registerFluid(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr.registryFluid(id, supplier)); + } + + public RegistryResult> registerParticleType(Identifier id, Supplier> supplier) { + return new RegistryResult<>(mcplr.registryParticleType(id, supplier)); + } + + public RegistryResult registerItemGroup(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr1_20.registryItemGroup(id, supplier)); + } + + public static void registerFuel(int time, ItemConvertible... item) { + FuelRegistry.register(time, item); + } + + public void allRegister() { + // 1.16 Register + mcplr.allRegister1_16(); + + // ItemGroup + CreativeTabManager.allRegister(); + } + + @Deprecated + public MCPLRegistry getMcplr() { + return mcplr; + } + + @Deprecated + public MCPLRegistry1_20 getMcplr1_20() { + return mcplr1_20; + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java similarity index 71% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryResult.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java index 524982dad..a19dd2e16 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java @@ -1,10 +1,9 @@ -package ml.pkom.mcpitanlibarch.api.event.registry; +package net.pitan76.mcpitanlib.api.registry.result; import dev.architectury.registry.registries.RegistrySupplier; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import org.jetbrains.annotations.Nullable; -public class RegistryResult extends BaseEvent { +public class RegistryResult { public RegistrySupplier supplier; public RegistryResult(RegistrySupplier supplier) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/CompatibleRecipeEntryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java similarity index 87% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/CompatibleRecipeEntryUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java index 0f3cc7a0d..aa55d0046 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/CompatibleRecipeEntryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java @@ -1,6 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import ml.pkom.mcpitanlibarch.api.recipe.CompatibleRecipeEntry; +import ml.pkom.mcpitanlibarch.api.util.RecipeUtil; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.util.Identifier; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java new file mode 100644 index 000000000..d94f66568 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java @@ -0,0 +1,30 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; + +public class TextUtil { + public static MutableText literal(String string) { + return Text.literal(string); + } + + public static MutableText translatable(String key) { + return Text.translatable(key); + } + + public static MutableText translatable(String key, Object... args) { + return Text.translatable(key, args); + } + + public static MutableText empty() { + return literal(""); + } + + public static MutableText keybind(String string) { + return Text.keybind(string); + } + + public static String txt2str(Text text) { + return text.getString(); + } +} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java similarity index 90% rename from common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/FuelRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java index b1d4be253..ac1802e19 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/FuelRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.core.registry; +package net.pitan76.mcpitanlib.core.registry; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java similarity index 98% rename from common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java index cbcf82fca..dd0bf7cb5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.core.registry; +package net.pitan76.mcpitanlib.core.registry; import com.google.common.base.Suppliers; import dev.architectury.registry.registries.Registrar; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry1_20.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry1_20.java rename to common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java index 8354ebf05..5f6c68868 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/core/registry/MCPLRegistry1_20.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.core.registry; +package net.pitan76.mcpitanlib.core.registry; import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrySupplier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/debug/DebugTool.java b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java similarity index 86% rename from common/src/main/java/ml/pkom/mcpitanlibarch/debug/DebugTool.java rename to common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java index 3c32c402d..b1caccdf0 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/debug/DebugTool.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java @@ -1,9 +1,9 @@ -package ml.pkom.mcpitanlibarch.debug; +package net.pitan76.mcpitanlib.debug; import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.ExtendItem; -import static ml.pkom.mcpitanlibarch.MCPitanLibarch.*; +import static net.pitan76.mcpitanlib.MCPitanLib.*; /** * A tool for debugging. diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java similarity index 99% rename from common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemMixin.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index e34dedfda..69836997c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.mixin; +package net.pitan76.mcpitanlib.mixin; import ml.pkom.mcpitanlibarch.api.event.item.*; import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java index 55a464149..99a1841f6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemStackMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.mixin; +package net.pitan76.mcpitanlib.mixin; import ml.pkom.mcpitanlibarch.api.event.v0.event.ItemStackActionEvent; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemUsageContextMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemUsageContextMixin.java similarity index 88% rename from common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemUsageContextMixin.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemUsageContextMixin.java index 118f8be36..5d5557f7e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ItemUsageContextMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemUsageContextMixin.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.mixin; +package net.pitan76.mcpitanlib.mixin; import net.minecraft.item.ItemUsageContext; import net.minecraft.util.hit.BlockHitResult; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/MinecraftServerTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/mixin/MinecraftServerTimer.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java index 56add9d0d..977645d26 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/MinecraftServerTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.mixin; +package net.pitan76.mcpitanlib.mixin; import ml.pkom.mcpitanlibarch.api.timer.MinecraftServerTimerAccess; import ml.pkom.mcpitanlibarch.api.timer.TimerItem; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/mixin/RecipeManagerMixin.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 68d12506b..1982c2ec1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.mixin; +package net.pitan76.mcpitanlib.mixin; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; -import ml.pkom.mcpitanlibarch.api.event.v0.RecipeManagerRegistry; +import net.pitan76.mcpitanlib.api.event.v1.RecipeManagerRegistry; import ml.pkom.mcpitanlibarch.api.event.v0.event.RecipeManagerEvent; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ServerWorldTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ServerWorldTimer.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java index 283a28321..ee9e64cfa 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/mixin/ServerWorldTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.mixin; +package net.pitan76.mcpitanlib.mixin; import ml.pkom.mcpitanlibarch.api.timer.ServerWorldTimerAccess; import ml.pkom.mcpitanlibarch.api.timer.TimerItem; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java index 32f84d549..b22415118 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java @@ -1,7 +1,6 @@ -package ml.pkom.mcpitanlibarch.test; +package net.pitan76.mcpitanlib.test; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; import ml.pkom.mcpitanlibarch.api.command.CommandSettings; import ml.pkom.mcpitanlibarch.api.command.LiteralCommand; import ml.pkom.mcpitanlibarch.api.command.argument.IntegerCommand; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiBlock.java rename to common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java index d05211327..26e6b3499 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.test; +package net.pitan76.mcpitanlib.test; import ml.pkom.mcpitanlibarch.api.block.ExtendBlock; import ml.pkom.mcpitanlibarch.api.event.block.BlockUseEvent; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java similarity index 85% rename from common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java index 82870a54f..9b41576d2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java @@ -1,6 +1,7 @@ -package ml.pkom.mcpitanlibarch.test; +package net.pitan76.mcpitanlib.test; import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.ExtendItem; import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.item.ItemStack; @@ -10,7 +11,7 @@ public class ExampleGuiItem extends ExtendItem { - public ExampleGuiItem(Settings settings) { + public ExampleGuiItem(CompatibleItemSettings settings) { super(settings); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java similarity index 73% rename from common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java rename to common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 8d6329a33..94f6b9bb5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -1,20 +1,20 @@ -package ml.pkom.mcpitanlibarch.test; +package net.pitan76.mcpitanlib.test; import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; import ml.pkom.mcpitanlibarch.api.block.ExtendBlock; import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; -import ml.pkom.mcpitanlibarch.api.event.registry.RegistryResult; import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandlerTypeBuilder; +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.DefaultItemGroups; -import ml.pkom.mcpitanlibarch.api.item.ExtendSettings; +import ml.pkom.mcpitanlibarch.api.item.ExtendItem; import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; -import net.minecraft.block.AbstractBlock; +import ml.pkom.mcpitanlibarch.api.util.ItemUtil; import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -44,16 +44,14 @@ public static Identifier id(String id) { public static RegistryResult EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER; public static void init() { - //EntityTypeBuilder.create().setSpawnGroup(SpawnGroup.AMBIENT).setEntityFactory(((type, world) -> new ZombieEntity((EntityType) type, world))); - - EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new Item(new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS, id("example_item")))); + EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_item")))); EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); - EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> new BlockItem(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); + EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); - EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); + EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_item")))); EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); - EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> new BlockItem(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new ExtendSettings().addGroup(DefaultItemGroups.INGREDIENTS))); + EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); registry.allRegister(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java new file mode 100644 index 000000000..9ca57a61b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.test; + +import ml.pkom.mcpitanlibarch.api.client.registry.ArchRegistryClient; + +public class ExampleModClient { + public static void init() { + ArchRegistryClient.registerScreen(ExampleMod.supplierEXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); + } +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java rename to common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java index 00ebf48ac..eb19cb565 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java @@ -1,13 +1,11 @@ -package ml.pkom.mcpitanlibarch.test; +package net.pitan76.mcpitanlib.test; import ml.pkom.mcpitanlibarch.api.client.SimpleHandledScreen; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawBackgroundArgs; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawMouseoverTooltipArgs; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; -import ml.pkom.mcpitanlibarch.api.util.client.ScreenUtil; import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.gui.widget.TexturedButtonWidget; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; @@ -37,7 +35,7 @@ public void drawBackgroundOverride(DrawBackgroundArgs args) { @Override public void renderOverride(RenderArgs args) { - this.callRenderBackground(args.drawObjectDM); + this.callRenderBackground(args); super.renderOverride(args); this.callDrawMouseoverTooltip(new DrawMouseoverTooltipArgs(args.drawObjectDM, args.mouseX, args.mouseY)); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java similarity index 64% rename from common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java rename to common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java index 66a688d6e..fbe9110fd 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/test/ExampleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java @@ -1,10 +1,9 @@ -package ml.pkom.mcpitanlibarch.test; +package net.pitan76.mcpitanlib.test; +import ml.pkom.mcpitanlibarch.api.entity.Player; import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandler; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; -import net.minecraft.screen.ScreenHandler; public class ExampleScreenHandler extends SimpleScreenHandler { @@ -14,12 +13,12 @@ public ExampleScreenHandler(int i, PlayerInventory playerInventory) { } @Override - public ItemStack quickMoveOverride(PlayerEntity player, int slot) { + public ItemStack quickMoveOverride(Player player, int slot) { return null; } @Override - public boolean canUse(PlayerEntity player) { + public boolean canUse(Player player) { return true; } } diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlibarch-common.mixins.json index ddaf49d8a..398165fe8 100644 --- a/common/src/main/resources/mcpitanlibarch-common.mixins.json +++ b/common/src/main/resources/mcpitanlibarch-common.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.mixin", + "package": "net.pitan76.mcpitanlib.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ "ItemMixin", diff --git a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java similarity index 63% rename from fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java rename to fabric/src/main/java/net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java index 7351eef18..42ac02f7c 100644 --- a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/MCPitanLibarchFabric.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java @@ -1,12 +1,12 @@ -package ml.pkom.mcpitanlibarch.fabric; +package net.pitan76.mcpitanlib.fabric; -import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import net.pitan76.mcpitanlib.MCPitanLib; import net.fabricmc.api.ModInitializer; -public class MCPitanLibarchFabric implements ModInitializer { +public class MCPitanLibFabric implements ModInitializer { @Override public void onInitialize() { - MCPitanLibarch.init(); + MCPitanLib.init(); /* if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) if (FabricLoader.getInstance().isDevelopmentEnvironment()) diff --git a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java similarity index 96% rename from fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java rename to fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java index dd7f6e646..f95115ce0 100644 --- a/fabric/src/main/java/ml/pkom/mcpitanlibarch/fabric/mixin/RecipeMixin.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.fabric.mixin; +package net.pitan76.mcpitanlib.fabric.mixin; import ml.pkom.mcpitanlibarch.api.item.FixedRecipeRemainderItem; import net.minecraft.inventory.Inventory; diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 02e30a00b..fcacf067d 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -17,7 +17,7 @@ "environment": "*", "entrypoints": { "main": [ - "ml.pkom.mcpitanlibarch.fabric.MCPitanLibarchFabric" + "net.pitan76.mcpitanlib.fabric.MCPitanLibFabric" ] }, "custom": { diff --git a/fabric/src/main/resources/mcpitanlibarch.mixins.json b/fabric/src/main/resources/mcpitanlibarch.mixins.json index 864f03833..0a36c5829 100644 --- a/fabric/src/main/resources/mcpitanlibarch.mixins.json +++ b/fabric/src/main/resources/mcpitanlibarch.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.fabric.mixin", + "package": "net.pitan76.mcpitanlib.fabric.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ "RecipeMixin" diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java b/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java deleted file mode 100644 index 3e5997584..000000000 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/MCPitanLibarchForge.java +++ /dev/null @@ -1,23 +0,0 @@ -package ml.pkom.mcpitanlibarch.forge; - -import dev.architectury.platform.Platform; -import dev.architectury.platform.forge.EventBuses; -import ml.pkom.mcpitanlibarch.MCPitanLibarch; -import ml.pkom.mcpitanlibarch.forge.client.MCPitanLibarchForgeClient; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; - -@Mod(MCPitanLibarch.MOD_ID) -public class MCPitanLibarchForge { - public MCPitanLibarchForge() { - // Submit our event bus to let architectury register our content on the right time - EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - //if (PlatformUtil.isDevelopmentEnvironment()) - // EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - - MCPitanLibarch.init(); - - if (Platform.getEnv().isClient()) - FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchForgeClient::clientInit); - } -} \ No newline at end of file diff --git a/forge/src/main/java/net/pitan76/mcpitanlib/forge/MCPitanLibForge.java b/forge/src/main/java/net/pitan76/mcpitanlib/forge/MCPitanLibForge.java new file mode 100644 index 000000000..3347f2852 --- /dev/null +++ b/forge/src/main/java/net/pitan76/mcpitanlib/forge/MCPitanLibForge.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.forge; + +import dev.architectury.platform.forge.EventBuses; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.pitan76.mcpitanlib.MCPitanLib; + +@Mod(MCPitanLib.MOD_ID) +public class MCPitanLibForge { + public MCPitanLibForge() { + EventBuses.registerModEventBus(MCPitanLib.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + MCPitanLib.init(); + } +} \ No newline at end of file diff --git a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java b/forge/src/main/java/net/pitan76/mcpitanlib/forge/client/MCPitanLibForgeClient.java similarity index 73% rename from forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java rename to forge/src/main/java/net/pitan76/mcpitanlib/forge/client/MCPitanLibForgeClient.java index 7d550a485..90e629464 100644 --- a/forge/src/main/java/ml/pkom/mcpitanlibarch/forge/client/MCPitanLibarchForgeClient.java +++ b/forge/src/main/java/net/pitan76/mcpitanlib/forge/client/MCPitanLibForgeClient.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.forge.client; +package net.pitan76.mcpitanlib.forge.client; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -public class MCPitanLibarchForgeClient { +public class MCPitanLibForgeClient { public static void clientInit(FMLClientSetupEvent event) { //if (PlatformUtil.isDevelopmentEnvironment()) // ExampleModClient.init(); diff --git a/forge/src/main/resources/mcpitanlibarch.mixins.json b/forge/src/main/resources/mcpitanlibarch.mixins.json index f00451cf3..df01c3ab5 100644 --- a/forge/src/main/resources/mcpitanlibarch.mixins.json +++ b/forge/src/main/resources/mcpitanlibarch.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.forge.mixin", + "package": "net.pitan76.mcpitanlib.forge.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ ], diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta index 547096ba2..03e89dcaa 100644 --- a/forge/src/main/resources/pack.mcmeta +++ b/forge/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "mcpitanlibarch resources", + "description": "mcpitanlib resources", "pack_format": 8, "forge:resource_pack_format": 8, "forge:data_pack_format": 9 diff --git a/info.properties b/info.properties index d5bb33a36..657a63697 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlibarch -mod_version=1.9.3 +mod_version=1.9.4 maven_group=ml.pkom \ No newline at end of file diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java index 404162a17..ba1809152 100644 --- a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java +++ b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java @@ -1,12 +1,12 @@ package ml.pkom.mcpitanlibarch.neoforge; import dev.architectury.platform.Platform; -import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import net.pitan76.mcpitanlib.MCPitanLib; import ml.pkom.mcpitanlibarch.neoforge.client.MCPitanLibarchNeoForgeClient; import net.neoforged.fml.common.Mod; import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; -@Mod(MCPitanLibarch.MOD_ID) +@Mod(MCPitanLib.MOD_ID) public class MCPitanLibarchNeoForge { public MCPitanLibarchNeoForge() { // Submit our event bus to let architectury register our content on the right time @@ -14,7 +14,7 @@ public MCPitanLibarchNeoForge() { //if (PlatformUtil.isDevelopmentEnvironment()) // EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - MCPitanLibarch.init(); + MCPitanLib.init(); if (Platform.getEnv().isClient()) FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchNeoForgeClient::clientInit); From 172e6774a74f27d21b34c20dd9cbe9278337864d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 13 Feb 2024 02:02:50 +0900 Subject: [PATCH 221/622] neoforge --- .../neoforge/MCPitanLibNeoForge.java | 15 +++++++++++++ .../neoforge/MCPitanLibarchNeoForge.java | 22 ------------------- ...ent.java => MCPitanLibNeoForgeClient.java} | 2 +- 3 files changed, 16 insertions(+), 23 deletions(-) create mode 100644 neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibNeoForge.java delete mode 100644 neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java rename neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/{MCPitanLibarchNeoForgeClient.java => MCPitanLibNeoForgeClient.java} (86%) diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibNeoForge.java new file mode 100644 index 000000000..9a1d76538 --- /dev/null +++ b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibNeoForge.java @@ -0,0 +1,15 @@ +package ml.pkom.mcpitanlibarch.neoforge; + +import net.neoforged.fml.common.Mod; +import net.pitan76.mcpitanlib.MCPitanLib; + +@Mod(MCPitanLib.MOD_ID) +public class MCPitanLibNeoForge { + public MCPitanLibNeoForge() { + //EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + MCPitanLib.init(); + + //if (Platform.getEnv().isClient()) + // FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchNeoForgeClient::clientInit); + } +} \ No newline at end of file diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java deleted file mode 100644 index ba1809152..000000000 --- a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibarchNeoForge.java +++ /dev/null @@ -1,22 +0,0 @@ -package ml.pkom.mcpitanlibarch.neoforge; - -import dev.architectury.platform.Platform; -import net.pitan76.mcpitanlib.MCPitanLib; -import ml.pkom.mcpitanlibarch.neoforge.client.MCPitanLibarchNeoForgeClient; -import net.neoforged.fml.common.Mod; -import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; - -@Mod(MCPitanLib.MOD_ID) -public class MCPitanLibarchNeoForge { - public MCPitanLibarchNeoForge() { - // Submit our event bus to let architectury register our content on the right time - //EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - //if (PlatformUtil.isDevelopmentEnvironment()) - // EventBuses.registerModEventBus(ExampleMod.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - - MCPitanLib.init(); - - if (Platform.getEnv().isClient()) - FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchNeoForgeClient::clientInit); - } -} \ No newline at end of file diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibarchNeoForgeClient.java b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibNeoForgeClient.java similarity index 86% rename from neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibarchNeoForgeClient.java rename to neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibNeoForgeClient.java index 870e75786..c9fa68107 100644 --- a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibarchNeoForgeClient.java +++ b/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibNeoForgeClient.java @@ -2,7 +2,7 @@ import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; -public class MCPitanLibarchNeoForgeClient { +public class MCPitanLibNeoForgeClient { public static void clientInit(FMLClientSetupEvent event) { //if (PlatformUtil.isDevelopmentEnvironment()) // ExampleModClient.init(); From b44f35f26bb25c493e739819610c49cea176c7a0 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:04:21 +0900 Subject: [PATCH 222/622] add neoforge cloth config --- neoforge/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 95bb9530b..fdf75008e 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -39,6 +39,11 @@ dependencies { shadowCommon 'org.yaml:snakeyaml:2.0' compileOnly 'org.yaml:snakeyaml:2.0' + + modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") { + exclude(group: "net.fabricmc.fabric-api") + } + include("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") } processResources { From 3e1bd721c64af9ec243a4c59092960a1c8d45040 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:04:49 +0900 Subject: [PATCH 223/622] rename mcpitanlib fix registry --- .../ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java | 4 ++-- info.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java index 9f45cb87f..a0584df10 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java @@ -71,11 +71,11 @@ public RegistryEvent registerSoundEvent(Identifier id, Supplier registerSoundEvent(Identifier id) { - return registerSoundEvent(id, () -> SoundEvent.of(id)); + return new RegistryEvent<>(compatRegistry.registerSoundEvent(id).supplier); } public RegistryEvent registerSoundEvent(Identifier id, float distanceToTravel) { - return registerSoundEvent(id, () -> SoundEvent.of(id, distanceToTravel)); + return new RegistryEvent<>(compatRegistry.registerSoundEvent(id, distanceToTravel).supplier); } public RegistryEvent registerFluid(Identifier id, Supplier supplier) { diff --git a/info.properties b/info.properties index 657a63697..cf45ee7b2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ -archives_base_name=mcpitanlibarch -mod_version=1.9.4 +archives_base_name=mcpitanlib +mod_version=1.9.5 maven_group=ml.pkom \ No newline at end of file From 6ea5d64591272c8c92d70bb29b4249d42eeca803 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:29:12 +0900 Subject: [PATCH 224/622] gradle --- forge/build.gradle | 6 ++---- gradle.properties | 8 ++++---- neoforge/build.gradle | 6 ++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/forge/build.gradle b/forge/build.gradle index bbb73208b..a4036e73e 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -37,10 +37,8 @@ dependencies { shadowCommon 'org.yaml:snakeyaml:2.0' compileOnly 'org.yaml:snakeyaml:2.0' - modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") { - exclude(group: "net.fabricmc.fabric-api") - } - include("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") + modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") + compileOnly("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") } processResources { diff --git a/gradle.properties b/gradle.properties index a86f5981c..4da54cc5a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G minecraft_version=1.20.4 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=11.0.8 +architectury_version=11.0.12 # https://fabricmc.net/develop/ fabric_loader_version=0.15.1 @@ -14,11 +14,11 @@ fabric_api_version=0.91.2+1.20.4 forge_version=1.20.4-49.0.3 # https://lambdaurora.dev/tools/import_quilt.html -quilt_loader_version=0.21.0 +quilt_loader_version=0.23.1 quilt_fabric_api_version=6.0.2 -# https://neoforged.net/ -neoforge_version=20.4.5-beta +# https://projects.neoforged.net/neoforged/neoforge +neoforge_version=20.4.159-beta cloth_config_version=13.0.121 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index fdf75008e..d684b6c93 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -40,10 +40,8 @@ dependencies { shadowCommon 'org.yaml:snakeyaml:2.0' compileOnly 'org.yaml:snakeyaml:2.0' - modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") { - exclude(group: "net.fabricmc.fabric-api") - } - include("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") + modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") + compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") } processResources { From 9ad0ce4a584fdf3927fd33aa156c731658fbf572 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:31:19 +0900 Subject: [PATCH 225/622] rename package --- .../pitan76/mcpitanlib}/neoforge/MCPitanLibNeoForge.java | 2 +- .../mcpitanlib}/neoforge/client/MCPitanLibNeoForgeClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename neoforge/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/neoforge/MCPitanLibNeoForge.java (92%) rename neoforge/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/neoforge/client/MCPitanLibNeoForgeClient.java (84%) diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java similarity index 92% rename from neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibNeoForge.java rename to neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index 9a1d76538..7097e7178 100644 --- a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.neoforge; +package net.pitan76.mcpitanlib.neoforge; import net.neoforged.fml.common.Mod; import net.pitan76.mcpitanlib.MCPitanLib; diff --git a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibNeoForgeClient.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/client/MCPitanLibNeoForgeClient.java similarity index 84% rename from neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibNeoForgeClient.java rename to neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/client/MCPitanLibNeoForgeClient.java index c9fa68107..d5ae9a7c4 100644 --- a/neoforge/src/main/java/ml/pkom/mcpitanlibarch/neoforge/client/MCPitanLibNeoForgeClient.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/client/MCPitanLibNeoForgeClient.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.neoforge.client; +package net.pitan76.mcpitanlib.neoforge.client; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; From f088e948ba02a3de11ea0eba188814d8a359f542 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 13 Feb 2024 14:32:34 +0900 Subject: [PATCH 226/622] maven_group=net.pitan76 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index cf45ee7b2..fa09ea47a 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib mod_version=1.9.5 -maven_group=ml.pkom \ No newline at end of file +maven_group=net.pitan76 \ No newline at end of file From b7d9ec2fa0831ebcc58f745ca07d35a04997642e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:29:49 +0900 Subject: [PATCH 227/622] add ItemUtil API --- .../api/item/CreativeTabManager.java | 6 +- .../pkom/mcpitanlibarch/api/tag/TagKey.java | 8 +- .../mcpitanlibarch/api/util/ItemUtil.java | 40 ++-- .../api/registry/CompatRegistry.java | 8 +- .../pitan76/mcpitanlib/api/util/ItemUtil.java | 215 ++++++++++++++++++ .../mcpitanlib/api/util/v1/ItemUtilV1.java | 81 +++++++ .../mcpitanlib/api/util/v2/ItemUtilV2.java | 73 ++++++ .../pitan76/mcpitanlib/test/ExampleMod.java | 6 +- 8 files changed, 401 insertions(+), 36 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java index 2a5733342..483ebafbf 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -1,7 +1,7 @@ package ml.pkom.mcpitanlibarch.api.item; import dev.architectury.registry.CreativeTabRegistry; -import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; @@ -69,7 +69,7 @@ public ItemGroup getItemGroup() { public static void allRegister() { if (!bookingItems.isEmpty()) { for (BookingItem bookingItem : bookingItems) { - CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtil.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtilV1.fromId(bookingItem.identifier)); } bookingItems = new ArrayList<>(); } @@ -86,7 +86,7 @@ public static void register(Identifier identifier) { if (bookingItems.isEmpty()) return; for (BookingItem bookingItem : bookingItems) { if (!bookingItem.identifier.toString().equals(identifier.toString())) continue; - CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtil.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtilV1.fromId(bookingItem.identifier)); bookingItems.remove(bookingItem); break; } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java index 04b8e890c..85d37d5e4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java @@ -1,9 +1,9 @@ package ml.pkom.mcpitanlibarch.api.tag; -import ml.pkom.mcpitanlibarch.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.v1.BlockUtilV1; import ml.pkom.mcpitanlibarch.api.util.EntityTypeUtil; import ml.pkom.mcpitanlibarch.api.util.FluidUtil; -import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.minecraft.block.Block; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; @@ -43,9 +43,9 @@ public enum Type { public boolean isOf(T value) { if (value instanceof Item) - return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.ITEM, ItemUtil.toID((Item) value)); + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.ITEM, ItemUtilV1.toID((Item) value)); if (value instanceof Block) - return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.BLOCK, BlockUtil.toID((Block) value)); + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.BLOCK, BlockUtilV1.toID((Block) value)); if (value instanceof Fluid) return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.FLUID, FluidUtil.toID((Fluid) value)); if (value instanceof EntityType) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java index 2225a9b84..cfd17e37c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java @@ -6,76 +6,72 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; -import java.util.ArrayList; import java.util.List; +@Deprecated public class ItemUtil { + private static net.pitan76.mcpitanlib.api.util.ItemUtil newItemUtil = new net.pitan76.mcpitanlib.api.util.ItemUtil(); + public static Item item(Identifier id) { - return Registries.ITEM.get(id); + return newItemUtil.item(id); } public static boolean isEqual(Item item, Item item2) { - return item == item2; + return newItemUtil.isEqual(item, item2); } public static boolean isOf(ItemStack stack, Item item) { - return stack.isOf(item); + return newItemUtil.isOf(stack, item); } public static boolean isIn(ItemStack stack, TagKey tagKey) { - return isIn(stack.getItem(), tagKey); + return newItemUtil.isIn(stack, tagKey); } public static boolean isIn(Item item, TagKey tagKey) { - if (item.getRegistryEntry().isIn(tagKey.getTagKey())) return true; - return tagKey.isOf(item); + return newItemUtil.isIn(item, tagKey); } public static boolean isExist(Identifier identifier) { - return Registries.ITEM.containsId(identifier); + return newItemUtil.isExist(identifier); } public static Identifier toID(Item item) { - return Registries.ITEM.getId(item); + return newItemUtil.toID(item); } public static Item fromId(Identifier identifier) { - return Registries.ITEM.get(identifier); + return newItemUtil.fromId(identifier); } @Deprecated public static BlockItem ofBlock(Block block, Item.Settings settings) { - return new BlockItem(block, settings); + return newItemUtil.ofBlock(block, settings); } public static BlockItem ofBlock(Block block, CompatibleItemSettings settings) { - return ofBlock(block, settings.build()); + return newItemUtil.ofBlock(block, settings); } @Deprecated public static Item of(Item.Settings settings) { - return new Item(settings); + return newItemUtil.of(settings); } public static Item of(CompatibleItemSettings settings) { - return of(settings.build()); + return newItemUtil.of(settings); } public static List getAllItems() { - List items = new ArrayList<>(); - for (Item item : Registries.ITEM) { - items.add(item); - } - return items; + return newItemUtil.getAllItems(); } public static int getRawId(Item item) { - return Registries.ITEM.getRawId(item); + return newItemUtil.getRawId(item); } public static Item fromIndex(int index) { - return Registries.ITEM.get(index); + return newItemUtil.fromIndex(index); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index e79e1d33d..361997240 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -7,8 +7,8 @@ import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; -import ml.pkom.mcpitanlibarch.api.util.BlockUtil; -import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.v1.BlockUtilV1; +import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.pitan76.mcpitanlib.core.registry.FuelRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; @@ -42,14 +42,14 @@ public static CompatRegistry createRegistry(String MOD_ID) { } public RegistryResult registerItem(Identifier id, Supplier supplier) { - if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); + if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtilV1.of(CompatibleItemSettings.of()); RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); CreativeTabManager.register(id); return new RegistryResult<>(registrySupplier); } public RegistryResult registerBlock(Identifier id, Supplier supplier) { - if (MCPitanLib.isBlockBlackListed(id)) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); + if (MCPitanLib.isBlockBlackListed(id)) supplier = () -> BlockUtilV1.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); return new RegistryResult<>(mcplr.registryBlock(id, supplier)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java new file mode 100644 index 000000000..b7c2a5853 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java @@ -0,0 +1,215 @@ +package net.pitan76.mcpitanlib.api.util; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; +import net.pitan76.mcpitanlib.api.util.v2.ItemUtilV2; + +import java.util.List; + +public class ItemUtil { + + /** + * Get item from Identifier. + * @param id Identifier of the item. + * @return Item of the Identifier. + */ + public static Item item(Identifier id) { + return ItemUtilV1.item(id); + } + + /** + * Check if two items are equal. + * @param item Item to compare. + * @param item2 Item to compare. + * @return If two items are equal. + */ + public static boolean isEqual(Item item, Item item2) { + return ItemUtilV1.isEqual(item, item2); + } + + /** + * Check if the item is of the given item. + * @param stack ItemStack to check. + * @param item Item to check. + * @return If the item is of the given item. + */ + public static boolean isOf(ItemStack stack, Item item) { + return ItemUtilV1.isOf(stack, item); + } + + /** + * Check if the item is in the tag. (MCPitanLib TagKey) + * @param stack ItemStack to check. + * @param tagKey TagKey of the tag. + * @return If the item is in the tag. + */ + public static boolean isIn(ItemStack stack, TagKey tagKey) { + return ItemUtilV1.isIn(stack, tagKey); + } + + /** + * Check if the item is in the tag. (MCPitanLib TagKey) + * @param item Item to check. + * @param tagKey TagKey of the tag. + * @return If the item is in the tag. + */ + public static boolean isIn(Item item, TagKey tagKey) { + return ItemUtilV1.isIn(item, tagKey); + } + + /** + * Check if the item is existed. + * @param identifier Identifier of the item. + * @return If the item is existed. + */ + public static boolean isExist(Identifier identifier) { + return ItemUtilV1.isExist(identifier); + } + + /** + * Get Identifier from Item. + * @param item Item to get Identifier. + * @return Identifier of the Item. + */ + public static Identifier toID(Item item) { + return ItemUtilV1.toID(item); + } + + /** + * Get item from Identifier. + * @param identifier Identifier of the item. + * @return Item of the Identifier. + */ + public static Item fromId(Identifier identifier) { + return ItemUtilV1.fromId(identifier); + } + + /** + * Create BlockItem from Block and Item.Settings. + * @param block Block to create BlockItem. + * @param settings Item.Settings to create BlockItem. + * @return BlockItem created from Block and Item.Settings. + */ + @Deprecated + public static BlockItem ofBlock(Block block, Item.Settings settings) { + return ItemUtilV1.ofBlock(block, settings); + } + + /** + * Create BlockItem from Block and CompatibleItemSettings. + * @param block Block to create BlockItem. + * @param settings CompatibleItemSettings to create BlockItem. + * @return BlockItem created from Block and CompatibleItemSettings. + */ + public static BlockItem ofBlock(Block block, CompatibleItemSettings settings) { + return ItemUtilV1.ofBlock(block, settings); + } + + /** + * Create Item from Item.Settings. + * @param settings Item.Settings to create Item. + * @return Item created from Item.Settings. + */ + @Deprecated + public static Item of(Item.Settings settings) { + return ItemUtilV1.of(settings); + } + + /** + * Create Item from CompatibleItemSettings. + * @param settings CompatibleItemSettings to create Item. + * @return Item created from CompatibleItemSettings. + */ + public static Item of(CompatibleItemSettings settings) { + return ItemUtilV1.of(settings); + } + + /** + * Get all items. + * @return List of all items. + */ + public static List getAllItems() { + return ItemUtilV1.getAllItems(); + } + + /** + * Get raw id of the item. + * @param item Item to get raw id. + * @return Raw id of the item. + */ + public static int getRawId(Item item) { + return ItemUtilV1.getRawId(item); + } + + /** + * Get item from index. + * @param index Index of the item. + * @return Item of the index. + */ + public static Item fromIndex(int index) { + return ItemUtilV1.fromIndex(index); + } + + /** + * Get all items in the tag. (MCPitanLib TagKey) + * @param tagKey TagKey of the tag. + * @return List of items in the tag. + */ + public static List getItems(TagKey tagKey) { + return ItemUtilV2.getItems(tagKey); + } + + /** + * Get given the list of items in the tag. (MCPitanLib TagKey) + * @param tagKey TagKey of the tag. + * @param items List of items to search. + * @return List of items in the tag. + */ + public static List getItems(TagKey tagKey, List items) { + return ItemUtilV2.getItems(tagKey, items); + } + + /** + * Get all items in the tag. + * @param identifier Identifier of the tag. + * @return List of items in the tag. + */ + public static List getItems(Identifier identifier) { + return ItemUtilV2.getItems(identifier); + } + + /** + * Get given the list of items in the tag. + * @param identifier Identifier of the tag. + * @param items List of items to search. + * @return List of items in the tag. + */ + public static List getItems(Identifier identifier, List items) { + return ItemUtilV2.getItems(identifier, items); + } + + /** + * Get all items in the tag. + * @param id String of the tag. + * @return List of items in the tag. + */ + public static List getItems(String id) { + return ItemUtilV2.getItems(id); + } + + /** + * Get given the list of items in the tag. + * @param id String of the tag. + * @param items List of items to search. + * @return List of items in the tag. + */ + public static List getItems(String id, List items) { + return ItemUtilV2.getItems(id, items); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java new file mode 100644 index 000000000..3bad7b1a7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java @@ -0,0 +1,81 @@ +package net.pitan76.mcpitanlib.api.util.v1; + +import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; +import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; + +import java.util.ArrayList; +import java.util.List; + +public class ItemUtilV1 { + public static Item item(Identifier id) { + return Registries.ITEM.get(id); + } + + public static boolean isEqual(Item item, Item item2) { + return item == item2; + } + + public static boolean isOf(ItemStack stack, Item item) { + return stack.isOf(item); + } + + public static boolean isIn(ItemStack stack, TagKey tagKey) { + return isIn(stack.getItem(), tagKey); + } + + public static boolean isIn(Item item, TagKey tagKey) { + if (item.getRegistryEntry().isIn(tagKey.getTagKey())) return true; + return tagKey.isOf(item); + } + + public static boolean isExist(Identifier identifier) { + return Registries.ITEM.containsId(identifier); + } + public static Identifier toID(Item item) { + return Registries.ITEM.getId(item); + } + + public static Item fromId(Identifier identifier) { + return Registries.ITEM.get(identifier); + } + + @Deprecated + public static BlockItem ofBlock(Block block, Item.Settings settings) { + return new BlockItem(block, settings); + } + + public static BlockItem ofBlock(Block block, CompatibleItemSettings settings) { + return ofBlock(block, settings.build()); + } + + @Deprecated + public static Item of(Item.Settings settings) { + return new Item(settings); + } + + public static Item of(CompatibleItemSettings settings) { + return of(settings.build()); + } + + public static List getAllItems() { + List items = new ArrayList<>(); + for (Item item : Registries.ITEM) { + items.add(item); + } + return items; + } + + public static int getRawId(Item item) { + return Registries.ITEM.getRawId(item); + } + + public static Item fromIndex(int index) { + return Registries.ITEM.get(index); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java new file mode 100644 index 000000000..f98d494fd --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java @@ -0,0 +1,73 @@ +package net.pitan76.mcpitanlib.api.util.v2; + +import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.ItemUtil; + +import java.util.ArrayList; +import java.util.List; + +public class ItemUtilV2 { + /** + * Get all items in the tag. + * @param tagKey TagKey of the tag. + * @return List of items in the tag. + */ + public static List getItems(TagKey tagKey) { + return getItems(tagKey, ItemUtil.getAllItems()); + } + + /** + * Get given the list of items in the tag. + * @param tagKey TagKey of the tag. + * @param items List of items to search. + * @return List of items in the tag. + */ + public static List getItems(TagKey tagKey, List items) { + List result = new ArrayList<>(); + for (Item item : items) { + if (!ItemUtil.isIn(item, tagKey)) continue; + result.add(item); + } + return result; + } + + /** + * Get all items in the tag. + * @param identifier Identifier of the tag. + * @return List of items in the tag. + */ + public static List getItems(Identifier identifier) { + return getItems((TagKey) TagKey.create(TagKey.Type.ITEM, identifier)); + } + + /** + * Get given the list of items in the tag. + * @param identifier Identifier of the tag. + * @param items List of items to search. + * @return List of items in the tag. + */ + public static List getItems(Identifier identifier, List items) { + return getItems((TagKey) TagKey.create(TagKey.Type.ITEM, identifier), items); + } + + /** + * Get all items in the tag. + * @param id String of the tag. + * @return List of items in the tag. + */ + public static List getItems(String id) { + return getItems(new Identifier(id)); + } + + /** + * Get given the list of items in the tag. + * @param id String of the tag. + * @param items List of items to search. + * @return List of items in the tag. + */ + public static List getItems(String id, List items) { + return getItems(new Identifier(id), items); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 94f6b9bb5..b3d721e72 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -9,7 +9,7 @@ import ml.pkom.mcpitanlibarch.api.item.DefaultItemGroups; import ml.pkom.mcpitanlibarch.api.item.ExtendItem; import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; -import ml.pkom.mcpitanlibarch.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; @@ -46,12 +46,12 @@ public static Identifier id(String id) { public static void init() { EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_item")))); EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); - EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); + EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> ItemUtilV1.ofBlock(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_item")))); EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); - EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); + EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> ItemUtilV1.ofBlock(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); registry.allRegister(); From 8490f672130e5cbc1d1df8d54b3ac6be98b37a44 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:29:59 +0900 Subject: [PATCH 228/622] move BlockUtil --- .../pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename common/src/main/java/{ml/pkom/mcpitanlibarch/api/util/BlockUtil.java => net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java} (96%) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java index 6ba6a6f93..8174bd7b8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util.v1; import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; -public class BlockUtil { +public class BlockUtilV1 { public static Block block(Identifier id) { return Registries.BLOCK.get(id); } From d2946708c2b3e4ce8f652849283c977bc29df34d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:45:18 +0900 Subject: [PATCH 229/622] add new BlockUtil api --- .../mcpitanlibarch/api/util/BlockUtil.java | 64 ++++++ .../mcpitanlib/api/util/BlockUtil.java | 201 ++++++++++++++++++ .../mcpitanlib/api/util/v1/BlockUtilV1.java | 1 - .../mcpitanlib/api/util/v2/BlockUtilV2.java | 94 ++++++++ 4 files changed, 359 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java new file mode 100644 index 000000000..0ec294319 --- /dev/null +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -0,0 +1,64 @@ +package ml.pkom.mcpitanlibarch.api.util; + +import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; +import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; + +import java.util.List; + +@Deprecated +public class BlockUtil { + private static net.pitan76.mcpitanlib.api.util.BlockUtil newBlockUtil = new net.pitan76.mcpitanlib.api.util.BlockUtil(); + + public static Block block(Identifier id) { + return Registries.BLOCK.get(id); + } + + public static AbstractBlock.Settings breakByTool(AbstractBlock.Settings settings, MineableToolTags toolTags, int level) { + return newBlockUtil.breakByTool(settings, toolTags, level); + } + + public static AbstractBlock.Settings dropsNothing(AbstractBlock.Settings settings) { + return newBlockUtil.dropsNothing(settings); + } + + public static AbstractBlock.Settings requiresTool(AbstractBlock.Settings settings) { + return newBlockUtil.requiresTool(settings); + } + + public static boolean isExist(Identifier identifier) { + return newBlockUtil.isExist(identifier); + } + + public static Identifier toID(Block block) { + return newBlockUtil.toID(block); + } + + public static Block fromId(Identifier identifier) { + return newBlockUtil.fromId(identifier); + } + + public static List getAllBlocks() { + return newBlockUtil.getAllBlocks(); + } + + @Deprecated + public static Block of(AbstractBlock.Settings settings) { + return newBlockUtil.of(settings); + } + + public static Block of(CompatibleBlockSettings settings) { + return newBlockUtil.of(settings); + } + + public static int getRawId(Block block) { + return newBlockUtil.getRawId(block); + } + + public static Block fromIndex(int index) { + return newBlockUtil.fromIndex(index); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java new file mode 100644 index 000000000..7bee52266 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -0,0 +1,201 @@ +package net.pitan76.mcpitanlib.api.util; + +import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; +import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; +import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.v1.BlockUtilV1; +import net.pitan76.mcpitanlib.api.util.v2.BlockUtilV2; + +import java.util.List; + +public class BlockUtil { + /** + * Get block from Identifier. + * @param id Identifier of the block. + * @return Block of the Identifier. + */ + public static Block block(Identifier id) { + return Registries.BLOCK.get(id); + } + + /** + * Check if two blocks are equal. + * @param block Block to compare. + * @param block2 Block to compare. + * @return If two blocks are equal. + */ + public static boolean isEqual(Block block, Block block2) { + return BlockUtilV2.isEqual(block, block2); + } + + /** + * Check if the block is in the tag. (MCPitanLib TagKey) + * @param block Block to check. + * @param tagKey TagKey of the tag. + * @return If the block is in the tag. + */ + public static boolean isIn(Block block, TagKey tagKey) { + return BlockUtilV2.isIn(block, tagKey); + } + + /** + * set break tool tag and level to block + * @param settings Block settings + * @param toolTags Tool tags + * @param level Level + * @return Block settings + */ + public static AbstractBlock.Settings breakByTool(AbstractBlock.Settings settings, MineableToolTags toolTags, int level) { + return BlockUtilV1.breakByTool(settings, toolTags, level); + } + + /** + * not drop anything when block is broken + * @param settings Block settings + * @return Block settings + */ + public static AbstractBlock.Settings dropsNothing(AbstractBlock.Settings settings) { + return BlockUtilV1.dropsNothing(settings); + } + /** + * block breaking requires any tool + * @param settings Block settings + * @return Block settings + */ + public static AbstractBlock.Settings requiresTool(AbstractBlock.Settings settings) { + return BlockUtilV1.requiresTool(settings); + } + + /** + * Check if the block is existed. + * @param identifier Identifier of the block. + * @return If the block is existed. + */ + public static boolean isExist(Identifier identifier) { + return BlockUtilV1.isExist(identifier); + } + + /** + * Get Identifier from block. + * @param block Block to get Identifier. + * @return Identifier of the block. + */ + public static Identifier toID(Block block) { + return BlockUtilV1.toID(block); + } + + /** + * Get block from Identifier. + * @param identifier Identifier of the block. + * @return Block of the Identifier. + */ + public static Block fromId(Identifier identifier) { + return BlockUtilV1.fromId(identifier); + } + + /** + * Get all blocks. + * @return List of all blocks. + */ + public static List getAllBlocks() { + return BlockUtilV1.getAllBlocks(); + } + + /** + * Create Block from Block.Settings. + * @param settings Block.Settings to create Block. + * @return Block created from Block.Settings. + */ + @Deprecated + public static Block of(AbstractBlock.Settings settings) { + return BlockUtilV1.of(settings); + } + + /** + * Create Block from CompatibleBlockSettings. + * @param settings CompatibleBlockSettings to create Block. + * @return Block created from CompatibleBlockSettings. + */ + public static Block of(CompatibleBlockSettings settings) { + return BlockUtilV1.of(settings); + } + + /** + * Get raw id of the block. + * @param block Block to get raw id. + * @return Raw id of the block. + */ + public static int getRawId(Block block) { + return BlockUtilV1.getRawId(block); + } + + /** + * Get block from raw id. + * @param index Raw id of the block. + * @return Block from raw id. + */ + public static Block fromIndex(int index) { + return BlockUtilV1.fromIndex(index); + } + + /** + * Get all blocks in the tag. (MCPitanLib TagKey) + * @param tagKey TagKey of the tag. + * @return List of blocks in the tag. + */ + public static List getBlocks(TagKey tagKey) { + return BlockUtilV2.getBlocks(tagKey); + } + + /** + * Get given the list of blocks in the tag. (MCPitanLib TagKey) + * @param tagKey TagKey of the tag. + * @param blocks List of blocks to search. + * @return List of blocks in the tag. + */ + public static List getBlocks(TagKey tagKey, List blocks) { + return BlockUtilV2.getBlocks(tagKey, blocks); + } + + /** + * Get all blocks in the tag. + * @param identifier Identifier of the tag. + * @return List of blocks in the tag. + */ + public static List getBlocks(Identifier identifier) { + return BlockUtilV2.getBlocks(identifier); + } + + /** + * Get given the list of blocks in the tag. + * @param identifier Identifier of the tag. + * @param blocks List of blocks to search. + * @return List of blocks in the tag. + */ + public static List getBlocks(Identifier identifier, List blocks) { + return BlockUtilV2.getBlocks(identifier, blocks); + } + + /** + * Get all blocks in the tag. + * @param id String of the tag. + * @return List of blocks in the tag. + */ + public static List getBlocks(String id) { + return BlockUtilV2.getBlocks(id); + } + + /** + * Get given the list of blocks in the tag. + * @param id String of the tag. + * @param blocks List of blocks to search. + * @return List of blocks in the tag. + */ + public static List getBlocks(String id, List blocks) { + return BlockUtilV2.getBlocks(id, blocks); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java index 8174bd7b8..aebaf03ad 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java @@ -23,7 +23,6 @@ public static Block block(Identifier id) { * @return */ public static AbstractBlock.Settings breakByTool(AbstractBlock.Settings settings, MineableToolTags toolTags, int level) { - return settings; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java new file mode 100644 index 000000000..a30f0d1d3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java @@ -0,0 +1,94 @@ +package net.pitan76.mcpitanlib.api.util.v2; + +import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.minecraft.block.Block; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.BlockUtil; + +import java.util.ArrayList; +import java.util.List; + +public class BlockUtilV2 { + /** + * Check if the block is in the tag. (MCPitanLib TagKey) + * @param block Block to check. + * @param tagKey TagKey of the tag. + * @return If the block is in the tag. + */ + public static boolean isIn(Block block, TagKey tagKey) { + if (block.getRegistryEntry().isIn(tagKey.getTagKey())) return true; + return tagKey.isOf(block); + } + + /** + * Check if two blocks are equal. + * @param block Block to compare. + * @param block2 Block to compare. + * @return If two blocks are equal. + */ + public static boolean isEqual(Block block, Block block2) { + return block == block2; + } + + /** + * Get all blocks in the tag. + * @param tagKey TagKey of the tag. + * @return List of blocks in the tag. + */ + public static List getBlocks(TagKey tagKey) { + return getBlocks(tagKey, BlockUtil.getAllBlocks()); + } + /** + * Get given the list of blocks in the tag. + * @param tagKey TagKey of the tag. + * @param blocks List of blocks to search. + * @return List of blocks in the tag. + */ + public static List getBlocks(TagKey tagKey, List blocks) { + List result = new ArrayList<>(); + for (Block block : blocks) { + if (!BlockUtil.isIn(block, tagKey)) continue; + result.add(block); + } + return result; + } + + /** + * Get all blocks in the tag. + * @param identifier Identifier of the tag. + * @return List of blocks in the tag. + */ + public static List getBlocks(Identifier identifier) { + return getBlocks((TagKey) TagKey.create(TagKey.Type.BLOCK, identifier)); + } + + /** + * Get given the list of blocks in the tag. + * @param identifier Identifier of the tag. + * @param blocks List of blocks to search. + * @return List of blocks in the tag. + */ + public static List getBlocks(Identifier identifier, List blocks) { + return getBlocks((TagKey) TagKey.create(TagKey.Type.BLOCK, identifier), blocks); + } + + /** + * Get all blocks in the tag. + * @param id String of the tag. + * @return List of blocks in the tag. + */ + public static List getBlocks(String id) { + return getBlocks(new Identifier(id)); + } + + /** + * Get given the list of blocks in the tag. + * @param id String of the tag. + * @param blocks List of blocks to search. + * @return List of blocks in the tag. + */ + + public static List getBlocks(String id, List blocks) { + return getBlocks(new Identifier(id), blocks); + } +} From 743ca92b6fd2e26bd34afcd10a6fdce828e7fb81 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:56:14 +0900 Subject: [PATCH 230/622] add APIs --- .../mcpitanlibarch/api/block/ExtendBlock.java | 2 +- .../api/event/block/BlockUseEvent.java | 17 +++++++ .../api/event/block/PickStackEvent.java | 20 +++++++++ .../api/event/block/StateReplacedEvent.java | 45 +++++++++++++++++++ info.properties | 2 +- 5 files changed, 84 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java index 40dd2b89f..b32cec595 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java @@ -2,7 +2,6 @@ import ml.pkom.mcpitanlibarch.api.event.block.*; import ml.pkom.mcpitanlibarch.api.event.block.result.BlockBreakResult; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -23,6 +22,7 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import net.pitan76.mcpitanlib.api.util.TextUtil; import org.jetbrains.annotations.Nullable; public class ExtendBlock extends Block { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java index 97efd637a..e681ed49a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java @@ -3,6 +3,7 @@ import ml.pkom.mcpitanlibarch.api.entity.Player; import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -77,4 +78,20 @@ public ActionResult pass() { public ActionResult consume() { return ActionResult.CONSUME; } + + /** + * check if the block has a block entity + * @return true if the block has a block entity + */ + public boolean hasBlockEntity() { + return world.getBlockEntity(pos) != null; + } + + /** + * get the block entity of the block + * @return the block entity of the block + */ + public BlockEntity getBlockEntity() { + return world.getBlockEntity(pos); + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java index 7b569071c..4e26da3b1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java @@ -1,6 +1,7 @@ package ml.pkom.mcpitanlibarch.api.event.block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.WorldView; @@ -41,4 +42,23 @@ public BlockView getBlockView() { public WorldView getWorldView() { return worldView; } + + /** + * check if the block has a block entity + * @return boolean + */ + public boolean hasBlockEntity() { + return getBlockEntity() != null; + } + + /** + * @return BlockEntity + */ + public BlockEntity getBlockEntity() { + if (blockView != null) + return blockView.getBlockEntity(pos); + if (worldView != null) + return worldView.getBlockEntity(pos); + return null; + } } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java index 77a0d2efc..3a4aa68ff 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java @@ -2,6 +2,9 @@ import ml.pkom.mcpitanlibarch.api.event.BaseEvent; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.util.ItemScatterer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -44,4 +47,46 @@ public boolean isMoved() { public boolean isClient() { return world.isClient(); } + + /** + * check if the block is the same state + * @return boolean + */ + public boolean isSameState() { + return state.isOf(newState.getBlock()); + } + + /** + * check if the block has a block entity + * @return BlockEntity + */ + public boolean hasBlockEntity() { + return world.getBlockEntity(pos) != null; + } + + /** + * get the block entity + * @return BlockEntity + */ + public BlockEntity getBlockEntity() { + return world.getBlockEntity(pos); + } + + /** + * spawn the drops in the container + */ + public void spawnDropsInContainer() { + BlockEntity blockEntity = world.getBlockEntity(pos); + if (blockEntity instanceof Inventory) { + Inventory inventory = (Inventory) blockEntity; + ItemScatterer.spawn(world, pos, inventory); + } + } + + /** + * update the comparators + */ + public void updateComparators() { + world.updateComparators(pos, state.getBlock()); + } } diff --git a/info.properties b/info.properties index fa09ea47a..9bad58f41 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=1.9.5 +mod_version=1.9.6 maven_group=net.pitan76 \ No newline at end of file From 310af1d71aea698d5856cd3ca7bd8c322c6ecec4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 22:53:55 +0900 Subject: [PATCH 231/622] fix apis --- .../mcpitanlibarch/api/item/CreativeTabManager.java | 6 +++--- .../java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java | 8 ++++---- .../ml/pkom/mcpitanlibarch/api/util/BlockUtil.java | 3 +-- .../mcpitanlib/api/registry/CompatRegistry.java | 8 ++++---- .../java/net/pitan76/mcpitanlib/test/ExampleMod.java | 10 +++++----- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java index 483ebafbf..67c9f1e39 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java @@ -1,10 +1,10 @@ package ml.pkom.mcpitanlibarch.api.item; import dev.architectury.registry.CreativeTabRegistry; -import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.ItemUtil; import java.util.ArrayList; import java.util.List; @@ -69,7 +69,7 @@ public ItemGroup getItemGroup() { public static void allRegister() { if (!bookingItems.isEmpty()) { for (BookingItem bookingItem : bookingItems) { - CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtilV1.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtil.fromId(bookingItem.identifier)); } bookingItems = new ArrayList<>(); } @@ -86,7 +86,7 @@ public static void register(Identifier identifier) { if (bookingItems.isEmpty()) return; for (BookingItem bookingItem : bookingItems) { if (!bookingItem.identifier.toString().equals(identifier.toString())) continue; - CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtilV1.fromId(bookingItem.identifier)); + CreativeTabRegistry.appendBuiltin(bookingItem.getItemGroup(), ItemUtil.fromId(bookingItem.identifier)); bookingItems.remove(bookingItem); break; } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java index 85d37d5e4..4603a568e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java @@ -1,9 +1,7 @@ package ml.pkom.mcpitanlibarch.api.tag; -import net.pitan76.mcpitanlib.api.util.v1.BlockUtilV1; import ml.pkom.mcpitanlibarch.api.util.EntityTypeUtil; import ml.pkom.mcpitanlibarch.api.util.FluidUtil; -import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.minecraft.block.Block; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; @@ -11,6 +9,8 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.ItemUtil; public class TagKey { private final net.minecraft.registry.tag.TagKey tagKey; @@ -43,9 +43,9 @@ public enum Type { public boolean isOf(T value) { if (value instanceof Item) - return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.ITEM, ItemUtilV1.toID((Item) value)); + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.ITEM, ItemUtil.toID((Item) value)); if (value instanceof Block) - return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.BLOCK, BlockUtilV1.toID((Block) value)); + return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.BLOCK, BlockUtil.toID((Block) value)); if (value instanceof Fluid) return getTagKey() == net.minecraft.registry.tag.TagKey.of(RegistryKeys.FLUID, FluidUtil.toID((Fluid) value)); if (value instanceof EntityType) diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java index 0ec294319..d850d1cae 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java @@ -4,7 +4,6 @@ import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; -import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import java.util.List; @@ -14,7 +13,7 @@ public class BlockUtil { private static net.pitan76.mcpitanlib.api.util.BlockUtil newBlockUtil = new net.pitan76.mcpitanlib.api.util.BlockUtil(); public static Block block(Identifier id) { - return Registries.BLOCK.get(id); + return newBlockUtil.block(id); } public static AbstractBlock.Settings breakByTool(AbstractBlock.Settings settings, MineableToolTags toolTags, int level) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index 361997240..ee8e92217 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -7,8 +7,8 @@ import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; -import net.pitan76.mcpitanlib.api.util.v1.BlockUtilV1; -import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; +import net.pitan76.mcpitanlib.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.ItemUtil; import net.pitan76.mcpitanlib.core.registry.FuelRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; @@ -42,14 +42,14 @@ public static CompatRegistry createRegistry(String MOD_ID) { } public RegistryResult registerItem(Identifier id, Supplier supplier) { - if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtilV1.of(CompatibleItemSettings.of()); + if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); CreativeTabManager.register(id); return new RegistryResult<>(registrySupplier); } public RegistryResult registerBlock(Identifier id, Supplier supplier) { - if (MCPitanLib.isBlockBlackListed(id)) supplier = () -> BlockUtilV1.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); + if (MCPitanLib.isBlockBlackListed(id)) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); return new RegistryResult<>(mcplr.registryBlock(id, supplier)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index b3d721e72..7e5e001b4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -8,13 +8,13 @@ import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; import ml.pkom.mcpitanlibarch.api.item.DefaultItemGroups; import ml.pkom.mcpitanlibarch.api.item.ExtendItem; -import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; -import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.registry.CompatRegistry; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.util.ItemUtil; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -32,7 +32,7 @@ public static Identifier id(String id) { return new Identifier(MOD_ID, id); } - public static ArchRegistry registry = ArchRegistry.createRegistry(MOD_ID); + public static CompatRegistry registry = CompatRegistry.createRegistry(MOD_ID); public static RegistryResult> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); @@ -46,12 +46,12 @@ public static Identifier id(String id) { public static void init() { EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_item")))); EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); - EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> ItemUtilV1.ofBlock(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); + EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_item")))); EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); - EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> ItemUtilV1.ofBlock(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); + EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); registry.allRegister(); From 29bab1d88780c274c95446f8ff6189a1313a0323 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 22:54:02 +0900 Subject: [PATCH 232/622] add readme --- README.md | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..6e89f70cc --- /dev/null +++ b/README.md @@ -0,0 +1,89 @@ +# MCPitanLib +## 日本語 +MCPitanLibはライブラリです。 1つのjarで複数のMCバージョンを対応させるためのものです。
+開発中であるため、予告なく仕様が変更されることがあったり、不具合があるかもしれません。
+私専用につくっているため、他の方が使うことをあまり想定していません。
+ +### 前提MOD +- MODローダー + - [FabricMC](https://fabricmc.net/) + - [Minecraft Forge](https://files.minecraftforge.net/) + - [NeoForge](https://neoforged.net/) +- [Architectury API (CurseForge)](https://www.curseforge.com/minecraft/mc-mods/architectury-api) + +### ダウンロード +[CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) +[Modrinth](https://modrinth.com/mod/mcpitanlibarch) + +### 使い方 +`build.gradle`に以下のように記述してください。 +```groovy +repositories { + maven { + url = "https://maven.pitan76.net/" + } +} + +dependencies { + // FabricMC + modImplementation "net.pitan76:mcpitanlib-fabric:${rootProject.mcpitanlib_version}" + + // Minecraft Forge + //modImplementation "net.pitan76:mcpitanlib-forge:${rootProject.mcpitanlib_version}" + + // NeoForge + //modImplementation "net.pitan76:mcpitanlib-neoforge:${rootProject.mcpitanlib_version}" +} +``` + +`gradle.properties`に以下のように記述してください。 +```properties +mcpitanlib_version=x.x.x +``` + +バージョンは[maven.pitan76.net](https://maven.pitan76.net/net/pitan76/)で確認してください。 + +## English +MCPitanLib is a library. It is for supporting multiple MC versions with one jar.
+It is under development, so the specification may change without notice, and there may be bugs.
+I am creating it for my own use, so I don't expect others to use it much.
+ +### Required MOD +- MOD Loader + - [FabricMC](https://fabricmc.net/) + - [Minecraft Forge](https://files.minecraftforge.net/) + - [NeoForge](https://neoforged.net/) +- [Architectury API (CurseForge)](https://www.curseforge.com/minecraft/mc-mods/architectury-api) + +### Download +[CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) +[Modrinth](https://modrinth.com/mod/mcpitanlibarch) + +### How to use +Write as follows in `build.gradle`. +```groovy +repositories { + maven { + url = "https://maven.pitan76.net/" + } +} + +dependencies { + // FabricMC + modImplementation "net.pitan76:mcpitanlib-fabric${rootProject.mcpitanlib_version}" + + // Minecraft Forge + //modImplementation "net.pitan76:mcpitanlib-forge${rootProject.mcpitanlib_version}" + + // NeoForge + //modImplementation "net.pitan76:mcpitanlib-neoforge${rootProject.mcpitanlib_version}" +} +``` + +Write as follows in `gradle.properties`. +```properties +# Example: mcpitanlib_version=+1.18.2:1.9.5 +mcpitanlib_version=+x.x.x:x.x.x +``` + +Please check the version at [maven.pitan76.net](https://maven.pitan76.net/net/pitan76/). From 40f62847e1c0efb578482e11b5a024a1e7a69cf9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 23:14:23 +0900 Subject: [PATCH 233/622] add readme improved Example Mod --- README.md | 5 ++++ .../mcpitanlib/test/ExampleCommand.java | 4 +-- .../pitan76/mcpitanlib/test/ExampleMod.java | 28 ++++++++++--------- .../mcpitanlib/test/ExampleModClient.java | 2 +- .../mcpitanlib/test/ExampleScreen.java | 5 ++-- .../mcpitanlib/test/ExampleScreenHandler.java | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 6e89f70cc..7bf1c1ed6 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ mcpitanlib_version=x.x.x バージョンは[maven.pitan76.net](https://maven.pitan76.net/net/pitan76/)で確認してください。 +MCPitanLibを用いたMOD開発は「common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java」を参考にしてください。 + ## English MCPitanLib is a library. It is for supporting multiple MC versions with one jar.
It is under development, so the specification may change without notice, and there may be bugs.
@@ -87,3 +89,6 @@ mcpitanlib_version=+x.x.x:x.x.x ``` Please check the version at [maven.pitan76.net](https://maven.pitan76.net/net/pitan76/). + +For MOD development using MCPitanLib, refer to "common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java". + diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java index b22415118..21ad1d487 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java @@ -19,7 +19,7 @@ public void init(CommandSettings settings) { @Override public void execute(IntegerCommandEvent event) { try { - event.getPlayer().offerOrDrop(new ItemStack(ExampleMod.EXAMPLE_ITEM_SUPPLIER.getOrNull(), event.getValue())); + event.getPlayer().offerOrDrop(new ItemStack(ExampleMod.EXAMPLE_ITEM.getOrNull(), event.getValue())); } catch (CommandSyntaxException ignored) { } @@ -35,7 +35,7 @@ public String getArgumentName() { @Override public void execute(ServerCommandEvent event) { try { - event.getPlayer().offerOrDrop(new ItemStack(ExampleMod.EXAMPLE_ITEM_SUPPLIER.getOrNull())); + event.getPlayer().offerOrDrop(new ItemStack(ExampleMod.EXAMPLE_ITEM.getOrNull())); } catch (CommandSyntaxException ignored) { } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 7e5e001b4..831a80794 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -32,26 +32,28 @@ public static Identifier id(String id) { return new Identifier(MOD_ID, id); } + // en: Create a CompatRegistry instance. , ja: CompatRegistryインスタンスを作成します。 public static CompatRegistry registry = CompatRegistry.createRegistry(MOD_ID); - public static RegistryResult> supplierEXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); + public static RegistryResult> EXAMPLE_SCREENHANDLER; - public static RegistryResult EXAMPLE_ITEM_SUPPLIER; - public static RegistryResult EXAMPLE_BLOCK_SUPPLIER; - public static RegistryResult EXAMPLE_BLOCK_ITEM_SUPPLIER; - public static RegistryResult EXAMPLE_GUI_ITEM_SUPPLIER; - public static RegistryResult EXAMPLE_GUI_BLOCK_SUPPLIER; - public static RegistryResult EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER; + public static RegistryResult EXAMPLE_ITEM; + public static RegistryResult EXAMPLE_BLOCK; + public static RegistryResult EXAMPLE_BLOCK_ITEM; + public static RegistryResult EXAMPLE_GUI_ITEM; + public static RegistryResult EXAMPLE_GUI_BLOCK; + public static RegistryResult EXAMPLE_GUI_BLOCK_ITEM; public static void init() { - EXAMPLE_ITEM_SUPPLIER = registry.registerItem(id("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_item")))); - EXAMPLE_BLOCK_SUPPLIER = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); - EXAMPLE_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); + EXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); + EXAMPLE_ITEM = registry.registerItem(id("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_item")))); + EXAMPLE_BLOCK = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); + EXAMPLE_BLOCK_ITEM = registry.registerItem(id("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); - EXAMPLE_GUI_ITEM_SUPPLIER = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_item")))); + EXAMPLE_GUI_ITEM = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_item")))); - EXAMPLE_GUI_BLOCK_SUPPLIER = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); - EXAMPLE_GUI_BLOCK_ITEM_SUPPLIER = registry.registerItem(id("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK_SUPPLIER.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); + EXAMPLE_GUI_BLOCK = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); + EXAMPLE_GUI_BLOCK_ITEM = registry.registerItem(id("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); registry.allRegister(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java index 9ca57a61b..8e7a92286 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java @@ -4,6 +4,6 @@ public class ExampleModClient { public static void init() { - ArchRegistryClient.registerScreen(ExampleMod.supplierEXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); + ArchRegistryClient.registerScreen(ExampleMod.EXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java index eb19cb565..4f5d4b38f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java @@ -1,11 +1,10 @@ package net.pitan76.mcpitanlib.test; import ml.pkom.mcpitanlibarch.api.client.SimpleHandledScreen; +import ml.pkom.mcpitanlibarch.api.client.gui.widget.CompatibleTexturedButtonWidget; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawBackgroundArgs; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawMouseoverTooltipArgs; import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; -import net.minecraft.client.gui.screen.ButtonTextures; -import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; @@ -23,7 +22,7 @@ public ExampleScreen(ScreenHandler handler, PlayerInventory inventory, Text titl public void initOverride() { super.initOverride(); System.out.println("hogehogehoge1111"); - this.addDrawableChild_compatibility(new TexturedButtonWidget(0, 0, 30, 30, new ButtonTextures(GUI, GUI), (buttonWidget) -> { + this.addDrawableCTBW(new CompatibleTexturedButtonWidget(0, 0, 30, 30, 0, 0, GUI, (buttonWidget) -> { System.out.println("hogehoge"); })); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java index fbe9110fd..7a98cdcf9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java @@ -8,7 +8,7 @@ public class ExampleScreenHandler extends SimpleScreenHandler { public ExampleScreenHandler(int i, PlayerInventory playerInventory) { - super(ExampleMod.supplierEXAMPLE_SCREENHANDLER.getOrNull(), i); + super(ExampleMod.EXAMPLE_SCREENHANDLER.getOrNull(), i); } From 0f5eb8442ff984596da8be9f8b082580c00bcaac Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 14 Feb 2024 23:16:17 +0900 Subject: [PATCH 234/622] improved Example Mod --- .../src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 831a80794..8bd3fb527 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -45,6 +45,7 @@ public static Identifier id(String id) { public static RegistryResult EXAMPLE_GUI_BLOCK_ITEM; public static void init() { + // en: Register all items, blocks, and others. , ja: 全てのアイテム、ブロック、その他を登録します。 EXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); EXAMPLE_ITEM = registry.registerItem(id("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_item")))); EXAMPLE_BLOCK = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); @@ -55,8 +56,10 @@ public static void init() { EXAMPLE_GUI_BLOCK = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); EXAMPLE_GUI_BLOCK_ITEM = registry.registerItem(id("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); + // en: Register all registered creative tabs and others , ja: 登録された全てのクリエイティブタブやその他を登録します registry.allRegister(); + // en: Register the command , ja: コマンドを登録します CommandRegistry.register("mpla", new ExampleCommand()); } } From a744d6cdee97aa52fba4d293756394fe459f94ef Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:23:14 +0900 Subject: [PATCH 235/622] rename package --- common/build.gradle | 2 +- .../java/ml/pkom/mcpitanlibarch/Dummy.java | 4 - .../api/command/LiteralCommand.java | 7 -- .../mcpitanlibarch/api/event/BaseEvent.java | 4 - .../api/event/registry/RegistryEvent.java | 10 -- .../api/registry/ArchRegistry.java | 100 ------------------ .../mcpitanlibarch/api/util/BlockUtil.java | 63 ----------- .../mcpitanlibarch/api/util/ItemUtil.java | 77 -------------- .../mcpitanlibarch/api/util/TextUtil.java | 30 ------ .../pitan76}/easyapi/FileControl.java | 2 +- .../pitan76}/easyapi/config/Config.java | 2 +- .../pitan76}/easyapi/config/IConfig.java | 2 +- .../pitan76}/easyapi/config/JsonConfig.java | 4 +- .../pitan76}/easyapi/config/YamlConfig.java | 4 +- .../pitan76}/easyapi/config/package-info.java | 2 +- .../net/pitan76/mcpitanlib/MCPitanLib.java | 10 +- .../api/block/CompatibleBlockSettings.java | 3 +- .../api/block/CompatibleMaterial.java | 2 +- .../mcpitanlib}/api/block/ExtendBlock.java | 6 +- .../api/block/ExtendBlockEntityProvider.java | 6 +- .../api/client/SimpleHandledScreen.java | 9 +- .../client/registry/ArchRegistryClient.java | 3 +- .../client/registry/KeybindingRegistry.java | 8 +- .../api/client/render/DrawObjectDM.java | 2 +- .../handledscreen/DrawBackgroundArgs.java | 4 +- .../handledscreen/DrawForegroundArgs.java | 4 +- .../DrawMouseoverTooltipArgs.java | 4 +- .../render/handledscreen/KeyEventArgs.java | 2 +- .../render/handledscreen/RenderArgs.java | 4 +- .../CompatibleTexturedButtonWidget.java | 4 +- .../RedrawableTexturedButtonWidget.java | 2 +- .../api/command/AbstractCommand.java | 6 +- .../api/command/CommandRegistry.java | 9 +- .../api/command/CommandSettings.java | 2 +- .../api/command/ConfigCommand.java | 12 +-- .../api/command/LiteralCommand.java | 7 ++ .../api/command/argument/EntitiesCommand.java | 6 +- .../api/command/argument/EntityCommand.java | 6 +- .../command/argument/GreedyStringCommand.java | 4 +- .../api/command/argument/IntegerCommand.java | 6 +- .../api/command/argument/ItemCommand.java | 8 +- .../api/command/argument/PlayerCommand.java | 6 +- .../api/command/argument/PlayersCommand.java | 7 +- .../api/command/argument/RequiredCommand.java | 5 +- .../api/command/argument/StringCommand.java | 6 +- .../api/entity/EntityTypeBuilder.java | 9 +- .../mcpitanlib}/api/entity/ExtendEntity.java | 4 +- .../api/entity/ExtendEntityType.java | 2 +- .../mcpitanlib}/api/entity/Player.java | 8 +- .../mcpitanlib/api/event/BaseEvent.java | 4 + .../mcpitanlib}/api/event/CommandEvent.java | 4 +- .../api/event/EntitiesCommandEvent.java | 4 +- .../api/event/EntityCommandEvent.java | 4 +- .../api/event/IntegerCommandEvent.java | 4 +- .../api/event/ItemCommandEvent.java | 4 +- .../api/event/PlayerCommandEvent.java | 4 +- .../api/event/PlayersCommandEvent.java | 4 +- .../api/event/RequiredCommandEvent.java | 2 +- .../api/event/ServerCommandEvent.java | 4 +- .../api/event/StringCommandEvent.java | 4 +- .../api/event/block/BlockBreakEvent.java | 6 +- .../api/event/block/BlockPlacedEvent.java | 4 +- .../event/block/BlockScheduledTickEvent.java | 4 +- .../api/event/block/BlockUseEvent.java | 6 +- .../api/event/block/OutlineShapeEvent.java | 4 +- .../api/event/block/PickStackEvent.java | 2 +- .../event/block/ScreenHandlerCreateEvent.java | 6 +- .../api/event/block/StateReplacedEvent.java | 4 +- .../api/event/block/TileCreateEvent.java | 4 +- .../event/block/result/BlockBreakResult.java | 2 +- .../api/event/item/CraftEvent.java | 2 +- .../event/item/ItemAppendTooltipEvent.java | 4 +- .../api/event/item/ItemFinishUsingEvent.java | 4 +- .../api/event/item/ItemUseEvent.java | 6 +- .../api/event/item/ItemUseOnBlockEvent.java | 6 +- .../api/event/item/ItemUseOnEntityEvent.java | 6 +- .../api/event/tile/TileTickEvent.java | 2 +- .../event/v0/AttackEntityEventRegistry.java | 4 +- .../api/event/v0/ClientTickEventRegistry.java | 2 +- .../api/event/v0/EventRegistry.java | 7 +- .../event/v0/event/ItemStackActionEvent.java | 4 +- .../event/v0/event/RecipeManagerEvent.java | 4 +- .../event/v0/event/ServerConnectionEvent.java | 4 +- .../api/event/v1/RecipeManagerRegistry.java | 2 +- .../ExtendedNamedScreenHandlerFactory.java | 2 +- .../api/gui/ExtendedScreenHandler.java | 2 +- .../gui/ExtendedScreenHandlerTypeBuilder.java | 2 +- .../api/gui/SimpleScreenHandler.java | 4 +- .../gui/SimpleScreenHandlerTypeBuilder.java | 2 +- .../api/gui/inventory/IInventory.java | 2 +- .../api/gui/slot/CompatibleSlot.java | 2 +- .../api/item/ArmorEquipmentType.java | 2 +- .../api/item/CompatibleArmorMaterial.java | 2 +- .../api/item/CompatibleItemSettings.java | 2 +- .../api/item/CreativeTabBuilder.java | 4 +- .../api/item/CreativeTabManager.java | 2 +- .../api/item/DefaultItemGroups.java | 2 +- .../mcpitanlib}/api/item/ExtendItem.java | 6 +- .../api/item/ExtendItemProvider.java | 5 +- .../mcpitanlib}/api/item/ExtendSettings.java | 2 +- .../api/item/FixedRecipeRemainderItem.java | 2 +- .../api/item/tool/CompatibleAxeItem.java | 7 +- .../api/item/tool/CompatibleHoeItem.java | 7 +- .../api/item/tool/CompatiblePickaxeItem.java | 6 +- .../api/item/tool/CompatibleShovelItem.java | 6 +- .../api/item/tool/CompatibleSwordItem.java | 7 +- .../api/item/tool/CompatibleToolMaterial.java | 2 +- .../pitan76/mcpitanlib}/api/nbt/NbtTag.java | 2 +- .../api/network/ClientNetworking.java | 2 +- .../api/network/PacketByteUtil.java | 2 +- .../api/network/ServerNetworking.java | 2 +- .../api/packet/UpdatePacketType.java | 2 +- .../api/recipe/CompatibleRecipeEntry.java | 4 +- .../api/registry/CompatRegistry.java | 10 +- .../mcpitanlib}/api/tag/MineableToolTags.java | 2 +- .../pitan76/mcpitanlib}/api/tag/TagKey.java | 6 +- .../mcpitanlib}/api/text/TextComponent.java | 4 +- .../api/text/VariableTextComponent.java | 4 +- .../api/tile/BlockEntityTypeBuilder.java | 4 +- .../api/tile/ExtendBlockEntity.java | 8 +- .../api/tile/ExtendBlockEntityTicker.java | 4 +- .../api/timer/MinecraftServerTimerAccess.java | 2 +- .../api/timer/ServerWorldTimerAccess.java | 2 +- .../mcpitanlib}/api/timer/TimerItem.java | 2 +- .../api/util/ActionResultUtil.java | 2 +- .../api/util/BlockEntityTypeUtil.java | 2 +- .../mcpitanlib/api/util/BlockUtil.java | 6 +- .../api/util/CompatibleRecipeEntryUtil.java | 4 +- .../api/util/DamageSourceUtil.java | 4 +- .../mcpitanlib}/api/util/EntityTypeUtil.java | 2 +- .../mcpitanlib}/api/util/EntityUtil.java | 4 +- .../api/util/EquipMaterialUtil.java | 6 +- .../mcpitanlib}/api/util/FluidUtil.java | 2 +- .../mcpitanlib}/api/util/IngredientUtil.java | 2 +- .../mcpitanlib}/api/util/InventoryUtil.java | 4 +- .../mcpitanlib}/api/util/ItemStackUtil.java | 2 +- .../pitan76/mcpitanlib/api/util/ItemUtil.java | 4 +- .../mcpitanlib}/api/util/MathUtil.java | 2 +- .../api/util/PersistentStateUtil.java | 2 +- .../mcpitanlib}/api/util/PlatformUtil.java | 2 +- .../mcpitanlib}/api/util/PlayerUtil.java | 5 +- .../mcpitanlib}/api/util/RecipeUtil.java | 2 +- .../mcpitanlib}/api/util/ResourceUtil.java | 2 +- .../api/util/ScreenHandlerUtil.java | 2 +- .../api/util/SimpleInventoryUtil.java | 2 +- .../mcpitanlib}/api/util/SlotUtil.java | 2 +- .../mcpitanlib}/api/util/TimerUtil.java | 6 +- .../mcpitanlib}/api/util/WorldRandomUtil.java | 2 +- .../mcpitanlib}/api/util/WorldUtil.java | 4 +- .../api/util/client/MatrixStackUtil.java | 6 +- .../api/util/client/RenderUtil.java | 2 +- .../api/util/client/ScreenUtil.java | 11 +- .../api/util/event/BlockEventGenerator.java | 8 +- .../api/util/event/ItemEventGenerator.java | 4 +- .../mcpitanlib}/api/util/math/BoxUtil.java | 2 +- .../mcpitanlib}/api/util/math/PosUtil.java | 2 +- .../mcpitanlib/api/util/v1/BlockUtilV1.java | 4 +- .../mcpitanlib/api/util/v1/ItemUtilV1.java | 4 +- .../mcpitanlib/api/util/v2/BlockUtilV2.java | 2 +- .../mcpitanlib/api/util/v2/ItemUtilV2.java | 2 +- .../api/world/CompatiblePersistentState.java | 2 +- .../mcpitanlib}/api/world/ExtendWorld.java | 4 +- .../net/pitan76/mcpitanlib/core/Dummy.java | 4 + .../mcpitanlib}/core/player/ItemCooldown.java | 4 +- .../pitan76/mcpitanlib/debug/DebugTool.java | 4 +- .../pitan76/mcpitanlib/mixin/ItemMixin.java | 6 +- .../mcpitanlib/mixin/ItemStackMixin.java | 2 +- .../mixin/MinecraftServerTimer.java | 4 +- .../mcpitanlib/mixin/RecipeManagerMixin.java | 2 +- .../mcpitanlib/mixin/ServerWorldTimer.java | 4 +- .../mcpitanlib/test/ExampleCommand.java | 10 +- .../mcpitanlib/test/ExampleGuiBlock.java | 6 +- .../mcpitanlib/test/ExampleGuiItem.java | 8 +- .../pitan76/mcpitanlib/test/ExampleMod.java | 16 +-- .../mcpitanlib/test/ExampleModClient.java | 2 +- .../mcpitanlib/test/ExampleScreen.java | 10 +- .../mcpitanlib/test/ExampleScreenHandler.java | 4 +- common/src/main/resources/icon.png | Bin 0 -> 66211 bytes ...ins.json => mcpitanlib-common.mixins.json} | 0 ...accesswidener => mcpitanlib.accesswidener} | 0 .../mcpitanlib/fabric/mixin/RecipeMixin.java | 2 +- fabric/src/main/resources/fabric.mod.json | 14 ++- ...rch.mixins.json => mcpitanlib.mixins.json} | 0 forge/build.gradle | 4 +- ...rch.mixins.json => mcpitanlib.mixins.json} | 0 info.properties | 2 +- .../src/main/resources/META-INF/mods.toml | 10 +- ...rch.mixins.json => mcpitanlib.mixins.json} | 2 +- .../quilt/MCPitanLibQuilt.java} | 8 +- .../quilt/mixin/RecipeMixin.java | 4 +- ...rch.mixins.json => mcpitanlib.mixins.json} | 2 +- quilt/src/main/resources/quilt.mod.json | 4 +- 192 files changed, 381 insertions(+), 669 deletions(-) delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BaseEvent.java delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java delete mode 100644 common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java rename common/src/main/java/{ml/pkom => net/pitan76}/easyapi/FileControl.java (99%) rename common/src/main/java/{ml/pkom => net/pitan76}/easyapi/config/Config.java (99%) rename common/src/main/java/{ml/pkom => net/pitan76}/easyapi/config/IConfig.java (95%) rename common/src/main/java/{ml/pkom => net/pitan76}/easyapi/config/JsonConfig.java (96%) rename common/src/main/java/{ml/pkom => net/pitan76}/easyapi/config/YamlConfig.java (97%) rename common/src/main/java/{ml/pkom => net/pitan76}/easyapi/config/package-info.java (65%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/block/CompatibleBlockSettings.java (98%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/block/CompatibleMaterial.java (99%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/block/ExtendBlock.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/block/ExtendBlockEntityProvider.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/SimpleHandledScreen.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/registry/ArchRegistryClient.java (98%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/registry/KeybindingRegistry.java (84%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/render/DrawObjectDM.java (92%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/render/handledscreen/DrawBackgroundArgs.java (88%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/render/handledscreen/DrawForegroundArgs.java (85%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java (85%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/render/handledscreen/KeyEventArgs.java (91%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/client/render/handledscreen/RenderArgs.java (88%) rename common/src/main/java/{ml/pkom/mcpitanlibarch/api/client/gui => net/pitan76/mcpitanlib/api/client}/widget/CompatibleTexturedButtonWidget.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch/api/client/gui => net/pitan76/mcpitanlib/api/client}/widget/RedrawableTexturedButtonWidget.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/AbstractCommand.java (85%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/CommandRegistry.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/CommandSettings.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/ConfigCommand.java (95%) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/command/LiteralCommand.java rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/EntitiesCommand.java (72%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/EntityCommand.java (72%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/GreedyStringCommand.java (58%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/IntegerCommand.java (71%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/ItemCommand.java (68%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/PlayerCommand.java (72%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/PlayersCommand.java (66%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/RequiredCommand.java (58%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/command/argument/StringCommand.java (71%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/entity/EntityTypeBuilder.java (92%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/entity/ExtendEntity.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/entity/ExtendEntityType.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/entity/Player.java (97%) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/BaseEvent.java rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/CommandEvent.java (87%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/EntitiesCommandEvent.java (82%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/EntityCommandEvent.java (82%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/IntegerCommandEvent.java (72%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/ItemCommandEvent.java (75%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/PlayerCommandEvent.java (82%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/PlayersCommandEvent.java (82%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/RequiredCommandEvent.java (73%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/ServerCommandEvent.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/StringCommandEvent.java (71%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/BlockBreakEvent.java (86%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/BlockPlacedEvent.java (91%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/BlockScheduledTickEvent.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/BlockUseEvent.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/OutlineShapeEvent.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/PickStackEvent.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/ScreenHandlerCreateEvent.java (84%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/StateReplacedEvent.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/TileCreateEvent.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/block/result/BlockBreakResult.java (82%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/item/CraftEvent.java (90%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/item/ItemAppendTooltipEvent.java (90%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/item/ItemFinishUsingEvent.java (87%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/item/ItemUseEvent.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/item/ItemUseOnBlockEvent.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/item/ItemUseOnEntityEvent.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/tile/TileTickEvent.java (91%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/v0/AttackEntityEventRegistry.java (90%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/v0/ClientTickEventRegistry.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/v0/EventRegistry.java (91%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/v0/event/ItemStackActionEvent.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/v0/event/RecipeManagerEvent.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/event/v0/event/ServerConnectionEvent.java (79%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/gui/ExtendedNamedScreenHandlerFactory.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/gui/ExtendedScreenHandler.java (92%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/gui/ExtendedScreenHandlerTypeBuilder.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/gui/SimpleScreenHandler.java (98%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/gui/SimpleScreenHandlerTypeBuilder.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/gui/inventory/IInventory.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/gui/slot/CompatibleSlot.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/ArmorEquipmentType.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/CompatibleArmorMaterial.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/CompatibleItemSettings.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/CreativeTabBuilder.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/CreativeTabManager.java (98%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/DefaultItemGroups.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/ExtendItem.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/ExtendItemProvider.java (92%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/ExtendSettings.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/FixedRecipeRemainderItem.java (77%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/tool/CompatibleAxeItem.java (85%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/tool/CompatibleHoeItem.java (85%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/tool/CompatiblePickaxeItem.java (88%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/tool/CompatibleShovelItem.java (88%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/tool/CompatibleSwordItem.java (85%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/item/tool/CompatibleToolMaterial.java (69%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/nbt/NbtTag.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/network/ClientNetworking.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/network/PacketByteUtil.java (99%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/network/ServerNetworking.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/packet/UpdatePacketType.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/recipe/CompatibleRecipeEntry.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/tag/MineableToolTags.java (73%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/tag/TagKey.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/text/TextComponent.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/text/VariableTextComponent.java (82%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/tile/BlockEntityTypeBuilder.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/tile/ExtendBlockEntity.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/tile/ExtendBlockEntityTicker.java (83%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/timer/MinecraftServerTimerAccess.java (79%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/timer/ServerWorldTimerAccess.java (78%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/timer/TimerItem.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/ActionResultUtil.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/BlockEntityTypeUtil.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/DamageSourceUtil.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/EntityTypeUtil.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/EntityUtil.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/EquipMaterialUtil.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/FluidUtil.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/IngredientUtil.java (91%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/InventoryUtil.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/ItemStackUtil.java (93%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/MathUtil.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/PersistentStateUtil.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/PlatformUtil.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/PlayerUtil.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/RecipeUtil.java (98%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/ResourceUtil.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/ScreenHandlerUtil.java (97%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/SimpleInventoryUtil.java (88%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/SlotUtil.java (90%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/TimerUtil.java (76%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/WorldRandomUtil.java (95%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/WorldUtil.java (98%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/client/MatrixStackUtil.java (62%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/client/RenderUtil.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/client/ScreenUtil.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/event/BlockEventGenerator.java (68%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/event/ItemEventGenerator.java (74%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/math/BoxUtil.java (96%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/util/math/PosUtil.java (94%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/world/CompatiblePersistentState.java (89%) rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/api/world/ExtendWorld.java (91%) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/core/Dummy.java rename common/src/main/java/{ml/pkom/mcpitanlibarch => net/pitan76/mcpitanlib}/core/player/ItemCooldown.java (81%) rename common/src/main/resources/{mcpitanlibarch-common.mixins.json => mcpitanlib-common.mixins.json} (100%) rename common/src/main/resources/{mcpitanlibarch.accesswidener => mcpitanlib.accesswidener} (100%) rename fabric/src/main/resources/{mcpitanlibarch.mixins.json => mcpitanlib.mixins.json} (100%) rename forge/src/main/resources/{mcpitanlibarch.mixins.json => mcpitanlib.mixins.json} (100%) rename neoforge/src/main/resources/{mcpitanlibarch.mixins.json => mcpitanlib.mixins.json} (76%) rename quilt/src/main/java/ml/pkom/{mcpitanlibarch/quilt/MCPitanLibarchQuilt.java => mcpitanlib/quilt/MCPitanLibQuilt.java} (50%) rename quilt/src/main/java/ml/pkom/{mcpitanlibarch => mcpitanlib}/quilt/mixin/RecipeMixin.java (90%) rename quilt/src/main/resources/{mcpitanlibarch.mixins.json => mcpitanlib.mixins.json} (77%) diff --git a/common/build.gradle b/common/build.gradle index 5f3806e93..8d6073e0f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -11,7 +11,7 @@ architectury { } loom { - accessWidenerPath = file("src/main/resources/mcpitanlibarch.accesswidener") + accessWidenerPath = file("src/main/resources/mcpitanlib.accesswidener") } publishing { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java b/common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java deleted file mode 100644 index d523b5c3a..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/Dummy.java +++ /dev/null @@ -1,4 +0,0 @@ -package ml.pkom.mcpitanlibarch; - -public class Dummy { -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java deleted file mode 100644 index c0510c381..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/LiteralCommand.java +++ /dev/null @@ -1,7 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.command; - -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; - -public abstract class LiteralCommand extends AbstractCommand { - -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BaseEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BaseEvent.java deleted file mode 100644 index 7dc5d4429..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/BaseEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.event; - -public class BaseEvent { -} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java deleted file mode 100644 index f47c62fa0..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/registry/RegistryEvent.java +++ /dev/null @@ -1,10 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.event.registry; - -import dev.architectury.registry.registries.RegistrySupplier; -import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; - -public class RegistryEvent extends RegistryResult { - public RegistryEvent(RegistrySupplier supplier) { - super(supplier); - } -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java deleted file mode 100644 index a0584df10..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/registry/ArchRegistry.java +++ /dev/null @@ -1,100 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.registry; - -import ml.pkom.mcpitanlibarch.api.event.registry.RegistryEvent; -import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; -import net.minecraft.block.Block; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.entity.EntityType; -import net.minecraft.fluid.Fluid; -import net.minecraft.item.Item; -import net.minecraft.item.ItemConvertible; -import net.minecraft.item.ItemGroup; -import net.minecraft.particle.ParticleType; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; -import net.pitan76.mcpitanlib.api.registry.CompatRegistry; -import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; -import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; - -import java.util.function.Supplier; - -@Deprecated -public class ArchRegistry { - - private final CompatRegistry compatRegistry; - private final MCPLRegistry mcplr; - private final MCPLRegistry1_20 mcplr1_20; - - public ArchRegistry(String MOD_ID) { - compatRegistry = new CompatRegistry(MOD_ID); - mcplr = compatRegistry.getMcplr(); - mcplr1_20 = compatRegistry.getMcplr1_20(); - } - - public static ArchRegistry createRegistry(String MOD_ID) { - return new ArchRegistry(MOD_ID); - } - - public RegistryEvent registerItem(Identifier id, Supplier supplier) { - return new RegistryEvent<>(compatRegistry.registerItem(id, supplier).supplier); - } - - public RegistryEvent registerBlock(Identifier id, Supplier supplier) { - return new RegistryEvent<>(compatRegistry.registerBlock(id, supplier).supplier); - } - - public RegistryEvent> registerScreenHandlerType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(compatRegistry.registerScreenHandlerType(id, supplier).supplier); - } - - @Deprecated - public RegistryEvent> registerExtendedScreenHandlerType(Identifier id, Supplier> supplier) { - return registerScreenHandlerType(id, () -> supplier.get().build()); - } - - public RegistryEvent> registerMenu(Identifier id, Supplier> supplier) { - return registerScreenHandlerType(id, supplier); - } - - public RegistryEvent> registerBlockEntityType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(compatRegistry.registerBlockEntityType(id, supplier).supplier); - } - - public RegistryEvent> registerEntity(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(compatRegistry.registerEntity(id, supplier).supplier); - } - - @Deprecated - public RegistryEvent registerSoundEvent(Identifier id, Supplier supplier) { - return new RegistryEvent<>(compatRegistry.registerSoundEvent(id, supplier).supplier); - } - - public RegistryEvent registerSoundEvent(Identifier id) { - return new RegistryEvent<>(compatRegistry.registerSoundEvent(id).supplier); - } - - public RegistryEvent registerSoundEvent(Identifier id, float distanceToTravel) { - return new RegistryEvent<>(compatRegistry.registerSoundEvent(id, distanceToTravel).supplier); - } - - public RegistryEvent registerFluid(Identifier id, Supplier supplier) { - return new RegistryEvent<>(compatRegistry.registerFluid(id, supplier).supplier); - } - - public RegistryEvent> registerParticleType(Identifier id, Supplier> supplier) { - return new RegistryEvent<>(compatRegistry.registerParticleType(id, supplier).supplier); - } - - public RegistryEvent registerItemGroup(Identifier id, Supplier supplier) { - return new RegistryEvent<>(compatRegistry.registerItemGroup(id, supplier).supplier); - } - - public static void registerFuel(int time, ItemConvertible... item) { - CompatRegistry.registerFuel(time, item); - } - - public void allRegister() { - compatRegistry.allRegister(); - } -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java deleted file mode 100644 index d850d1cae..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockUtil.java +++ /dev/null @@ -1,63 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.util; - -import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; -import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; -import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; -import net.minecraft.util.Identifier; - -import java.util.List; - -@Deprecated -public class BlockUtil { - private static net.pitan76.mcpitanlib.api.util.BlockUtil newBlockUtil = new net.pitan76.mcpitanlib.api.util.BlockUtil(); - - public static Block block(Identifier id) { - return newBlockUtil.block(id); - } - - public static AbstractBlock.Settings breakByTool(AbstractBlock.Settings settings, MineableToolTags toolTags, int level) { - return newBlockUtil.breakByTool(settings, toolTags, level); - } - - public static AbstractBlock.Settings dropsNothing(AbstractBlock.Settings settings) { - return newBlockUtil.dropsNothing(settings); - } - - public static AbstractBlock.Settings requiresTool(AbstractBlock.Settings settings) { - return newBlockUtil.requiresTool(settings); - } - - public static boolean isExist(Identifier identifier) { - return newBlockUtil.isExist(identifier); - } - - public static Identifier toID(Block block) { - return newBlockUtil.toID(block); - } - - public static Block fromId(Identifier identifier) { - return newBlockUtil.fromId(identifier); - } - - public static List getAllBlocks() { - return newBlockUtil.getAllBlocks(); - } - - @Deprecated - public static Block of(AbstractBlock.Settings settings) { - return newBlockUtil.of(settings); - } - - public static Block of(CompatibleBlockSettings settings) { - return newBlockUtil.of(settings); - } - - public static int getRawId(Block block) { - return newBlockUtil.getRawId(block); - } - - public static Block fromIndex(int index) { - return newBlockUtil.fromIndex(index); - } -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java deleted file mode 100644 index cfd17e37c..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemUtil.java +++ /dev/null @@ -1,77 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.util; - -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.tag.TagKey; -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Identifier; - -import java.util.List; - -@Deprecated -public class ItemUtil { - private static net.pitan76.mcpitanlib.api.util.ItemUtil newItemUtil = new net.pitan76.mcpitanlib.api.util.ItemUtil(); - - public static Item item(Identifier id) { - return newItemUtil.item(id); - } - - public static boolean isEqual(Item item, Item item2) { - return newItemUtil.isEqual(item, item2); - } - - public static boolean isOf(ItemStack stack, Item item) { - return newItemUtil.isOf(stack, item); - } - - public static boolean isIn(ItemStack stack, TagKey tagKey) { - return newItemUtil.isIn(stack, tagKey); - } - - public static boolean isIn(Item item, TagKey tagKey) { - return newItemUtil.isIn(item, tagKey); - } - - public static boolean isExist(Identifier identifier) { - return newItemUtil.isExist(identifier); - } - public static Identifier toID(Item item) { - return newItemUtil.toID(item); - } - - public static Item fromId(Identifier identifier) { - return newItemUtil.fromId(identifier); - } - - @Deprecated - public static BlockItem ofBlock(Block block, Item.Settings settings) { - return newItemUtil.ofBlock(block, settings); - } - - public static BlockItem ofBlock(Block block, CompatibleItemSettings settings) { - return newItemUtil.ofBlock(block, settings); - } - - @Deprecated - public static Item of(Item.Settings settings) { - return newItemUtil.of(settings); - } - - public static Item of(CompatibleItemSettings settings) { - return newItemUtil.of(settings); - } - - public static List getAllItems() { - return newItemUtil.getAllItems(); - } - - public static int getRawId(Item item) { - return newItemUtil.getRawId(item); - } - - public static Item fromIndex(int index) { - return newItemUtil.fromIndex(index); - } -} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java b/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java deleted file mode 100644 index 507f89ce1..000000000 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TextUtil.java +++ /dev/null @@ -1,30 +0,0 @@ -package ml.pkom.mcpitanlibarch.api.util; - -import net.minecraft.text.*; - -@Deprecated -public class TextUtil { - public static MutableText literal(String string) { - return net.pitan76.mcpitanlib.api.util.TextUtil.literal(string); - } - - public static MutableText translatable(String key) { - return net.pitan76.mcpitanlib.api.util.TextUtil.translatable(key); - } - - public static MutableText translatable(String key, Object... args) { - return net.pitan76.mcpitanlib.api.util.TextUtil.translatable(key, args); - } - - public static MutableText empty() { - return net.pitan76.mcpitanlib.api.util.TextUtil.empty(); - } - - public static MutableText keybind(String string) { - return net.pitan76.mcpitanlib.api.util.TextUtil.keybind(string); - } - - public static String txt2str(Text text) { - return net.pitan76.mcpitanlib.api.util.TextUtil.txt2str(text); - } -} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/easyapi/FileControl.java b/common/src/main/java/net/pitan76/easyapi/FileControl.java similarity index 99% rename from common/src/main/java/ml/pkom/easyapi/FileControl.java rename to common/src/main/java/net/pitan76/easyapi/FileControl.java index 7d19eaa04..673c29ab2 100644 --- a/common/src/main/java/ml/pkom/easyapi/FileControl.java +++ b/common/src/main/java/net/pitan76/easyapi/FileControl.java @@ -1,4 +1,4 @@ -package ml.pkom.easyapi; +package net.pitan76.easyapi; import java.io.*; import java.nio.channels.FileChannel; diff --git a/common/src/main/java/ml/pkom/easyapi/config/Config.java b/common/src/main/java/net/pitan76/easyapi/config/Config.java similarity index 99% rename from common/src/main/java/ml/pkom/easyapi/config/Config.java rename to common/src/main/java/net/pitan76/easyapi/config/Config.java index 108f5a536..c1fd89093 100644 --- a/common/src/main/java/ml/pkom/easyapi/config/Config.java +++ b/common/src/main/java/net/pitan76/easyapi/config/Config.java @@ -1,4 +1,4 @@ -package ml.pkom.easyapi.config; +package net.pitan76.easyapi.config; import java.io.File; import java.util.LinkedHashMap; diff --git a/common/src/main/java/ml/pkom/easyapi/config/IConfig.java b/common/src/main/java/net/pitan76/easyapi/config/IConfig.java similarity index 95% rename from common/src/main/java/ml/pkom/easyapi/config/IConfig.java rename to common/src/main/java/net/pitan76/easyapi/config/IConfig.java index 5a987aa9d..09d0b68e8 100644 --- a/common/src/main/java/ml/pkom/easyapi/config/IConfig.java +++ b/common/src/main/java/net/pitan76/easyapi/config/IConfig.java @@ -1,4 +1,4 @@ -package ml.pkom.easyapi.config; +package net.pitan76.easyapi.config; import java.io.File; import java.util.LinkedHashMap; diff --git a/common/src/main/java/ml/pkom/easyapi/config/JsonConfig.java b/common/src/main/java/net/pitan76/easyapi/config/JsonConfig.java similarity index 96% rename from common/src/main/java/ml/pkom/easyapi/config/JsonConfig.java rename to common/src/main/java/net/pitan76/easyapi/config/JsonConfig.java index 46583af5d..09662c662 100644 --- a/common/src/main/java/ml/pkom/easyapi/config/JsonConfig.java +++ b/common/src/main/java/net/pitan76/easyapi/config/JsonConfig.java @@ -1,9 +1,9 @@ -package ml.pkom.easyapi.config; +package net.pitan76.easyapi.config; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import ml.pkom.easyapi.FileControl; +import net.pitan76.easyapi.FileControl; import java.io.File; import java.lang.reflect.Type; diff --git a/common/src/main/java/ml/pkom/easyapi/config/YamlConfig.java b/common/src/main/java/net/pitan76/easyapi/config/YamlConfig.java similarity index 97% rename from common/src/main/java/ml/pkom/easyapi/config/YamlConfig.java rename to common/src/main/java/net/pitan76/easyapi/config/YamlConfig.java index ea6adc344..c01e026af 100644 --- a/common/src/main/java/ml/pkom/easyapi/config/YamlConfig.java +++ b/common/src/main/java/net/pitan76/easyapi/config/YamlConfig.java @@ -1,6 +1,6 @@ -package ml.pkom.easyapi.config; +package net.pitan76.easyapi.config; -import ml.pkom.easyapi.FileControl; +import net.pitan76.easyapi.FileControl; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; diff --git a/common/src/main/java/ml/pkom/easyapi/config/package-info.java b/common/src/main/java/net/pitan76/easyapi/config/package-info.java similarity index 65% rename from common/src/main/java/ml/pkom/easyapi/config/package-info.java rename to common/src/main/java/net/pitan76/easyapi/config/package-info.java index 8bb53e1d3..88238e2bc 100644 --- a/common/src/main/java/ml/pkom/easyapi/config/package-info.java +++ b/common/src/main/java/net/pitan76/easyapi/config/package-info.java @@ -1,4 +1,4 @@ /** * Config関連のクラスが入っているパッケージ */ -package ml.pkom.easyapi.config; +package net.pitan76.easyapi.config; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index 17a17d279..7b270d5ba 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib; -import ml.pkom.easyapi.config.Config; -import ml.pkom.easyapi.config.JsonConfig; -import ml.pkom.mcpitanlibarch.api.registry.ArchRegistry; -import ml.pkom.mcpitanlibarch.api.util.PlatformUtil; +import net.pitan76.easyapi.config.Config; +import net.pitan76.easyapi.config.JsonConfig; +import net.pitan76.mcpitanlib.api.registry.CompatRegistry; +import net.pitan76.mcpitanlib.api.util.PlatformUtil; import net.pitan76.mcpitanlib.debug.DebugTool; import net.minecraft.util.Identifier; @@ -25,7 +25,7 @@ public class MCPitanLib { public static List blockBlackList = new ArrayList<>(); // MCPitanLibのアイテム、ブロック、タイルエンティティの登録 - public static ArchRegistry registry = ArchRegistry.createRegistry(MOD_ID); + public static CompatRegistry registry = CompatRegistry.createRegistry(MOD_ID); /** * MCPitanLibの初期化 diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java similarity index 98% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java index 1fee0f1c2..b9baab099 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java @@ -1,7 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.block; +package net.pitan76.mcpitanlib.api.block; import net.minecraft.block.*; -import net.minecraft.block.piston.PistonBehavior; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.DyeColor; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleMaterial.java similarity index 99% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleMaterial.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleMaterial.java index 6a6fb0384..e39962a99 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/CompatibleMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleMaterial.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.block; +package net.pitan76.mcpitanlib.api.block; import net.minecraft.block.MapColor; import net.minecraft.block.piston.PistonBehavior; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index b32cec595..9cf5bafe1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.block; +package net.pitan76.mcpitanlib.api.block; -import ml.pkom.mcpitanlibarch.api.event.block.*; -import ml.pkom.mcpitanlibarch.api.event.block.result.BlockBreakResult; +import net.pitan76.mcpitanlib.api.event.block.*; +import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java index 58cd78b24..cb5b24676 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/block/ExtendBlockEntityProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.block; +package net.pitan76.mcpitanlib.api.block; -import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; -import ml.pkom.mcpitanlibarch.api.tile.ExtendBlockEntityTicker; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.tile.ExtendBlockEntityTicker; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 63403c3d2..27920e22e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.client; +package net.pitan76.mcpitanlib.api.client; -import ml.pkom.mcpitanlibarch.api.client.gui.widget.CompatibleTexturedButtonWidget; -import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.*; +import net.pitan76.mcpitanlib.api.client.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; @@ -15,6 +15,7 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; public abstract class SimpleHandledScreen extends HandledScreen { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/ArchRegistryClient.java similarity index 98% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/ArchRegistryClient.java index 0dfa038aa..4b58f9179 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/ArchRegistryClient.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.client.registry; +package net.pitan76.mcpitanlib.api.client.registry; import dev.architectury.registry.client.level.entity.EntityRendererRegistry; import dev.architectury.registry.client.particle.ParticleProviderRegistry; @@ -20,7 +20,6 @@ import net.minecraft.client.render.block.BlockRenderManager; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer; -import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.EntityRendererFactory; import net.minecraft.client.render.entity.model.EntityModelLayer; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/KeybindingRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/KeybindingRegistry.java similarity index 84% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/KeybindingRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/KeybindingRegistry.java index a2c8a38b4..f1ee47252 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/registry/KeybindingRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/KeybindingRegistry.java @@ -1,9 +1,9 @@ -package ml.pkom.mcpitanlibarch.api.client.registry; +package net.pitan76.mcpitanlib.api.client.registry; import dev.architectury.registry.client.keymappings.KeyMappingRegistry; -import ml.pkom.mcpitanlibarch.api.event.v0.ClientTickEventRegistry; -import ml.pkom.mcpitanlibarch.api.network.ClientNetworking; -import ml.pkom.mcpitanlibarch.api.network.PacketByteUtil; +import net.pitan76.mcpitanlib.api.event.v0.ClientTickEventRegistry; +import net.pitan76.mcpitanlib.api.network.ClientNetworking; +import net.pitan76.mcpitanlib.api.network.PacketByteUtil; import net.minecraft.client.option.KeyBinding; import net.minecraft.util.Identifier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/DrawObjectDM.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java similarity index 92% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/DrawObjectDM.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java index 2be57f7ae..f544d78fc 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/DrawObjectDM.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.client.render; +package net.pitan76.mcpitanlib.api.client.render; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawBackgroundArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawBackgroundArgs.java similarity index 88% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawBackgroundArgs.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawBackgroundArgs.java index 66370378b..4c0a4ab27 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawBackgroundArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawBackgroundArgs.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; +package net.pitan76.mcpitanlib.api.client.render.handledscreen; -import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; public class DrawBackgroundArgs { public DrawObjectDM drawObjectDM; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawForegroundArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawForegroundArgs.java similarity index 85% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawForegroundArgs.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawForegroundArgs.java index d4b8b854b..643a5bf80 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawForegroundArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawForegroundArgs.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; +package net.pitan76.mcpitanlib.api.client.render.handledscreen; -import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; public class DrawForegroundArgs { public DrawObjectDM drawObjectDM; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java similarity index 85% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java index 2e2c65aca..652c5ed68 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/DrawMouseoverTooltipArgs.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; +package net.pitan76.mcpitanlib.api.client.render.handledscreen; -import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; public class DrawMouseoverTooltipArgs { public DrawObjectDM drawObjectDM; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/KeyEventArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/KeyEventArgs.java similarity index 91% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/KeyEventArgs.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/KeyEventArgs.java index 905a7f1b3..45c4ceeed 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/KeyEventArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/KeyEventArgs.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; +package net.pitan76.mcpitanlib.api.client.render.handledscreen; public class KeyEventArgs { public int keyCode, scanCode, modifiers; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/RenderArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/RenderArgs.java similarity index 88% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/RenderArgs.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/RenderArgs.java index aa6664254..8b4905d78 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/render/handledscreen/RenderArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/handledscreen/RenderArgs.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.client.render.handledscreen; +package net.pitan76.mcpitanlib.api.client.render.handledscreen; -import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; public class RenderArgs { public DrawObjectDM drawObjectDM; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/CompatibleTexturedButtonWidget.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/CompatibleTexturedButtonWidget.java index 3a730b501..8a78951c1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/CompatibleTexturedButtonWidget.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.client.gui.widget; +package net.pitan76.mcpitanlib.api.client.widget; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/RedrawableTexturedButtonWidget.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/RedrawableTexturedButtonWidget.java index e69d16b45..08ae46378 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/client/gui/widget/RedrawableTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/RedrawableTexturedButtonWidget.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.client.gui.widget; +package net.pitan76.mcpitanlib.api.client.widget; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/AbstractCommand.java similarity index 85% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/AbstractCommand.java index 3d464fd72..5b2fbdf00 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/AbstractCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/AbstractCommand.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.command; +package net.pitan76.mcpitanlib.api.command; -import ml.pkom.mcpitanlibarch.api.command.argument.RequiredCommand; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.command.argument.RequiredCommand; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java index f01ede60a..1e0c4ead9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java @@ -1,14 +1,15 @@ -package ml.pkom.mcpitanlibarch.api.command; +package net.pitan76.mcpitanlib.api.command; import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.builder.RequiredArgumentBuilder; import dev.architectury.event.events.common.CommandRegistrationEvent; -import ml.pkom.mcpitanlibarch.api.command.argument.*; -import ml.pkom.mcpitanlibarch.api.event.*; +import net.pitan76.mcpitanlib.api.command.argument.*; +import net.pitan76.mcpitanlib.api.event.*; import net.minecraft.command.CommandRegistryAccess; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; +import net.pitan76.mcpitanlib.api.command.argument.*; +import net.pitan76.mcpitanlib.api.event.*; import java.util.Map; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandSettings.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandSettings.java index 69676a52f..8a1d5fb2d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/CommandSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandSettings.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.command; +package net.pitan76.mcpitanlib.api.command; import net.minecraft.server.command.ServerCommandSource; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/ConfigCommand.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/ConfigCommand.java index c4161b31c..0c4a9fb54 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/ConfigCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/ConfigCommand.java @@ -1,11 +1,11 @@ -package ml.pkom.mcpitanlibarch.api.command; +package net.pitan76.mcpitanlib.api.command; import com.mojang.brigadier.arguments.StringArgumentType; -import ml.pkom.easyapi.config.Config; -import ml.pkom.mcpitanlibarch.api.command.argument.StringCommand; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.StringCommandEvent; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.pitan76.easyapi.config.Config; +import net.pitan76.mcpitanlib.api.command.argument.StringCommand; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.event.StringCommandEvent; +import net.pitan76.mcpitanlib.api.util.TextUtil; import org.jetbrains.annotations.Nullable; import java.io.File; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/LiteralCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/LiteralCommand.java new file mode 100644 index 000000000..f382775a9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/LiteralCommand.java @@ -0,0 +1,7 @@ +package net.pitan76.mcpitanlib.api.command; + +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; + +public abstract class LiteralCommand extends AbstractCommand { + +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntitiesCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntitiesCommand.java similarity index 72% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntitiesCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntitiesCommand.java index 23f823ed8..36c46a827 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntitiesCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntitiesCommand.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; -import ml.pkom.mcpitanlibarch.api.event.EntitiesCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.event.EntitiesCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntityCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntityCommand.java similarity index 72% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntityCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntityCommand.java index fa098416e..caf51cac1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/EntityCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntityCommand.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; -import ml.pkom.mcpitanlibarch.api.event.EntityCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.event.EntityCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/GreedyStringCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/GreedyStringCommand.java similarity index 58% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/GreedyStringCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/GreedyStringCommand.java index 3be923519..afff6b7e8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/GreedyStringCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/GreedyStringCommand.java @@ -1,8 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; import com.mojang.brigadier.arguments.StringArgumentType; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.StringCommandEvent; public abstract class GreedyStringCommand extends StringCommand { @Override diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/IntegerCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/IntegerCommand.java similarity index 71% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/IntegerCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/IntegerCommand.java index b20f8b2d3..bfcdec912 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/IntegerCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/IntegerCommand.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; import com.mojang.brigadier.arguments.IntegerArgumentType; -import ml.pkom.mcpitanlibarch.api.event.IntegerCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.event.IntegerCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; public abstract class IntegerCommand extends RequiredCommand { @Override diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/ItemCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java similarity index 68% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/ItemCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java index 02aea9182..664629759 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/ItemCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; -import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; -import ml.pkom.mcpitanlibarch.api.event.ItemCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.command.CommandRegistry; +import net.pitan76.mcpitanlib.api.event.ItemCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.ItemStackArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayerCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayerCommand.java similarity index 72% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayerCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayerCommand.java index 26c2353ca..90995ac8e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayerCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayerCommand.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; -import ml.pkom.mcpitanlibarch.api.event.PlayerCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.event.PlayerCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayersCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayersCommand.java similarity index 66% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayersCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayersCommand.java index 1d798f9de..d49a91420 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/PlayersCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayersCommand.java @@ -1,8 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; -import ml.pkom.mcpitanlibarch.api.event.EntityCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.PlayersCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.event.PlayersCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/RequiredCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/RequiredCommand.java similarity index 58% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/RequiredCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/RequiredCommand.java index daca91561..a3428290f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/RequiredCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/RequiredCommand.java @@ -1,8 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; import com.mojang.brigadier.arguments.ArgumentType; -import com.mojang.brigadier.arguments.IntegerArgumentType; -import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; +import net.pitan76.mcpitanlib.api.command.AbstractCommand; public abstract class RequiredCommand extends AbstractCommand { public abstract String getArgumentName(); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/StringCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/StringCommand.java similarity index 71% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/StringCommand.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/StringCommand.java index 68f6d5989..008bfefaf 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/command/argument/StringCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/StringCommand.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.command.argument; +package net.pitan76.mcpitanlib.api.command.argument; import com.mojang.brigadier.arguments.StringArgumentType; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.StringCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.event.StringCommandEvent; public abstract class StringCommand extends RequiredCommand { @Override diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/EntityTypeBuilder.java similarity index 92% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/entity/EntityTypeBuilder.java index 3ce02458e..25263250e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/EntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/EntityTypeBuilder.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.entity; +package net.pitan76.mcpitanlib.api.entity; import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; @@ -6,12 +6,11 @@ import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; -import ml.pkom.mcpitanlibarch.api.entity.ExtendEntityType.EntityFactory; public class EntityTypeBuilder { private SpawnGroup spawnGroup; - private EntityFactory factory; + private ExtendEntityType.EntityFactory factory; private EntityDimensions entityDimensions; private boolean saveable; private boolean summonable; @@ -37,7 +36,7 @@ public EntityTypeBuilder() { } @Deprecated - public EntityTypeBuilder(SpawnGroup spawnGroup, EntityFactory factory) { + public EntityTypeBuilder(SpawnGroup spawnGroup, ExtendEntityType.EntityFactory factory) { this(); this.spawnGroup = spawnGroup; this.factory = factory; @@ -47,7 +46,7 @@ public static EntityTypeBuilder create() { return new EntityTypeBuilder<>(); } - public static EntityTypeBuilder create(SpawnGroup spawnGroup, EntityFactory factory) { + public static EntityTypeBuilder create(SpawnGroup spawnGroup, ExtendEntityType.EntityFactory factory) { return new EntityTypeBuilder<>(spawnGroup, factory); } diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java index fcc030a09..16a41b540 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.entity; +package net.pitan76.mcpitanlib.api.entity; -import ml.pkom.mcpitanlibarch.api.nbt.NbtTag; +import net.pitan76.mcpitanlib.api.nbt.NbtTag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.nbt.NbtCompound; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java index f2d66a976..6d9d7cb86 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/ExtendEntityType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.entity; +package net.pitan76.mcpitanlib.api.entity; import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index cab6612fb..76e5d1910 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -1,9 +1,9 @@ -package ml.pkom.mcpitanlibarch.api.entity; +package net.pitan76.mcpitanlib.api.entity; import dev.architectury.registry.menu.ExtendedMenuProvider; -import ml.pkom.mcpitanlibarch.api.gui.ExtendedNamedScreenHandlerFactory; -import ml.pkom.mcpitanlibarch.api.util.ScreenHandlerUtil; -import ml.pkom.mcpitanlibarch.core.player.ItemCooldown; +import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; +import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; +import net.pitan76.mcpitanlib.core.player.ItemCooldown; import net.minecraft.block.BlockState; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.ItemCooldownManager; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/BaseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/BaseEvent.java new file mode 100644 index 000000000..4e770c96c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/BaseEvent.java @@ -0,0 +1,4 @@ +package net.pitan76.mcpitanlib.api.event; + +public class BaseEvent { +} \ No newline at end of file diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java similarity index 87% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java index 36b944fb0..ce84a734d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/CommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.StringRange; -import ml.pkom.mcpitanlibarch.api.command.AbstractCommand; +import net.pitan76.mcpitanlib.api.command.AbstractCommand; public class CommandEvent { public CommandContext context; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntitiesCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntitiesCommandEvent.java similarity index 82% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntitiesCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/EntitiesCommandEvent.java index d4c71c1f6..a54b1d57a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntitiesCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntitiesCommandEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import ml.pkom.mcpitanlibarch.api.command.argument.EntitiesCommand; +import net.pitan76.mcpitanlib.api.command.argument.EntitiesCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntityCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntityCommandEvent.java similarity index 82% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntityCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/EntityCommandEvent.java index fadf3e096..150e0fd4e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/EntityCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntityCommandEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import ml.pkom.mcpitanlibarch.api.command.argument.EntityCommand; +import net.pitan76.mcpitanlib.api.command.argument.EntityCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/IntegerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/IntegerCommandEvent.java similarity index 72% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/IntegerCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/IntegerCommandEvent.java index 8bb2ed715..240e325d3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/IntegerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/IntegerCommandEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.arguments.IntegerArgumentType; -import ml.pkom.mcpitanlibarch.api.command.argument.IntegerCommand; +import net.pitan76.mcpitanlib.api.command.argument.IntegerCommand; public class IntegerCommandEvent extends RequiredCommandEvent { public Integer getValue() { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ItemCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ItemCommandEvent.java similarity index 75% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ItemCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/ItemCommandEvent.java index 3e835b698..1490faf79 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ItemCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ItemCommandEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; -import ml.pkom.mcpitanlibarch.api.command.argument.ItemCommand; +import net.pitan76.mcpitanlib.api.command.argument.ItemCommand; import net.minecraft.command.argument.ItemStackArgumentType; import net.minecraft.item.Item; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayerCommandEvent.java similarity index 82% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayerCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayerCommandEvent.java index 49e85f5d6..a755544ef 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayerCommandEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import ml.pkom.mcpitanlibarch.api.command.argument.PlayerCommand; +import net.pitan76.mcpitanlib.api.command.argument.PlayerCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayersCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayersCommandEvent.java similarity index 82% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayersCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayersCommandEvent.java index b8ba0c265..97c918c01 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/PlayersCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayersCommandEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import ml.pkom.mcpitanlibarch.api.command.argument.PlayersCommand; +import net.pitan76.mcpitanlib.api.command.argument.PlayersCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/RequiredCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/RequiredCommandEvent.java similarity index 73% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/RequiredCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/RequiredCommandEvent.java index 13bf6e99c..0ac500819 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/RequiredCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/RequiredCommandEvent.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; public abstract class RequiredCommandEvent extends ServerCommandEvent { public abstract Object getValue(); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java index f702c656d..fdd15f673 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/ServerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java @@ -1,10 +1,10 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.Command; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.StringRange; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.command.ServerCommandSource; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/StringCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/StringCommandEvent.java similarity index 71% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/StringCommandEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/StringCommandEvent.java index d4a9b3963..35042c8f6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/StringCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/StringCommandEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event; +package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.arguments.StringArgumentType; -import ml.pkom.mcpitanlibarch.api.command.argument.StringCommand; +import net.pitan76.mcpitanlib.api.command.argument.StringCommand; public class StringCommandEvent extends RequiredCommandEvent { public String getValue() { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockBreakEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java similarity index 86% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockBreakEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java index 1be1588d5..2291afa6f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockBreakEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.entity.Player; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockPlacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java similarity index 91% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockPlacedEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java index e69aba827..8e39771e9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockPlacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java index 502e1c533..d9f45f4d3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockScheduledTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java index e681ed49a..31a5e3e3e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.entity.Player; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/OutlineShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/OutlineShapeEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java index ad8722a0f..db43da8fc 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/OutlineShapeEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; import net.minecraft.util.math.BlockPos; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java index 4e26da3b1..8be82972f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/PickStackEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/ScreenHandlerCreateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java similarity index 84% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/ScreenHandlerCreateEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java index ec129d2a2..aeb7c404f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/ScreenHandlerCreateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.entity.Player; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java index 3a4aa68ff..bdabae527 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.inventory.Inventory; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/TileCreateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/TileCreateEvent.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/TileCreateEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/TileCreateEvent.java index 1e96b73e0..2378118c5 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/TileCreateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/TileCreateEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.block; +package net.pitan76.mcpitanlib.api.event.block; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/result/BlockBreakResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/result/BlockBreakResult.java similarity index 82% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/result/BlockBreakResult.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/block/result/BlockBreakResult.java index 35c8ab0cb..4973eee09 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/block/result/BlockBreakResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/result/BlockBreakResult.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.event.block.result; +package net.pitan76.mcpitanlib.api.event.block.result; import net.minecraft.block.BlockState; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/CraftEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CraftEvent.java similarity index 90% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/CraftEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CraftEvent.java index eb9a25cb1..6281f4248 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/CraftEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CraftEvent.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.event.item; +package net.pitan76.mcpitanlib.api.event.item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java similarity index 90% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemAppendTooltipEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java index a1a21932a..215179dcf 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemAppendTooltipEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.item; +package net.pitan76.mcpitanlib.api.event.item; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemFinishUsingEvent.java similarity index 87% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemFinishUsingEvent.java index 6e68eaa8a..9479c4b6d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemFinishUsingEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemFinishUsingEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.item; +package net.pitan76.mcpitanlib.api.event.item; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index 30a675cd2..d8049cb1b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event.item; +package net.pitan76.mcpitanlib.api.event.item; -import ml.pkom.mcpitanlibarch.api.entity.Player; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java index 063d70c0a..7877faacb 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event.item; +package net.pitan76.mcpitanlib.api.event.item; -import ml.pkom.mcpitanlibarch.api.entity.Player; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java index e825bce27..bea21498a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/item/ItemUseOnEntityEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event.item; +package net.pitan76.mcpitanlib.api.event.item; -import ml.pkom.mcpitanlibarch.api.entity.Player; -import ml.pkom.mcpitanlibarch.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/tile/TileTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java similarity index 91% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/tile/TileTickEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java index 2a7c9f628..b3000b0d3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/tile/TileTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.event.tile; +package net.pitan76.mcpitanlib.api.event.tile; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/AttackEntityEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java similarity index 90% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/AttackEntityEventRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java index 8e8cf7638..5165e954e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/AttackEntityEventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.event.v0; +package net.pitan76.mcpitanlib.api.event.v0; import dev.architectury.event.EventResult; import dev.architectury.event.events.common.PlayerEvent; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Hand; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/ClientTickEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/ClientTickEventRegistry.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/ClientTickEventRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/ClientTickEventRegistry.java index c6635138d..4c4efbe16 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/ClientTickEventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/ClientTickEventRegistry.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.event.v0; +package net.pitan76.mcpitanlib.api.event.v0; import dev.architectury.event.events.client.ClientTickEvent; import net.fabricmc.api.EnvType; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/EventRegistry.java similarity index 91% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/EventRegistry.java index 7112e8336..6bdf7f1f3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/EventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/EventRegistry.java @@ -1,9 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.event.v0; +package net.pitan76.mcpitanlib.api.event.v0; import dev.architectury.event.events.common.LifecycleEvent; -import dev.architectury.event.events.common.PlayerEvent; -import ml.pkom.mcpitanlibarch.api.event.v0.event.ItemStackActionEvent; -import ml.pkom.mcpitanlibarch.api.event.v0.event.ServerConnectionEvent; +import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; +import net.pitan76.mcpitanlib.api.event.v0.event.ServerConnectionEvent; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ItemStackActionEvent.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ItemStackActionEvent.java index 6afbab852..c5fd45409 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ItemStackActionEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ItemStackActionEvent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.event.v0.event; +package net.pitan76.mcpitanlib.api.event.v0.event; -import ml.pkom.mcpitanlibarch.api.event.v0.EventRegistry; +import net.pitan76.mcpitanlib.api.event.v0.EventRegistry; import net.minecraft.item.ItemStack; import java.util.ArrayList; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index 6c3d0b905..e7d201c32 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.event.v0.event; +package net.pitan76.mcpitanlib.api.event.v0.event; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; -import ml.pkom.mcpitanlibarch.api.recipe.CompatibleRecipeEntry; +import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ServerConnectionEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ServerConnectionEvent.java similarity index 79% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ServerConnectionEvent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ServerConnectionEvent.java index 2c13972bf..ec21cc0e7 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/event/v0/event/ServerConnectionEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ServerConnectionEvent.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.event.v0.event; +package net.pitan76.mcpitanlib.api.event.v0.event; import dev.architectury.event.events.common.PlayerEvent; -import ml.pkom.mcpitanlibarch.api.event.v0.EventRegistry; +import net.pitan76.mcpitanlib.api.event.v0.EventRegistry; public class ServerConnectionEvent { // Architectury: PlayerEvent diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/RecipeManagerRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/RecipeManagerRegistry.java index 33b46fc3a..840b0f04e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/RecipeManagerRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/RecipeManagerRegistry.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.api.event.v1; -import ml.pkom.mcpitanlibarch.api.event.v0.event.RecipeManagerEvent; +import net.pitan76.mcpitanlib.api.event.v0.event.RecipeManagerEvent; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedNamedScreenHandlerFactory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedNamedScreenHandlerFactory.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedNamedScreenHandlerFactory.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedNamedScreenHandlerFactory.java index 2a97c5b82..863fc52e9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedNamedScreenHandlerFactory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedNamedScreenHandlerFactory.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.gui; +package net.pitan76.mcpitanlib.api.gui; import dev.architectury.registry.menu.ExtendedMenuProvider; import net.minecraft.entity.player.PlayerEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandler.java similarity index 92% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandler.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandler.java index d6f3d6fe9..45d413cfb 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandler.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.gui; +package net.pitan76.mcpitanlib.api.gui; import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandlerType; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerTypeBuilder.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerTypeBuilder.java index 189408749..9c6a67e60 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/ExtendedScreenHandlerTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerTypeBuilder.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.gui; +package net.pitan76.mcpitanlib.api.gui; import dev.architectury.registry.menu.MenuRegistry; import net.minecraft.entity.player.PlayerInventory; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java similarity index 98% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java index de4227086..4768d0f54 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.gui; +package net.pitan76.mcpitanlib.api.gui; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventory; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandlerTypeBuilder.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandlerTypeBuilder.java index 30bdac46c..a4a5289e7 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/SimpleScreenHandlerTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandlerTypeBuilder.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.gui; +package net.pitan76.mcpitanlib.api.gui; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.resource.featuretoggle.FeatureFlags; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/inventory/IInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/IInventory.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/inventory/IInventory.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/IInventory.java index 95554c211..aea703cca 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/inventory/IInventory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/IInventory.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.gui.inventory; +package net.pitan76.mcpitanlib.api.gui.inventory; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventories; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java index 93e38b8f8..1a8bea116 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/gui/slot/CompatibleSlot.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.gui.slot; +package net.pitan76.mcpitanlib.api.gui.slot; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ArmorEquipmentType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ArmorEquipmentType.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java index bedd7a2e0..c38831225 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ArmorEquipmentType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleArmorMaterial.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java index 32a238c44..c435e7f05 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.ArmorItem; import net.minecraft.item.ArmorMaterial; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index e3e1fdaa6..10311f23f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java index 14e674516..807e0dadd 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import dev.architectury.registry.CreativeTabRegistry; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabManager.java similarity index 98% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabManager.java index 67c9f1e39..b8de65096 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/CreativeTabManager.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabManager.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import dev.architectury.registry.CreativeTabRegistry; import net.minecraft.item.ItemGroup; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/DefaultItemGroups.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/DefaultItemGroups.java index 9b0ba0cd3..b5d5f17ce 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/DefaultItemGroups.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/DefaultItemGroups.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroups; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index c6d7c383d..5d662ac7e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -1,7 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; -import ml.pkom.mcpitanlibarch.Dummy; -import ml.pkom.mcpitanlibarch.api.event.item.*; +import net.pitan76.mcpitanlib.core.Dummy; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; @@ -14,6 +13,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.*; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java similarity index 92% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java index 23cc52d91..af1e44c7a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java @@ -1,9 +1,10 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; -import ml.pkom.mcpitanlibarch.api.event.item.*; +import net.pitan76.mcpitanlib.api.event.item.*; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.TypedActionResult; +import net.pitan76.mcpitanlib.api.event.item.*; public interface ExtendItemProvider { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java index c785ae8c4..469b2cc8d 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/ExtendSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/FixedRecipeRemainderItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/FixedRecipeRemainderItem.java similarity index 77% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/FixedRecipeRemainderItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/FixedRecipeRemainderItem.java index 1d9a3d348..c96382ed2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/FixedRecipeRemainderItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/FixedRecipeRemainderItem.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item; +package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java similarity index 85% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index dbb4a43e5..e0a939eb1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -1,11 +1,10 @@ -package ml.pkom.mcpitanlibarch.api.item.tool; +package net.pitan76.mcpitanlib.api.item.tool; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; -import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterial; public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java similarity index 85% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index 45758e496..24ca5181e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -1,9 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.item.tool; +package net.pitan76.mcpitanlib.api.item.tool; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; -import net.minecraft.item.AxeItem; import net.minecraft.item.HoeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterial; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java similarity index 88% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index 0aa7f3863..ac12f12f8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.item.tool; +package net.pitan76.mcpitanlib.api.item.tool; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java similarity index 88% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index b466617cb..6e9b4221c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.item.tool; +package net.pitan76.mcpitanlib.api.item.tool; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.ShovelItem; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java similarity index 85% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index de76d31e9..4758cb995 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -1,9 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.item.tool; +package net.pitan76.mcpitanlib.api.item.tool; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.minecraft.block.BlockState; -import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java similarity index 69% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleToolMaterial.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java index 5a5636e9d..22631df08 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/item/tool/CompatibleToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.item.tool; +package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.item.ToolMaterial; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/nbt/NbtTag.java b/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTag.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/nbt/NbtTag.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTag.java index b46a37933..c82b24cf1 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/nbt/NbtTag.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTag.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.nbt; +package net.pitan76.mcpitanlib.api.nbt; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetworking.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index 99676c043..d24de60c8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.network; +package net.pitan76.mcpitanlib.api.network; import dev.architectury.networking.NetworkManager; import net.minecraft.client.MinecraftClient; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java similarity index 99% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java index 0154bc2e0..92e075b70 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/PacketByteUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.network; +package net.pitan76.mcpitanlib.api.network; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ServerNetworking.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index 1f1ec4106..69577d801 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.network; +package net.pitan76.mcpitanlib.api.network; import dev.architectury.networking.NetworkManager; import net.minecraft.network.PacketByteBuf; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/packet/UpdatePacketType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/packet/UpdatePacketType.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/packet/UpdatePacketType.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/packet/UpdatePacketType.java index c2f6a40f1..2690dae1c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/packet/UpdatePacketType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/packet/UpdatePacketType.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.packet; +package net.pitan76.mcpitanlib.api.packet; public class UpdatePacketType { public static final UpdatePacketType NONE = new UpdatePacketType("NONE"); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java index ab3934b46..f24673b74 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/recipe/CompatibleRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.recipe; +package net.pitan76.mcpitanlib.api.recipe; -import ml.pkom.mcpitanlibarch.api.util.RecipeUtil; +import net.pitan76.mcpitanlib.api.util.RecipeUtil; import net.minecraft.recipe.*; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index ee8e92217..e7f5ef2b4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -2,11 +2,11 @@ import dev.architectury.registry.registries.RegistrySupplier; import net.pitan76.mcpitanlib.MCPitanLib; -import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; -import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; -import ml.pkom.mcpitanlibarch.api.gui.ExtendedScreenHandlerTypeBuilder; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.CreativeTabManager; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; +import net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerTypeBuilder; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.CreativeTabManager; import net.pitan76.mcpitanlib.api.util.BlockUtil; import net.pitan76.mcpitanlib.api.util.ItemUtil; import net.pitan76.mcpitanlib.core.registry.FuelRegistry; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/MineableToolTags.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/MineableToolTags.java similarity index 73% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/MineableToolTags.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/tag/MineableToolTags.java index 5f383d112..85aeaacf9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/MineableToolTags.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/MineableToolTags.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.tag; +package net.pitan76.mcpitanlib.api.tag; public enum MineableToolTags { NONE, diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java index 4603a568e..14db3585b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tag/TagKey.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.tag; +package net.pitan76.mcpitanlib.api.tag; -import ml.pkom.mcpitanlibarch.api.util.EntityTypeUtil; -import ml.pkom.mcpitanlibarch.api.util.FluidUtil; +import net.pitan76.mcpitanlib.api.util.EntityTypeUtil; +import net.pitan76.mcpitanlib.api.util.FluidUtil; import net.minecraft.block.Block; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java index 9c5252c48..65066ff24 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/TextComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.text; +package net.pitan76.mcpitanlib.api.text; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.text.MutableText; import net.minecraft.text.Text; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/VariableTextComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/VariableTextComponent.java similarity index 82% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/text/VariableTextComponent.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/text/VariableTextComponent.java index fd3905b7c..b231f4071 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/text/VariableTextComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/VariableTextComponent.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.text; +package net.pitan76.mcpitanlib.api.text; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.TextUtil; // 可変TextComponent public class VariableTextComponent extends TextComponent { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/BlockEntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/BlockEntityTypeBuilder.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java index 7df27746e..a098ed5a3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/BlockEntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.tile; +package net.pitan76.mcpitanlib.api.tile; import com.mojang.datafixers.types.Type; -import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java index 0b913d62a..1b2f61029 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.tile; +package net.pitan76.mcpitanlib.api.tile; -import ml.pkom.mcpitanlibarch.api.event.block.TileCreateEvent; -import ml.pkom.mcpitanlibarch.api.packet.UpdatePacketType; -import ml.pkom.mcpitanlibarch.api.world.ExtendWorld; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; +import net.pitan76.mcpitanlib.api.world.ExtendWorld; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntityTicker.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java similarity index 83% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntityTicker.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java index 5c3705bb0..745e6426f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/tile/ExtendBlockEntityTicker.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.tile; +package net.pitan76.mcpitanlib.api.tile; -import ml.pkom.mcpitanlibarch.api.event.tile.TileTickEvent; +import net.pitan76.mcpitanlib.api.event.tile.TileTickEvent; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/MinecraftServerTimerAccess.java b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/MinecraftServerTimerAccess.java similarity index 79% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/MinecraftServerTimerAccess.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/timer/MinecraftServerTimerAccess.java index f7e41c65f..6d4c81259 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/MinecraftServerTimerAccess.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/MinecraftServerTimerAccess.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.timer; +package net.pitan76.mcpitanlib.api.timer; import java.util.function.Supplier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/ServerWorldTimerAccess.java b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/ServerWorldTimerAccess.java similarity index 78% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/ServerWorldTimerAccess.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/timer/ServerWorldTimerAccess.java index a26c7e689..01eeb5f27 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/ServerWorldTimerAccess.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/ServerWorldTimerAccess.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.timer; +package net.pitan76.mcpitanlib.api.timer; import java.util.function.Supplier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/TimerItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/TimerItem.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/TimerItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/timer/TimerItem.java index 25311a365..ecf00fc80 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/timer/TimerItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/TimerItem.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.timer; +package net.pitan76.mcpitanlib.api.timer; import java.util.function.Supplier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ActionResultUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ActionResultUtil.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ActionResultUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/ActionResultUtil.java index 8977a4843..49bd97159 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ActionResultUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ActionResultUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.util.ActionResult; import net.minecraft.util.TypedActionResult; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityTypeUtil.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityTypeUtil.java index edec070a2..8f45bc639 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/BlockEntityTypeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityTypeUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.registry.Registries; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java index 7bee52266..945693475 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; -import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; -import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.tag.MineableToolTags; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.registry.Registries; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java index aa55d0046..89dd92c41 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.recipe.CompatibleRecipeEntry; -import ml.pkom.mcpitanlibarch.api.util.RecipeUtil; +import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; +import net.pitan76.mcpitanlib.api.util.RecipeUtil; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.util.Identifier; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java index f756463db..28077ba89 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/DamageSourceUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java index f7267b4b2..50d42a6b8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityTypeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.entity.EntityType; import net.minecraft.registry.Registries; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 32fbee46f..9e10354f9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EquipMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EquipMaterialUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java index b29b6daed..0b1487723 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/EquipMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.item.ArmorEquipmentType; -import ml.pkom.mcpitanlibarch.api.item.CompatibleArmorMaterial; +import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; +import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; import net.minecraft.sound.SoundEvent; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java index 921432d63..ed93efd18 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/FluidUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.fluid.Fluid; import net.minecraft.registry.Registries; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java similarity index 91% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/IngredientUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index 515266484..2ad252b78 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.Registries; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java index 3f58b6f97..c356d1be7 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/InventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java @@ -1,10 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.item.ItemStack; import net.minecraft.util.collection.DefaultedList; -import java.util.Objects; - public class InventoryUtil { public static boolean insertItem(ItemStack insertStack, DefaultedList inventory) { return insertItem(insertStack, inventory, false); diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java similarity index 93% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemStackUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 961b651e4..19ab3fdb7 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java index b7c2a5853..ca7be1810 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/MathUtil.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/MathUtil.java index 011fde68c..5fdefdea6 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/MathUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/MathUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.util.math.RotationAxis; import net.minecraft.util.math.random.Random; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PersistentStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PersistentStateUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java index 2ed6c444d..bf459c83b 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PersistentStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.datafixer.DataFixTypes; import net.minecraft.nbt.NbtCompound; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java index 429891494..df68c5000 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlatformUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import dev.architectury.platform.Platform; import dev.architectury.utils.Env; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerUtil.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerUtil.java index c6cbac3c0..017cc0f68 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/PlayerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerUtil.java @@ -1,9 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; -import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java similarity index 98% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java index d291f2873..9f12aca68 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ResourceUtil.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/ResourceUtil.java index f15483fa4..8b7740a0e 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ResourceUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ResourceUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.resource.Resource; import net.minecraft.resource.ResourceManager; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ScreenHandlerUtil.java similarity index 97% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/ScreenHandlerUtil.java index 67941e92b..7ce969235 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/ScreenHandlerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ScreenHandlerUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import dev.architectury.registry.menu.ExtendedMenuProvider; import dev.architectury.registry.menu.MenuRegistry; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SimpleInventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java similarity index 88% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SimpleInventoryUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java index 26387fa13..d2a8ce4c2 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SimpleInventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.ItemStack; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SlotUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java similarity index 90% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SlotUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java index ac3ea4bc4..8a2826b73 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/SlotUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TimerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java similarity index 76% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TimerUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java index 2db5369a1..ffb803902 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/TimerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java @@ -1,7 +1,7 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.timer.MinecraftServerTimerAccess; -import ml.pkom.mcpitanlibarch.api.timer.ServerWorldTimerAccess; +import net.pitan76.mcpitanlib.api.timer.MinecraftServerTimerAccess; +import net.pitan76.mcpitanlib.api.timer.ServerWorldTimerAccess; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldRandomUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldRandomUtil.java similarity index 95% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldRandomUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldRandomUtil.java index 4fd31349c..183a6e34f 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldRandomUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldRandomUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; import net.minecraft.world.World; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java similarity index 98% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index fd9fc4617..f3bcbceb4 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.util; +package net.pitan76.mcpitanlib.api.util; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.ExperienceOrbEntity; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/MatrixStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java similarity index 62% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/MatrixStackUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java index 36e3e08ec..dc7f4469a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/MatrixStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java @@ -1,9 +1,9 @@ -package ml.pkom.mcpitanlibarch.api.util.client; +package net.pitan76.mcpitanlib.api.util.client; -import ml.pkom.mcpitanlibarch.api.util.MathUtil; +import net.pitan76.mcpitanlib.api.util.MathUtil; import net.minecraft.client.util.math.MatrixStack; -import static ml.pkom.mcpitanlibarch.api.util.MathUtil.*; +import static net.pitan76.mcpitanlib.api.util.MathUtil.*; public class MatrixStackUtil { public static void multiply(MatrixStack matrixStack, MathUtil.RotationAxisType type, float deg) { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java index 5c257fa93..0632da0b3 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/RenderUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util.client; +package net.pitan76.mcpitanlib.api.util.client; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.render.GameRenderer; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index e29b08f53..79cf19eb8 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -1,9 +1,9 @@ -package ml.pkom.mcpitanlibarch.api.util.client; +package net.pitan76.mcpitanlib.api.util.client; -import ml.pkom.mcpitanlibarch.api.client.gui.widget.CompatibleTexturedButtonWidget; -import ml.pkom.mcpitanlibarch.api.client.gui.widget.RedrawableTexturedButtonWidget; -import ml.pkom.mcpitanlibarch.api.client.render.DrawObjectDM; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; +import net.pitan76.mcpitanlib.api.client.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.widget.RedrawableTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; @@ -12,7 +12,6 @@ import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.OrderedText; import net.minecraft.text.Text; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/BlockEventGenerator.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/BlockEventGenerator.java similarity index 68% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/BlockEventGenerator.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/event/BlockEventGenerator.java index d7429378a..f6290a120 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/BlockEventGenerator.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/BlockEventGenerator.java @@ -1,8 +1,8 @@ -package ml.pkom.mcpitanlibarch.api.util.event; +package net.pitan76.mcpitanlib.api.util.event; -import ml.pkom.mcpitanlibarch.api.event.block.BlockBreakEvent; -import ml.pkom.mcpitanlibarch.api.event.block.BlockPlacedEvent; -import ml.pkom.mcpitanlibarch.api.event.block.StateReplacedEvent; +import net.pitan76.mcpitanlib.api.event.block.BlockBreakEvent; +import net.pitan76.mcpitanlib.api.event.block.BlockPlacedEvent; +import net.pitan76.mcpitanlib.api.event.block.StateReplacedEvent; import net.minecraft.block.Block; public class BlockEventGenerator { diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/ItemEventGenerator.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java similarity index 74% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/ItemEventGenerator.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java index 4bc9991a2..73a18843c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/event/ItemEventGenerator.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.util.event; +package net.pitan76.mcpitanlib.api.util.event; -import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.TypedActionResult; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/BoxUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java similarity index 96% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/BoxUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java index aa85c9ee7..b267f096a 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/BoxUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util.math; +package net.pitan76.mcpitanlib.api.util.math; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java similarity index 94% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java index 6bd9ed029..f02122af9 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/util/math/PosUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.util.math; +package net.pitan76.mcpitanlib.api.util.math; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Position; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java index aebaf03ad..5d9991126 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.util.v1; -import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; -import ml.pkom.mcpitanlibarch.api.tag.MineableToolTags; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.tag.MineableToolTags; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.registry.Registries; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java index 3bad7b1a7..74531f165 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.util.v1; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java index a30f0d1d3..0c2726b17 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.api.util.v2; -import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.Block; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.BlockUtil; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java index f98d494fd..b2295f2ce 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.api.util.v2; -import ml.pkom.mcpitanlibarch.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.ItemUtil; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/CompatiblePersistentState.java b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java similarity index 89% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/world/CompatiblePersistentState.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java index d7a50e4f6..c8206f828 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/CompatiblePersistentState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java @@ -1,4 +1,4 @@ -package ml.pkom.mcpitanlibarch.api.world; +package net.pitan76.mcpitanlib.api.world; import net.minecraft.nbt.NbtCompound; import net.minecraft.world.PersistentState; diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/ExtendWorld.java b/common/src/main/java/net/pitan76/mcpitanlib/api/world/ExtendWorld.java similarity index 91% rename from common/src/main/java/ml/pkom/mcpitanlibarch/api/world/ExtendWorld.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/world/ExtendWorld.java index 4d74d03a8..cabc6499c 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/api/world/ExtendWorld.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/world/ExtendWorld.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.api.world; +package net.pitan76.mcpitanlib.api.world; -import ml.pkom.mcpitanlibarch.api.util.WorldUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/Dummy.java b/common/src/main/java/net/pitan76/mcpitanlib/core/Dummy.java new file mode 100644 index 000000000..0386ac276 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/Dummy.java @@ -0,0 +1,4 @@ +package net.pitan76.mcpitanlib.core; + +public class Dummy { +} diff --git a/common/src/main/java/ml/pkom/mcpitanlibarch/core/player/ItemCooldown.java b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java similarity index 81% rename from common/src/main/java/ml/pkom/mcpitanlibarch/core/player/ItemCooldown.java rename to common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java index fcdb43b9d..2987a56aa 100644 --- a/common/src/main/java/ml/pkom/mcpitanlibarch/core/player/ItemCooldown.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.core.player; +package net.pitan76.mcpitanlib.core.player; -import ml.pkom.mcpitanlibarch.api.entity.Player; +import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.item.Item; public class ItemCooldown { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java index b1caccdf0..e4739840c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.debug; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItem; import static net.pitan76.mcpitanlib.MCPitanLib.*; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 69836997c..2d61563f5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.mixin; -import ml.pkom.mcpitanlibarch.api.event.item.*; -import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider; -import ml.pkom.mcpitanlibarch.api.item.ExtendItemProvider.Options; +import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider.Options; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java index 99a1841f6..6bb40e4be 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.mixin; -import ml.pkom.mcpitanlibarch.api.event.v0.event.ItemStackActionEvent; +import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; import org.spongepowered.asm.mixin.Mixin; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java index 977645d26..47beee8aa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.mixin; -import ml.pkom.mcpitanlibarch.api.timer.MinecraftServerTimerAccess; -import ml.pkom.mcpitanlibarch.api.timer.TimerItem; +import net.pitan76.mcpitanlib.api.timer.MinecraftServerTimerAccess; +import net.pitan76.mcpitanlib.api.timer.TimerItem; import net.minecraft.server.MinecraftServer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 1982c2ec1..f16a664e0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -3,7 +3,7 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; import net.pitan76.mcpitanlib.api.event.v1.RecipeManagerRegistry; -import ml.pkom.mcpitanlibarch.api.event.v0.event.RecipeManagerEvent; +import net.pitan76.mcpitanlib.api.event.v0.event.RecipeManagerEvent; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; import net.minecraft.recipe.RecipeType; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java index ee9e64cfa..001458785 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.mixin; -import ml.pkom.mcpitanlibarch.api.timer.ServerWorldTimerAccess; -import ml.pkom.mcpitanlibarch.api.timer.TimerItem; +import net.pitan76.mcpitanlib.api.timer.ServerWorldTimerAccess; +import net.pitan76.mcpitanlib.api.timer.TimerItem; import net.minecraft.server.world.ServerWorld; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java index 21ad1d487..fe20eaf0a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.test; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import ml.pkom.mcpitanlibarch.api.command.CommandSettings; -import ml.pkom.mcpitanlibarch.api.command.LiteralCommand; -import ml.pkom.mcpitanlibarch.api.command.argument.IntegerCommand; -import ml.pkom.mcpitanlibarch.api.event.IntegerCommandEvent; -import ml.pkom.mcpitanlibarch.api.event.ServerCommandEvent; +import net.pitan76.mcpitanlib.api.command.CommandSettings; +import net.pitan76.mcpitanlib.api.command.LiteralCommand; +import net.pitan76.mcpitanlib.api.command.argument.IntegerCommand; +import net.pitan76.mcpitanlib.api.event.IntegerCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.item.ItemStack; public class ExampleCommand extends LiteralCommand { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java index 26e6b3499..b158a46b5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.test; -import ml.pkom.mcpitanlibarch.api.block.ExtendBlock; -import ml.pkom.mcpitanlibarch.api.event.block.BlockUseEvent; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; +import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.block.BlockState; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java index 9b41576d2..46e36b176 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.test; -import ml.pkom.mcpitanlibarch.api.event.item.ItemUseEvent; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.ExtendItem; -import ml.pkom.mcpitanlibarch.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.minecraft.item.ItemStack; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 8bd3fb527..23590bd46 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -1,13 +1,13 @@ package net.pitan76.mcpitanlib.test; -import ml.pkom.mcpitanlibarch.api.block.CompatibleBlockSettings; -import ml.pkom.mcpitanlibarch.api.block.CompatibleMaterial; -import ml.pkom.mcpitanlibarch.api.block.ExtendBlock; -import ml.pkom.mcpitanlibarch.api.command.CommandRegistry; -import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandlerTypeBuilder; -import ml.pkom.mcpitanlibarch.api.item.CompatibleItemSettings; -import ml.pkom.mcpitanlibarch.api.item.DefaultItemGroups; -import ml.pkom.mcpitanlibarch.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.command.CommandRegistry; +import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandlerTypeBuilder; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.DefaultItemGroups; +import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java index 8e7a92286..1b6f5709b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.test; -import ml.pkom.mcpitanlibarch.api.client.registry.ArchRegistryClient; +import net.pitan76.mcpitanlib.api.client.registry.ArchRegistryClient; public class ExampleModClient { public static void init() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java index 4f5d4b38f..c4e562c31 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.test; -import ml.pkom.mcpitanlibarch.api.client.SimpleHandledScreen; -import ml.pkom.mcpitanlibarch.api.client.gui.widget.CompatibleTexturedButtonWidget; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawBackgroundArgs; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.DrawMouseoverTooltipArgs; -import ml.pkom.mcpitanlibarch.api.client.render.handledscreen.RenderArgs; +import net.pitan76.mcpitanlib.api.client.SimpleHandledScreen; +import net.pitan76.mcpitanlib.api.client.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java index 7a98cdcf9..6f7ad6a67 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.test; -import ml.pkom.mcpitanlibarch.api.entity.Player; -import ml.pkom.mcpitanlibarch.api.gui.SimpleScreenHandler; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandler; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; diff --git a/common/src/main/resources/icon.png b/common/src/main/resources/icon.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..cdbbf1fa01dc31421f296cf56ce2025b449d13f5 100644 GIT binary patch literal 66211 zcmV);K!(4GP)s<`Q`fHU=`MV2-?1?Uj2I0z z5<(dH0Szx8Vev57LLdf&G>n9VkZcVW(jcCA;=v;g0s$H%1lGWa!FWd4jPcl}ZL4Wl zyW3q|T~%GzbNMfOXU5_oA~GXmM?~h{|KiH%FTjq9Hs-P){k5oG{y^JaM{Rh4mceu`7>S-Ac4M9<{%v z@RVZMh4wO)$iB2W2p{i0`KWHEE9DnxV|*$&a`=!>DLloaR?a#2G(T(eJZkyo>YS@z z8b5~zxbHhvYH1nbve(L4OP7|XmRCqus#}1x{?`QZ)GUzHs>p?N&qb`2IGhU3xmHCk zT`oQ+Was9arYrHTDTg_y zC2M4gS8l{x!`G~X8h#%OB()Ao>2jm{6koD5ay&{FLC(sVYju>-gs;`}vU#L!yGtH%+7fLEU*eml zNy8=lzRKb<6v(c$DX3nK5=ud2EX?Ne*ta}aRga7E*!4Z;c%<&BU3tg(mdX?Jh-q`_ z=6n-1+LT9*_8Jt(^;sYy^DK&{*%nH>y13$WQ@nS1a{11oFVV*FIhq{4WR(Pn@p0Qv zDU=dzPKcM3OHJUHaQl8#wYWLBi_oTU71l=@zY9J`Te1q$JfQ|ebMYlbkmE6h zFS(#{>1wpQK2!54Q|aa?iuk#Pd6BDkVeKMp_Z8Cn(8l;uco!bIbaQxw@SHMC(azyf z%VQV(tpd4)s|MBjyPJBiDL&*kCtZ$qsyro_;ycBo_Wjh#l&k+G!__H}IV+^5!f{;4 zt3(^)OSCzfDSYY@nv>TYMN)G`)$qG2pb~8@U5wB1NYkgZbMU(;h`CB(7o~FDFxT3c zLpukb3YHo^4X630qvn*hWNif667Q*WG32a?IFB$24{@r_9iHOja>TSHt170crK>$5 zUDM<(np_)*476cxrPf}l#S*`xoRxD)aCHhK78n&*-o!T^5`dt&$ zbMm_gj~d^Urk1`$vkN{)yDxs<-=(-({B=VrNK0|M((b~qgfE46Nw*8kNtY^-c!D~Y zJ{7VlP1@hmdIVve(oXS+)0H4j7l&)#MQpW{$`-Nr_yI0+}O7cNO^i z;^(BxBGbPkhyW(@a=7w|iNaJ&` z3+>$WyFyMl*Jx9GPNC%7P$fZ7!-d~D7fl?_xsOtJNg5vnVJWXtI8HZ38|NDf>5?la zjLb`Ai{oR#8z6@-wOeqLmD(uIBWEF%+9h^7rB+MMEtR%c%D2?E7gQ#fr$8=KP~VV8 z1@!P7H3~*C=f{8`%upaDfqfYYBqyM!@V5%2440umZsB@h-*+{q?@aZh>!2;sOyT$a z{@_AN;L%MjdClhT)MRaDEO*u!(Q>7cPldx)q3Zty;kS{ZWXDWy-tC44SE@{QBw<~u^Wm++CE6L$^RTy)W(o{H8zoL?;@u=muE51ZqqfeohZVvr* zz|;qtb2ZgycEOiiOS|A}uCS6@Ea%e6(WY*cIry9lri8!f@g+6dS{}7cf+>&E@g-@x zT3l{#h^pHMlIA;=Zb!J71(FkRB>^<&fo%c25bP1?5$K`1!M^~VqP-@Fl>!+-k>KMW zQoxJ4#|)iXn-*=fUgx>tso%M_+l5ChZi=Ra&!wM=+XX-O_pWqv@i!Gj>Q=`TzC^n# zJ{?)l$uCY5G&%g7JaY92_*Ajv@{LFDF)eIQ zrkC=KpIV!gR$--iq$|48{Ty+=yQGWTIi^j+X`OdT7r)OLu)hMSt&D=*6-OyAqoDhl zSC71=J|5208R3at% z8h$GNX(^M~8Ytmn{8U^TpA)`mx?O(HQ64d$QkocFqRr(M`cq*4{P&fi`_u!-j9$jr`+Q*#Cto^eID_9OL>I4$1bcGA1lEr9#^VBri5Y* zw-3D|@K0tG)+$(#RtD0cu-RZWjv*g43d;y%73?{*E$9Yl!5)HH%oFar;%n`l!_~rR z9&ubQU5d|@X&-z|!PL^$;&!E-i{A(Kad})9>{7O?qPoK1qFHBVV+pzQ8O&B4ULfMpFUo; z;~3+0q3A;CUhM{4yN2}|*5_WI9fDX`9D!MF*S99v=WHr0;d9}AXp=f`g>&>Zg^>Fw zr#fjVUG4WSakcoXfSS-s@g++oC*W%7Q+zJIWC`R(^R+x`)<-%bPkDs+)KyZ$=iD%H zS##+E#CtSqWsgVewY*c>v~0ODhtYjV7c8AP-`swUaO_FWVv5rR2=$7OOUdOMmow+W z%DtNk?503!${@whQ5;i`F-}02<~juQPD6KSFm#yH4)eHkiY1iC(+vtEr$89u{BOGy zSQ$nph_Gq*b-)%~p!`Enb#g}Mfn4>Iig7TLa0QWiw|+7V^4BQs0L}-;(lCnXXWZ%qb)5mh!qiRr^|g~ zv8!*6o9xmQNKLqv@R#|-pg>qTwQ@K;YSB)?bjVr}NQ(q@lZ&?}SSydoYxSI(3xNEKwuA@9T>tGJ=xwJvh zUZftm^mF?66yFjqq?`K6!1-xj}O01Qh^Ol)*TK} z`tkwY3rhEyLzaJbf}C08Jd7}4ucSzF@ug!= zb_wrGs}`pOTeLex?HRUxA8j9lZfNfQ2(q|`H21diO7lzO=HRD(&ruY+D4t#L`@qx) zHis{zN#kq3OSlrv9DL24k-B)M(x>jAG+i!S8hOX~Qo5RpD(7Yj!Z%KnqeDE89=}jnTHthGY*s#PH>5EQh^g0O zO0lH4_;-$GBCNQJWK>(A1uUv-paZq2o}%iM26lt9q^zUY4z(ws8x#vCZ_ymT3CsI+ zWl&Qfm#HwWNr9+pf$ornp#4WVbfFM8!V~a10>&MCez z$VQMekgh`;L3;%vV8A|D zA?FR!9H0*mkhXDxKJYLZzP&=kTNN8vY#1q!W(me7>6&~!c0EjSrgE62U{q0BV2#={ zR5zffs67W-Z1*v0*Pv@Rhf@Ko?_dsI%JWTmr*U)eQ@@{<0*QpBRoC;vFevuOH(vHQ zu}iNItkRD$Z1l~gd4x1Ni$}C|Rve8);VKVsXS->@3pT1_gbHY$Q&%1BD<{ak7TK&=eEKTF(w$`$ zH||#1J%eTq%^C21#CHj@@#!)zVi)BZ$Hy-!*-PSHnMGMUt3gk_LTFKa;w%eYqxQtd zpSi~ApI&?vUv(Ai8LDfP4VVLDUqvxTkxb!hALzcgS{hZ3|HHpZr;1g@_@Cg@j}d22zfa~WChaw5!4Sm%=J z!yDWrw|7fNJP2xbK!OOJ!r>lp?8xcZr))4!bCim{zTO z1FE$C1GdqJGZnrn+8fOSXkd4Rof`p{TuCu)DLjWqt(=w4bq~B|70YE++ z{+7alHjJFp4RIk{yVoP89TnKrd6XuvbK$hkxg$bi%OJIc;xfdvaUQWHR-;WP(NlaW zK3E(jd|D4u1+uR)$c1D2IV-M;JakKrJA4THr+Ja)%+S0qbdNtlkDz;L#o(A$x;vlJ z9Y4aJo?|w5G3{NTL1LaU?G;R@58G<3k!cZ*_1Mv68g14!juBJEaj2VNnRSzhK-;xWZ52SIs=AYwpPAS+C}#;!Z$NrxVYvql;LvCdVrJjIHD zQA~RerSa+AB~mU=9ZjSDY(eov*JOQUQLTyCKbrEhf?S5q$CT>7c9?SoI1V5}t4 zvc=&NZ7$s|`Noh_xVdz-?{cafX}-z(TWkq$s85Qgf_;~LAiJg$@d7GLZud23%aw#U z|NOy=7<-7EJ;t28Py4dL9ts>aJ*_=>49ioj{e;DnHxWHR!iGTs45(NzW7m;Ni#-5c zEYSwk;3wMu^tl!`ilF_w!6{<#^DV}YL3Zu9x$qqP93?XqKLfAUVwGF#V+Szt!kP4N zzLI5-i%Z>7xe;~z#OY$*F^`Zg#{-5VK+?Qw?yOSTYU$>juv?=|=QRTFt{bOI@wt3c z1rl3exw3_c^oYk|lu^m0w2K1BJ*B*IZmTUGg;iJ*g~2J4Fdwlv1`ZIt!{X6L*poBt zy*2i*@yC+@(xHu|J$@T>f#}M`iFyGUgk%I}jfzDZGcLn(4*gs}zhv2fo`bGI4(2O| zIU}oG@U^&F{2aW;-MX;mgB5YBuwd*5k()pg+K9IERQFu`l-f`kN&lG)(j|(|B?+mC3 z>2VwX7S_3xddp;mZj9R&mG%n(P;_w$YEV7*3PT5_m9h@!V11`(jsWVENUuCZ2&=!c zA3-gg`^ZYaZ-4^1g&kp+b}PBIYQk?<$hl>5Ja&P!Y$aD)tsbRxQ!cC$k6pgQU3lcm z8Q~Yb=1Q%I*maf0<>=CI(`+-{)!o&n6GlQ?03+y8gEj(;5i4mmMrR?5Z6ZAgtW_C_Rd; z3hSR+xH1s`5=ET#q3v|Xi^Er`KuU47_!@{zy2EcFf!yFRKq{=}Hf|~;Yjh#+QrY5g z&YiUnk2!rSH}?}yve%A;PnFD^dgPQ-X}~q*&Wht=e*SOXg*C@*719`keF5|s?8}Pz zM3Hka=b%f4g`kHW+5ii%N7h*zOJ`kRblCK_$9H}U*9Yp)$d{&p?jhKNafc5uM`2ur z0@;;z0_1ih;Z87eVa0+i=eCKJ$kgevLC{X&)A+!nzNqM3&^uro>$VDXUNHpg!do4>RCiUZ z0UEtk8qX5+BPrvo58YuBeXcU8<#qXg�aR|y0CVDEf-eKMU=jaRGFmdr!0bf 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 z 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 YcBhujp!Wy)WTekCO+AfDwO1ehAHWUtk^lez literal 0 HcmV?d00001 diff --git a/common/src/main/resources/mcpitanlibarch-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json similarity index 100% rename from common/src/main/resources/mcpitanlibarch-common.mixins.json rename to common/src/main/resources/mcpitanlib-common.mixins.json diff --git a/common/src/main/resources/mcpitanlibarch.accesswidener b/common/src/main/resources/mcpitanlib.accesswidener similarity index 100% rename from common/src/main/resources/mcpitanlibarch.accesswidener rename to common/src/main/resources/mcpitanlib.accesswidener diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java index f95115ce0..8c3380f7d 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.fabric.mixin; -import ml.pkom.mcpitanlibarch.api.item.FixedRecipeRemainderItem; +import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index fcacf067d..c2698422f 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "mcpitanlibarch", + "id": "mcpitanlib", "version": "${version}", "name": "MCPitanLib", "description": "Pitan's Minecraft Mod Library", @@ -20,18 +20,22 @@ "net.pitan76.mcpitanlib.fabric.MCPitanLibFabric" ] }, + "provides": [ + "mcpitanlibarch", + "mcpitanlib-impl" + ], "custom": { "modmenu": { "badges": ["library"] } }, "mixins": [ - "mcpitanlibarch.mixins.json", - "mcpitanlibarch-common.mixins.json" + "mcpitanlib.mixins.json", + "mcpitanlib-common.mixins.json" ], - "accessWidener" : "mcpitanlibarch.accesswidener", + "accessWidener" : "mcpitanlib.accesswidener", "depends": { - "minecraft": ">1.19.3", + "minecraft": ">1.20.2", "fabricloader": "*", "architectury": "*" } diff --git a/fabric/src/main/resources/mcpitanlibarch.mixins.json b/fabric/src/main/resources/mcpitanlib.mixins.json similarity index 100% rename from fabric/src/main/resources/mcpitanlibarch.mixins.json rename to fabric/src/main/resources/mcpitanlib.mixins.json diff --git a/forge/build.gradle b/forge/build.gradle index a4036e73e..378e0c24d 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -13,8 +13,8 @@ loom { convertAccessWideners = true extraAccessWideners.add loom.accessWidenerPath.get().asFile.name - mixinConfig "mcpitanlibarch-common.mixins.json" - mixinConfig "mcpitanlibarch.mixins.json" + mixinConfig "mcpitanlib-common.mixins.json" + mixinConfig "mcpitanlib.mixins.json" } } diff --git a/forge/src/main/resources/mcpitanlibarch.mixins.json b/forge/src/main/resources/mcpitanlib.mixins.json similarity index 100% rename from forge/src/main/resources/mcpitanlibarch.mixins.json rename to forge/src/main/resources/mcpitanlib.mixins.json diff --git a/info.properties b/info.properties index 9bad58f41..68982b6c2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=1.9.6 +mod_version=2.0.0 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index 64f70fc19..5a3cdac76 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -15,7 +15,7 @@ issueTrackerURL = "https://github.com/Pitan76/mcpitanlibarch/issue" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId = "mcpitanlibarch" #mandatory +modId = "mcpitanlib" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # ${version} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build @@ -37,7 +37,7 @@ description = ''' Pitan's Minecraft Mod Library ''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.mcpitanlibarch]] #optional +[[dependencies.mcpitanlib]] #optional # the modid of the dependency modId = "forge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified @@ -49,7 +49,7 @@ ordering = "NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER side = "BOTH" # Here's another dependency -[[dependencies.mcpitanlibarch]] +[[dependencies.mcpitanlib]] modId = "minecraft" mandatory = true # This version range declares a minimum of the current minecraft version up to but not including the next major version @@ -58,7 +58,7 @@ ordering = "NONE" side = "BOTH" [[mixins]] -config = "mcpitanlibarch-common.mixins.json" +config = "mcpitanlib-common.mixins.json" [[mixins]] -config = "mcpitanlibarch.mixins.json" \ No newline at end of file +config = "mcpitanlib.mixins.json" \ No newline at end of file diff --git a/neoforge/src/main/resources/mcpitanlibarch.mixins.json b/neoforge/src/main/resources/mcpitanlib.mixins.json similarity index 76% rename from neoforge/src/main/resources/mcpitanlibarch.mixins.json rename to neoforge/src/main/resources/mcpitanlib.mixins.json index f00451cf3..df01c3ab5 100644 --- a/neoforge/src/main/resources/mcpitanlibarch.mixins.json +++ b/neoforge/src/main/resources/mcpitanlib.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.forge.mixin", + "package": "net.pitan76.mcpitanlib.forge.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ ], diff --git a/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/MCPitanLibarchQuilt.java b/quilt/src/main/java/ml/pkom/mcpitanlib/quilt/MCPitanLibQuilt.java similarity index 50% rename from quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/MCPitanLibarchQuilt.java rename to quilt/src/main/java/ml/pkom/mcpitanlib/quilt/MCPitanLibQuilt.java index 6d40e85c6..72eb72979 100644 --- a/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/MCPitanLibarchQuilt.java +++ b/quilt/src/main/java/ml/pkom/mcpitanlib/quilt/MCPitanLibQuilt.java @@ -1,13 +1,13 @@ -package ml.pkom.mcpitanlibarch.quilt; +package net.pitan76.mcpitanlib.quilt; -import ml.pkom.mcpitanlibarch.MCPitanLibarch; +import net.pitan76.mcpitanlib.MCPitanLib; import org.quiltmc.loader.api.ModContainer; import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; -public class MCPitanLibarchQuilt implements ModInitializer { +public class MCPitanLibQuilt implements ModInitializer { @Override public void onInitialize(ModContainer mod) { - MCPitanLibarch.init(); + MCPitanLib.init(); } } \ No newline at end of file diff --git a/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/mixin/RecipeMixin.java b/quilt/src/main/java/ml/pkom/mcpitanlib/quilt/mixin/RecipeMixin.java similarity index 90% rename from quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/mixin/RecipeMixin.java rename to quilt/src/main/java/ml/pkom/mcpitanlib/quilt/mixin/RecipeMixin.java index dd7f6e646..8c3380f7d 100644 --- a/quilt/src/main/java/ml/pkom/mcpitanlibarch/quilt/mixin/RecipeMixin.java +++ b/quilt/src/main/java/ml/pkom/mcpitanlib/quilt/mixin/RecipeMixin.java @@ -1,6 +1,6 @@ -package ml.pkom.mcpitanlibarch.fabric.mixin; +package net.pitan76.mcpitanlib.fabric.mixin; -import ml.pkom.mcpitanlibarch.api.item.FixedRecipeRemainderItem; +import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; diff --git a/quilt/src/main/resources/mcpitanlibarch.mixins.json b/quilt/src/main/resources/mcpitanlib.mixins.json similarity index 77% rename from quilt/src/main/resources/mcpitanlibarch.mixins.json rename to quilt/src/main/resources/mcpitanlib.mixins.json index 864f03833..0a36c5829 100644 --- a/quilt/src/main/resources/mcpitanlibarch.mixins.json +++ b/quilt/src/main/resources/mcpitanlib.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "ml.pkom.mcpitanlibarch.fabric.mixin", + "package": "net.pitan76.mcpitanlib.fabric.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ "RecipeMixin" diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json index 87bf5b401..959e4d253 100644 --- a/quilt/src/main/resources/quilt.mod.json +++ b/quilt/src/main/resources/quilt.mod.json @@ -22,7 +22,7 @@ "environment": "*", "entrypoints": { "init": [ - "ml.pkom.mcpitanlibarch.quilt.MCPitanLibarchQuilt" + "net.pitan76.mcpitanlib.quilt.MCPitanLibarchQuilt" ] }, "custom": { @@ -47,7 +47,7 @@ } ] }, - "accessWidener": "mcpitanlibarch.accesswidener", + "accessWidener": "mcpitanlib.accesswidener", "mixins": [ "mcpitanlibarch.mixins.json", "mcpitanlibarch-common.mixins.json" From 9d53d460f75c2cd0f256d645b32548c86246ee13 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:30:28 +0900 Subject: [PATCH 236/622] remove php --- upload_curseforge.php | 145 ------------------------------------------ 1 file changed, 145 deletions(-) delete mode 100644 upload_curseforge.php diff --git a/upload_curseforge.php b/upload_curseforge.php deleted file mode 100644 index 560db389d..000000000 --- a/upload_curseforge.php +++ /dev/null @@ -1,145 +0,0 @@ - './common/build/libs/', - 'fabric' => './fabric/build/libs/', - 'forge' => './forge/build/libs/', -)); - -define('GAME_VERSIONS', array( - '1.16.5' => '1.16', - '1.17' => '1.17', - '1.18' => '1.18', - '1.19' => '1.19', -)); - -define('PLATFORM_FILE_MARK', array( -// 'common' => '', - 'fabric' => '-fabric', - 'forge' => '-forge', -)); - -$postData = array(); - -$ch = curl_init('https://minecraft.curseforge.com/api/game/version-types'); - -curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET'); -curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); -curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); -curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json', 'X-Api-Token: 788ae0f4-ae9a-405f-be51-7988574a533a')); -curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); -$result = curl_exec($ch); - -$game_version_types_data = json_decode($result, true); - -curl_close($ch); - -//file_put_contents('curse_forge_game_version_types.json', json_encode($game_version_json, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); - - -$postData = array(); - -$ch = curl_init('https://minecraft.curseforge.com/api/game/versions'); - -curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET'); -curl_setopt($ch, CURLOPT_POSTFIELDS, $postData); -curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); -curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type: application/json', 'X-Api-Token: 788ae0f4-ae9a-405f-be51-7988574a533a')); -curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); -$result = curl_exec($ch); - -$game_versions_data = json_decode($result, true); - -curl_close($ch); - -//file_put_contents('curse_forge_game_versions.json', json_encode($game_version_json, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); - -$CHANGE_LOG = CHANGE_LOG; - -foreach (DIRS as $type => $dir) { - - foreach (GAME_VERSIONS as $file_ver => $ver) { - $typeId = 0; - foreach ($game_version_types_data as $data) { - if ($data['name'] == 'Minecraft ' . $ver) { - $typeId = $data['id']; - } - } - - $version_id_list = array(); - foreach ($game_versions_data as $data) { - if ($data['gameVersionTypeID'] == $typeId) { - if (!str_ends_with($data['slug'], 'snapshot')) { - $version_id_list[] = $data['id']; - } - } - } - - $postData = array(); - - $releaseType = ($type === "fabric" ? 'release' : 'beta'); - $fabric_api = ''; - if ($type == 'fabric') { -$fabric_api = << Date: Thu, 15 Feb 2024 16:33:32 +0900 Subject: [PATCH 237/622] php --- upload_maven.php | 62 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/upload_maven.php b/upload_maven.php index dd2b13cc7..4d49371b5 100644 --- a/upload_maven.php +++ b/upload_maven.php @@ -1,23 +1,30 @@ './common/build/libs/', - 'fabric' => './fabric/build/libs/', - 'forge' => './forge/build/libs/', + 'common' => 'common/build/', + 'fabric' => 'fabric/build/', + 'forge' => 'forge/build/', + 'neoforge' => 'neoforge/build/', )); define('GAME_VERSIONS', array( - '1.16.5' => '1.16', - '1.17' => '1.17', - '1.18' => '1.18', - '1.19' => '1.19', + '1.16.5' => '1.16.5', + '1.18.2' => '1.18.2', + '1.19.2' => '1.19.2', + '1.20.1' => '1.20.1', + '1.20.4' => '1.20.4', )); define('PLATFORM_FILE_MARK', array( 'common' => '', 'fabric' => '-fabric', 'forge' => '-forge', + 'neoforge' => '-neoforge', )); foreach (DIRS as $type => $dir) { @@ -26,23 +33,42 @@ $postData = array(); - $postData['group_id'] = 'ml.pkom'; - $postData['artifact_id'] = 'mcpitanlibarch-' . $type . '+' . $ver; + $postData['group_id'] = 'net.pitan76'; + $postData['artifact_id'] = 'mcpitanlib-' . $type . '+' . $ver; $postData['version'] = VERSION; - + $files = array( - $dir . 'mcpitanlibarch-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '.jar', - $dir . 'mcpitanlibarch-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '-sources.jar', + $dir . 'libs/mcpitanlib-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '.jar', + $dir . 'libs/mcpitanlib-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '-sources.jar', + $dir . 'publications/maven' . ucfirst($type) . '/mcpitanlib-' . $file_ver . '.pom', ); - + + $pom = '../' . $dir . 'publications/maven' . ucfirst($type) . '/mcpitanlib-' . $file_ver . '.pom'; + + $pom_str = file_get_contents($pom); + $pom_str = preg_replace('/' . preg_quote(VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '', '/'). '/', VERSION . '', $pom_str, 1); + $pom_str = preg_replace('/' . preg_quote('mcpitanlib' . PLATFORM_FILE_MARK[$type] . '', '/') . '/', 'mcpitanlib' . ($type == "common" ? '-common' : PLATFORM_FILE_MARK[$type]) . '+' . $file_ver . '', $pom_str, 1); + + file_put_contents($pom, $pom_str); + + $notfound = false; + foreach ($files as $index => $file) { + + if (!file_exists(realpath("../" . $file))) { + echo "not found" . $file; + $notfound = true; + continue; + } $postData['upload[' . $index . ']'] = curl_file_create( - realpath($file), - mime_content_type($file), - basename($file) + realpath("../" . $file), + mime_content_type("../" . $file), + basename("../" . $file) ); echo "Uploading '" . $file . "'\n"; } + + if ($notfound) continue; $request = curl_init('http://localhost/maven/maven.php'); curl_setopt($request, CURLOPT_POST, true); @@ -56,5 +82,3 @@ curl_close($request); } } - - From b1c5999b22f62ae5d45ab47b342e67dce32bd968 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:13:15 +0900 Subject: [PATCH 238/622] rename mcpitanlib fix modinfo --- .../java/net/pitan76/mcpitanlib/MCPitanLib.java | 2 +- .../mcpitanlib/api/client/SimpleHandledScreen.java | 3 +-- .../widget/CompatibleTexturedButtonWidget.java | 2 +- .../widget/RedrawableTexturedButtonWidget.java | 2 +- .../mcpitanlib/api/util/client/ScreenUtil.java | 4 ++-- .../net/pitan76/mcpitanlib/test/ExampleScreen.java | 2 +- fabric/src/main/resources/fabric.mod.json | 4 ++-- forge/src/main/resources/META-INF/mods.toml | 8 ++++---- info.properties | 2 +- neoforge/build.gradle | 4 ++-- .../mcpitanlib/neoforge/MCPitanLibNeoForge.java | 4 ++-- neoforge/src/main/resources/META-INF/mods.toml | 2 +- .../pitan76}/mcpitanlib/quilt/MCPitanLibQuilt.java | 0 .../mcpitanlib/quilt/mixin/RecipeMixin.java | 0 quilt/src/main/resources/quilt.mod.json | 14 +++++++------- 15 files changed, 26 insertions(+), 27 deletions(-) rename common/src/main/java/net/pitan76/mcpitanlib/api/client/{ => gui}/widget/CompatibleTexturedButtonWidget.java (97%) rename common/src/main/java/net/pitan76/mcpitanlib/api/client/{ => gui}/widget/RedrawableTexturedButtonWidget.java (96%) rename quilt/src/main/java/{ml/pkom => net/pitan76}/mcpitanlib/quilt/MCPitanLibQuilt.java (100%) rename quilt/src/main/java/{ml/pkom => net/pitan76}/mcpitanlib/quilt/mixin/RecipeMixin.java (100%) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index 7b270d5ba..40aad375d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -13,7 +13,7 @@ import java.util.List; public class MCPitanLib { - public static final String MOD_ID = "mcpitanlibarch"; + public static final String MOD_ID = "mcpitanlib"; private static final File configFile = new File(PlatformUtil.getConfigFolder().toFile(), "mcpitanlib/blacklist.json"); private static final File oldConfigFile = new File(PlatformUtil.getConfigFolder().toFile(), "mcpitanlibarch/blacklist.json"); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 27920e22e..9b2027f96 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.api.client; -import net.pitan76.mcpitanlib.api.client.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.minecraft.client.MinecraftClient; @@ -15,7 +15,6 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; public abstract class SimpleHandledScreen extends HandledScreen { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java similarity index 97% rename from common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/CompatibleTexturedButtonWidget.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java index 8a78951c1..0bd627c0f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.api.client.widget; +package net.pitan76.mcpitanlib.api.client.gui.widget; import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.client.gui.DrawContext; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/RedrawableTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/RedrawableTexturedButtonWidget.java similarity index 96% rename from common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/RedrawableTexturedButtonWidget.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/RedrawableTexturedButtonWidget.java index 08ae46378..ba6363c39 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/widget/RedrawableTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/RedrawableTexturedButtonWidget.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.api.client.widget; +package net.pitan76.mcpitanlib.api.client.gui.widget; import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index 79cf19eb8..bf70b0932 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.util.client; -import net.pitan76.mcpitanlib.api.client.widget.CompatibleTexturedButtonWidget; -import net.pitan76.mcpitanlib.api.client.widget.RedrawableTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.gui.widget.RedrawableTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import net.fabricmc.api.EnvType; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java index c4e562c31..b9164f732 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.test; import net.pitan76.mcpitanlib.api.client.SimpleHandledScreen; -import net.pitan76.mcpitanlib.api.client.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c2698422f..42bf27ed3 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -9,8 +9,8 @@ ], "contact": { "website": "https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch", - "repo": "https://github.com/Pitan76/mcpitanlibarch", - "issues": "https://github.com/Pitan76/mcpitanlibarch/issue" + "repo": "https://github.com/Pitan76/MCPitanLib", + "issues": "https://github.com/Pitan76/MCPitanLib/issue" }, "license": "MIT", "icon": "icon.png", diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 59649356e..1c158fd73 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -11,11 +11,11 @@ loaderVersion = "[40,)" #mandatory This is typically bumped every Minecraft vers # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license = "MIT" # A URL to refer people to when problems occur with this mod -issueTrackerURL = "https://github.com/Pitan76/mcpitanlibarch/issue" +issueTrackerURL = "https://github.com/Pitan76/MCPitanLib/issue" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId = "mcpitanlibarch" #mandatory +modId = "mcpitanlib" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # ${version} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build @@ -37,7 +37,7 @@ description = ''' Pitan's Minecraft Mod Library ''' # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.mcpitanlibarch]] #optional +[[dependencies.mcpitanlib]] #optional # the modid of the dependency modId = "forge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified @@ -49,7 +49,7 @@ ordering = "NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER side = "BOTH" # Here's another dependency -[[dependencies.mcpitanlibarch]] +[[dependencies.mcpitanlib]] modId = "minecraft" mandatory = true # This version range declares a minimum of the current minecraft version up to but not including the next major version diff --git a/info.properties b/info.properties index 68982b6c2..cd434f53c 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ -archives_base_name=mcpitanlib +archives_base_name=MCPitanLib mod_version=2.0.0 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle index d684b6c93..a36c68364 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -14,8 +14,8 @@ loom { convertAccessWideners = true extraAccessWideners.add loom.accessWidenerPath.get().asFile.name - mixinConfig "mcpitanlibarch-common.mixins.json" - mixinConfig "mcpitanlibarch.mixins.json" + mixinConfig "mcpitanlib-common.mixins.json" + mixinConfig "mcpitanlib.mixins.json" } */ diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index 7097e7178..b7569bead 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -6,10 +6,10 @@ @Mod(MCPitanLib.MOD_ID) public class MCPitanLibNeoForge { public MCPitanLibNeoForge() { - //EventBuses.registerModEventBus(MCPitanLibarch.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + //EventBuses.registerModEventBus(MCPitanLib.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); MCPitanLib.init(); //if (Platform.getEnv().isClient()) - // FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibarchNeoForgeClient::clientInit); + // FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibNeoForgeClient::clientInit); } } \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml index 5a3cdac76..16a09d57c 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -11,7 +11,7 @@ loaderVersion = "[40,)" #mandatory This is typically bumped every Minecraft vers # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. license = "MIT" # A URL to refer people to when problems occur with this mod -issueTrackerURL = "https://github.com/Pitan76/mcpitanlibarch/issue" +issueTrackerURL = "https://github.com/Pitan76/MCPitanLib/issue" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod diff --git a/quilt/src/main/java/ml/pkom/mcpitanlib/quilt/MCPitanLibQuilt.java b/quilt/src/main/java/net/pitan76/mcpitanlib/quilt/MCPitanLibQuilt.java similarity index 100% rename from quilt/src/main/java/ml/pkom/mcpitanlib/quilt/MCPitanLibQuilt.java rename to quilt/src/main/java/net/pitan76/mcpitanlib/quilt/MCPitanLibQuilt.java diff --git a/quilt/src/main/java/ml/pkom/mcpitanlib/quilt/mixin/RecipeMixin.java b/quilt/src/main/java/net/pitan76/mcpitanlib/quilt/mixin/RecipeMixin.java similarity index 100% rename from quilt/src/main/java/ml/pkom/mcpitanlib/quilt/mixin/RecipeMixin.java rename to quilt/src/main/java/net/pitan76/mcpitanlib/quilt/mixin/RecipeMixin.java diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json index 959e4d253..1ad121415 100644 --- a/quilt/src/main/resources/quilt.mod.json +++ b/quilt/src/main/resources/quilt.mod.json @@ -1,8 +1,8 @@ { "schemaVersion": 1, "quilt_loader" : { - "group": "ml.pkom", - "id": "mcpitanlibarch", + "group": "net.pitan76", + "id": "mcpitanlib", "version": "${version}", "metadata" : { "name": "MCPitanLib", @@ -12,8 +12,8 @@ ], "contact": { "homepage": "https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch", - "sources": "https://github.com/Pitan76/mcpitanlibarch", - "issues": "https://github.com/Pitan76/mcpitanlibarch/issue" + "sources": "https://github.com/Pitan76/MCPitanLib", + "issues": "https://github.com/Pitan76/MCPitanLib/issue" }, "license": "MIT", "icon": "icon.png" @@ -22,7 +22,7 @@ "environment": "*", "entrypoints": { "init": [ - "net.pitan76.mcpitanlib.quilt.MCPitanLibarchQuilt" + "net.pitan76.mcpitanlib.quilt.MCPitanLibQuilt" ] }, "custom": { @@ -49,7 +49,7 @@ }, "accessWidener": "mcpitanlib.accesswidener", "mixins": [ - "mcpitanlibarch.mixins.json", - "mcpitanlibarch-common.mixins.json" + "mcpitanlib.mixins.json", + "mcpitanlib-common.mixins.json" ] } From 709ec0f2f4195fd0451291adfbeac7860ad5f119 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:34:15 +0900 Subject: [PATCH 239/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index cd434f53c..68982b6c2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ -archives_base_name=MCPitanLib +archives_base_name=mcpitanlib mod_version=2.0.0 maven_group=net.pitan76 \ No newline at end of file From 347c384088b92387a22c692f2759e0f046e8c4c5 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:38:22 +0900 Subject: [PATCH 240/622] tracker --- .../net/pitan76/mcpitanlib/api/network/PacketByteUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java index 92e075b70..dbe82fdc4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtElement; -import net.minecraft.nbt.NbtTagSizeTracker; +import net.minecraft.nbt.NbtSizeTracker; import net.minecraft.network.PacketByteBuf; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -250,7 +250,7 @@ public static long[] readLongArray(PacketByteBuf buf) { } public static NbtElement readUnlimitedNbt(PacketByteBuf buf) { - return buf.readNbt(NbtTagSizeTracker.ofUnlimitedBytes()); + return buf.readNbt(NbtSizeTracker.ofUnlimitedBytes()); } } From 01b28a37503d2ac3a7cbc98e33c744430055ea70 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:46:14 +0900 Subject: [PATCH 241/622] import optimize --- .../net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java | 2 +- .../net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java | 2 +- .../java/net/pitan76/mcpitanlib/api/item/ExtendItem.java | 4 ++-- .../net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java | 1 - .../pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java | 4 ++-- .../pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java | 4 ++-- .../mcpitanlib/api/item/tool/CompatiblePickaxeItem.java | 4 ++-- .../mcpitanlib/api/item/tool/CompatibleShovelItem.java | 4 ++-- .../mcpitanlib/api/item/tool/CompatibleSwordItem.java | 4 ++-- .../main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java | 4 ++-- .../java/net/pitan76/mcpitanlib/api/text/TextComponent.java | 3 +-- .../pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java | 2 +- .../net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java | 6 +++--- .../mcpitanlib/api/tile/ExtendBlockEntityTicker.java | 2 +- .../net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java | 4 ++-- .../java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java | 4 ++-- .../net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java | 2 +- .../java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java | 2 +- neoforge/src/main/resources/pack.mcmeta | 2 +- 19 files changed, 29 insertions(+), 31 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java index 4768d0f54..7b652c453 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.gui; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.Inventory; @@ -9,6 +8,7 @@ import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; +import net.pitan76.mcpitanlib.api.entity.Player; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java index 807e0dadd..c10594531 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.item; import dev.architectury.registry.CreativeTabRegistry; -import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.TextUtil; import java.util.function.Supplier; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 5d662ac7e..b8ca76e0f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -1,7 +1,5 @@ package net.pitan76.mcpitanlib.api.item; -import net.pitan76.mcpitanlib.core.Dummy; -import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -14,6 +12,8 @@ import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.core.Dummy; +import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java index af1e44c7a..6b9512e4d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.item; -import net.pitan76.mcpitanlib.api.event.item.*; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.TypedActionResult; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index e0a939eb1..cdec86aa8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.item.tool; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterial; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index 24ca5181e..f384d4790 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.item.tool; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; import net.minecraft.item.HoeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterial; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index ac12f12f8..ef69ed51b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.item.tool; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterial; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index 6e9b4221c..7efc94dac 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.item.tool; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.ShovelItem; import net.minecraft.item.ToolMaterial; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index 4758cb995..e18a53618 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.item.tool; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.minecraft.block.BlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java index 14db3585b..33b9f069e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java @@ -1,7 +1,5 @@ package net.pitan76.mcpitanlib.api.tag; -import net.pitan76.mcpitanlib.api.util.EntityTypeUtil; -import net.pitan76.mcpitanlib.api.util.FluidUtil; import net.minecraft.block.Block; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; @@ -10,6 +8,8 @@ import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.EntityTypeUtil; +import net.pitan76.mcpitanlib.api.util.FluidUtil; import net.pitan76.mcpitanlib.api.util.ItemUtil; public class TagKey { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java index 65066ff24..042977e26 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java @@ -1,9 +1,8 @@ package net.pitan76.mcpitanlib.api.text; -import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.text.MutableText; import net.minecraft.text.Text; - +import net.pitan76.mcpitanlib.api.util.TextUtil; import org.jetbrains.annotations.Nullable; public class TextComponent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java index a098ed5a3..9f305ac51 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.tile; import com.mojang.datafixers.types.Type; -import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import java.util.ArrayList; import java.util.Collections; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java index 1b2f61029..abc11a2ee 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java @@ -1,8 +1,5 @@ package net.pitan76.mcpitanlib.api.tile; -import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; -import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; -import net.pitan76.mcpitanlib.api.world.ExtendWorld; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; @@ -12,6 +9,9 @@ import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; +import net.pitan76.mcpitanlib.api.world.ExtendWorld; import org.jetbrains.annotations.Nullable; public class ExtendBlockEntity extends BlockEntity { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java index 745e6426f..d5c0edda9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.tile; -import net.pitan76.mcpitanlib.api.event.tile.TileTickEvent; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityTicker; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.tile.TileTickEvent; public interface ExtendBlockEntityTicker extends BlockEntityTicker { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java index 5d9991126..42b63a52c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/BlockUtilV1.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.util.v1; -import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; -import net.pitan76.mcpitanlib.api.tag.MineableToolTags; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.tag.MineableToolTags; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java index 74531f165..b44c13657 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v1/ItemUtilV1.java @@ -1,13 +1,13 @@ package net.pitan76.mcpitanlib.api.util.v1; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.tag.TagKey; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java index 0c2726b17..a3d771a06 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.api.util.v2; -import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.Block; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.BlockUtil; import java.util.ArrayList; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java index b2295f2ce..ff8ded40b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.api.util.v2; -import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.item.Item; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.ItemUtil; import java.util.ArrayList; diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta index 547096ba2..03e89dcaa 100644 --- a/neoforge/src/main/resources/pack.mcmeta +++ b/neoforge/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "mcpitanlibarch resources", + "description": "mcpitanlib resources", "pack_format": 8, "forge:resource_pack_format": 8, "forge:data_pack_format": 9 From 513ef09337346bffd092ddee68127f0852f79e4b Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 18:46:25 +0900 Subject: [PATCH 242/622] import optimize --- .../net/pitan76/mcpitanlib/MCPitanLib.java | 2 +- .../api/block/CompatibleBlockSettings.java | 5 ++++- .../mcpitanlib/api/block/ExtendBlock.java | 4 ++-- .../api/block/ExtendBlockEntityProvider.java | 4 ++-- .../api/client/SimpleHandledScreen.java | 6 ++--- .../CompatibleTexturedButtonWidget.java | 2 +- .../client/registry/KeybindingRegistry.java | 4 ++-- .../api/command/CommandRegistry.java | 2 -- .../api/command/argument/EntitiesCommand.java | 4 ++-- .../api/command/argument/EntityCommand.java | 4 ++-- .../api/command/argument/ItemCommand.java | 4 ++-- .../api/command/argument/PlayerCommand.java | 4 ++-- .../api/command/argument/PlayersCommand.java | 4 ++-- .../mcpitanlib/api/entity/ExtendEntity.java | 2 +- .../pitan76/mcpitanlib/api/entity/Player.java | 6 ++--- .../api/event/EntitiesCommandEvent.java | 2 +- .../api/event/EntityCommandEvent.java | 2 +- .../api/event/ItemCommandEvent.java | 2 +- .../api/event/PlayerCommandEvent.java | 2 +- .../api/event/PlayersCommandEvent.java | 2 +- .../api/event/ServerCommandEvent.java | 2 +- .../api/event/block/BlockBreakEvent.java | 4 ++-- .../api/event/block/BlockPlacedEvent.java | 2 +- .../event/block/BlockScheduledTickEvent.java | 2 +- .../api/event/block/BlockUseEvent.java | 4 ++-- .../api/event/block/OutlineShapeEvent.java | 2 +- .../event/block/ScreenHandlerCreateEvent.java | 4 ++-- .../api/event/block/StateReplacedEvent.java | 2 +- .../api/event/block/TileCreateEvent.java | 2 +- .../event/item/ItemAppendTooltipEvent.java | 2 +- .../api/event/item/ItemFinishUsingEvent.java | 2 +- .../api/event/item/ItemUseEvent.java | 4 ++-- .../api/event/item/ItemUseOnBlockEvent.java | 5 ++--- .../api/event/item/ItemUseOnEntityEvent.java | 4 ++-- .../event/v0/AttackEntityEventRegistry.java | 2 +- .../api/event/v0/EventRegistry.java | 4 ++-- .../event/v0/event/ItemStackActionEvent.java | 2 +- .../event/v0/event/RecipeManagerEvent.java | 2 +- .../api/recipe/CompatibleRecipeEntry.java | 2 +- .../api/registry/CompatRegistry.java | 22 +++++++++---------- .../mcpitanlib/api/util/BlockUtil.java | 6 ++--- .../api/util/CompatibleRecipeEntryUtil.java | 3 +-- .../mcpitanlib/api/util/DamageSourceUtil.java | 2 +- .../mcpitanlib/api/util/EntityUtil.java | 2 +- .../api/util/EquipMaterialUtil.java | 4 ++-- .../pitan76/mcpitanlib/api/util/ItemUtil.java | 4 ++-- .../mcpitanlib/api/util/PlayerUtil.java | 2 +- .../mcpitanlib/api/util/ResourceUtil.java | 1 - .../mcpitanlib/api/util/TimerUtil.java | 4 ++-- .../mcpitanlib/api/util/WorldUtil.java | 2 +- .../api/util/client/MatrixStackUtil.java | 4 ++-- .../api/util/client/ScreenUtil.java | 8 +++---- .../api/util/event/BlockEventGenerator.java | 2 +- .../api/util/event/ItemEventGenerator.java | 2 +- .../mcpitanlib/api/world/ExtendWorld.java | 2 +- .../mcpitanlib/core/player/ItemCooldown.java | 2 +- .../pitan76/mcpitanlib/debug/DebugTool.java | 3 ++- .../pitan76/mcpitanlib/mixin/ItemMixin.java | 6 ++--- .../mcpitanlib/mixin/ItemStackMixin.java | 2 +- .../mixin/MinecraftServerTimer.java | 2 +- .../mcpitanlib/mixin/RecipeManagerMixin.java | 4 ++-- .../mcpitanlib/mixin/ServerWorldTimer.java | 2 +- .../mcpitanlib/test/ExampleCommand.java | 2 +- .../mcpitanlib/test/ExampleGuiBlock.java | 6 ++--- .../mcpitanlib/test/ExampleGuiItem.java | 8 +++---- .../pitan76/mcpitanlib/test/ExampleMod.java | 8 +++---- .../mcpitanlib/test/ExampleScreen.java | 8 +++---- .../mcpitanlib/test/ExampleScreenHandler.java | 4 ++-- .../mcpitanlib/fabric/MCPitanLibFabric.java | 2 +- .../mcpitanlib/fabric/mixin/RecipeMixin.java | 2 +- 70 files changed, 125 insertions(+), 126 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index 40aad375d..9ee0a0c38 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib; +import net.minecraft.util.Identifier; import net.pitan76.easyapi.config.Config; import net.pitan76.easyapi.config.JsonConfig; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; import net.pitan76.mcpitanlib.api.util.PlatformUtil; import net.pitan76.mcpitanlib.debug.DebugTool; -import net.minecraft.util.Identifier; import java.io.File; import java.util.ArrayList; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java index b9baab099..8b68dc9a4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java @@ -1,6 +1,9 @@ package net.pitan76.mcpitanlib.api.block; -import net.minecraft.block.*; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.MapColor; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.DyeColor; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 9cf5bafe1..1c6eeec4c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -1,7 +1,5 @@ package net.pitan76.mcpitanlib.api.block; -import net.pitan76.mcpitanlib.api.event.block.*; -import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -22,6 +20,8 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import net.pitan76.mcpitanlib.api.event.block.*; +import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; import net.pitan76.mcpitanlib.api.util.TextUtil; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java index cb5b24676..47b1a124e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java @@ -1,7 +1,5 @@ package net.pitan76.mcpitanlib.api.block; -import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; -import net.pitan76.mcpitanlib.api.tile.ExtendBlockEntityTicker; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -9,6 +7,8 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.tile.ExtendBlockEntityTicker; import org.jetbrains.annotations.Nullable; public interface ExtendBlockEntityProvider extends BlockEntityProvider { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 9b2027f96..bcf47ccea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -1,8 +1,5 @@ package net.pitan76.mcpitanlib.api.client; -import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; -import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; @@ -15,6 +12,9 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; public abstract class SimpleHandledScreen extends HandledScreen { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java index 0bd627c0f..f25874171 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.client.gui.widget; -import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.TextUtil; public class CompatibleTexturedButtonWidget extends TexturedButtonWidget { private final Identifier texture; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/KeybindingRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/KeybindingRegistry.java index f1ee47252..771f39bc4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/KeybindingRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/KeybindingRegistry.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.client.registry; import dev.architectury.registry.client.keymappings.KeyMappingRegistry; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.event.v0.ClientTickEventRegistry; import net.pitan76.mcpitanlib.api.network.ClientNetworking; import net.pitan76.mcpitanlib.api.network.PacketByteUtil; -import net.minecraft.client.option.KeyBinding; -import net.minecraft.util.Identifier; public class KeybindingRegistry { public static void register(KeyBinding keyBinding) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java index 1e0c4ead9..c1544b0a4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java @@ -3,8 +3,6 @@ import com.mojang.brigadier.builder.ArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import dev.architectury.event.events.common.CommandRegistrationEvent; -import net.pitan76.mcpitanlib.api.command.argument.*; -import net.pitan76.mcpitanlib.api.event.*; import net.minecraft.command.CommandRegistryAccess; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntitiesCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntitiesCommand.java index 36c46a827..4157c76d3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntitiesCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntitiesCommand.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.command.argument; -import net.pitan76.mcpitanlib.api.event.EntitiesCommandEvent; -import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.event.EntitiesCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; public abstract class EntitiesCommand extends RequiredCommand { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntityCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntityCommand.java index caf51cac1..cf0c76ec6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntityCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/EntityCommand.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.command.argument; -import net.pitan76.mcpitanlib.api.event.EntityCommandEvent; -import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.event.EntityCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; public abstract class EntityCommand extends RequiredCommand { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java index 664629759..d32febff3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.api.command.argument; +import net.minecraft.command.argument.ItemStackArgumentType; +import net.minecraft.entity.Entity; import net.pitan76.mcpitanlib.api.command.CommandRegistry; import net.pitan76.mcpitanlib.api.event.ItemCommandEvent; import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; -import net.minecraft.command.argument.ItemStackArgumentType; -import net.minecraft.entity.Entity; public abstract class ItemCommand extends RequiredCommand { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayerCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayerCommand.java index 90995ac8e..3a674b908 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayerCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayerCommand.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.command.argument; -import net.pitan76.mcpitanlib.api.event.PlayerCommandEvent; -import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.event.PlayerCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; public abstract class PlayerCommand extends RequiredCommand { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayersCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayersCommand.java index d49a91420..195d81d3b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayersCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/PlayersCommand.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.command.argument; -import net.pitan76.mcpitanlib.api.event.PlayersCommandEvent; -import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.event.PlayersCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; public abstract class PlayersCommand extends RequiredCommand { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java index 16a41b540..78f745eb5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.entity; -import net.pitan76.mcpitanlib.api.nbt.NbtTag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.nbt.NbtTag; public class ExtendEntity extends Entity { public ExtendEntity(EntityType type, World world) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 76e5d1910..7f8e101be 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -1,9 +1,6 @@ package net.pitan76.mcpitanlib.api.entity; import dev.architectury.registry.menu.ExtendedMenuProvider; -import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; -import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; -import net.pitan76.mcpitanlib.core.player.ItemCooldown; import net.minecraft.block.BlockState; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.ItemCooldownManager; @@ -26,6 +23,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; +import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; +import net.pitan76.mcpitanlib.core.player.ItemCooldown; import java.util.OptionalInt; import java.util.UUID; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntitiesCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntitiesCommandEvent.java index a54b1d57a..38110c090 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntitiesCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntitiesCommandEvent.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.pitan76.mcpitanlib.api.command.argument.EntitiesCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.command.argument.EntitiesCommand; public class EntitiesCommandEvent extends RequiredCommandEvent { public Entity getValue() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntityCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntityCommandEvent.java index 150e0fd4e..ea90b106e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntityCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/EntityCommandEvent.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.pitan76.mcpitanlib.api.command.argument.EntityCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.command.argument.EntityCommand; public class EntityCommandEvent extends RequiredCommandEvent { public Entity getValue() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ItemCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ItemCommandEvent.java index 1490faf79..1888aa422 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ItemCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ItemCommandEvent.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.api.event; -import net.pitan76.mcpitanlib.api.command.argument.ItemCommand; import net.minecraft.command.argument.ItemStackArgumentType; import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.command.argument.ItemCommand; public class ItemCommandEvent extends RequiredCommandEvent { public Item getValue() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayerCommandEvent.java index a755544ef..7fad3ba41 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayerCommandEvent.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.pitan76.mcpitanlib.api.command.argument.PlayerCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.command.argument.PlayerCommand; public class PlayerCommandEvent extends RequiredCommandEvent { public Entity getValue() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayersCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayersCommandEvent.java index 97c918c01..aa845fd17 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayersCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/PlayersCommandEvent.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.pitan76.mcpitanlib.api.command.argument.PlayersCommand; import net.minecraft.command.argument.EntityArgumentType; import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.command.argument.PlayersCommand; public class PlayersCommandEvent extends RequiredCommandEvent { public Entity getValue() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java index fdd15f673..23aa41090 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java @@ -4,12 +4,12 @@ import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.StringRange; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; public class ServerCommandEvent extends CommandEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java index 2291afa6f..25e353458 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.entity.Player; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class BlockBreakEvent extends BaseEvent { public World world; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java index 8e39771e9..940958701 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class BlockPlacedEvent extends BaseEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java index d9f45f4d3..bd14b7e6e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class BlockScheduledTickEvent extends BaseEvent { public BlockState state; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java index 31a5e3e3e..6f20ad6a1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java @@ -1,7 +1,5 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.entity.Player; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; @@ -11,6 +9,8 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class BlockUseEvent extends BaseEvent { public BlockState state; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java index db43da8fc..8489bdacd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class OutlineShapeEvent extends BaseEvent { public BlockState state; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java index aeb7c404f..603fb0d27 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.entity.Player; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class ScreenHandlerCreateEvent extends BaseEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java index bdabae527..4cbe8096d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.inventory.Inventory; import net.minecraft.util.ItemScatterer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class StateReplacedEvent extends BaseEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/TileCreateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/TileCreateEvent.java index 2378118c5..ff0ad3ed9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/TileCreateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/TileCreateEvent.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.event.block; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class TileCreateEvent extends BaseEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java index 215179dcf..cd06bce81 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.api.event.item; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemFinishUsingEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemFinishUsingEvent.java index 9479c4b6d..27f74b53b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemFinishUsingEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemFinishUsingEvent.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.event.item; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class ItemFinishUsingEvent extends BaseEvent { public ItemStack stack; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index d8049cb1b..7405fede5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.event.item; -import net.pitan76.mcpitanlib.api.entity.Player; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class ItemUseEvent extends BaseEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java index 7877faacb..2b124cef1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java @@ -1,7 +1,5 @@ package net.pitan76.mcpitanlib.api.event.item; -import net.pitan76.mcpitanlib.api.entity.Player; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; @@ -10,7 +8,8 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; - +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; import org.jetbrains.annotations.Nullable; public class ItemUseOnBlockEvent extends BaseEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java index bea21498a..c3dd5aa68 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.event.item; -import net.pitan76.mcpitanlib.api.entity.Player; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; public class ItemUseOnEntityEvent extends BaseEvent { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java index 5165e954e..9611269b6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java @@ -2,12 +2,12 @@ import dev.architectury.event.EventResult; import dev.architectury.event.events.common.PlayerEvent; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Hand; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; import org.jetbrains.annotations.Nullable; public class AttackEntityEventRegistry { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/EventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/EventRegistry.java index 6bdf7f1f3..17b2fa79d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/EventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/EventRegistry.java @@ -1,13 +1,13 @@ package net.pitan76.mcpitanlib.api.event.v0; import dev.architectury.event.events.common.LifecycleEvent; -import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; -import net.pitan76.mcpitanlib.api.event.v0.event.ServerConnectionEvent; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; +import net.pitan76.mcpitanlib.api.event.v0.event.ServerConnectionEvent; public class EventRegistry { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ItemStackActionEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ItemStackActionEvent.java index c5fd45409..f8872ead7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ItemStackActionEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ItemStackActionEvent.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.event.v0.event; -import net.pitan76.mcpitanlib.api.event.v0.EventRegistry; import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.event.v0.EventRegistry; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index e7d201c32..f6d0c7f02 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -2,12 +2,12 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; -import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; +import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; import java.util.Map; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java index f24673b74..347a6cd8f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.api.recipe; -import net.pitan76.mcpitanlib.api.util.RecipeUtil; import net.minecraft.recipe.*; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.RecipeUtil; import org.jetbrains.annotations.Nullable; public class CompatibleRecipeEntry { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index e7f5ef2b4..4ebbf1eb7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -1,17 +1,6 @@ package net.pitan76.mcpitanlib.api.registry; import dev.architectury.registry.registries.RegistrySupplier; -import net.pitan76.mcpitanlib.MCPitanLib; -import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; -import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; -import net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerTypeBuilder; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.CreativeTabManager; -import net.pitan76.mcpitanlib.api.util.BlockUtil; -import net.pitan76.mcpitanlib.api.util.ItemUtil; -import net.pitan76.mcpitanlib.core.registry.FuelRegistry; -import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; -import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.entity.EntityType; @@ -23,7 +12,18 @@ import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.MCPitanLib; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; +import net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerTypeBuilder; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.CreativeTabManager; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.ItemUtil; +import net.pitan76.mcpitanlib.core.registry.FuelRegistry; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; import java.util.function.Supplier; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java index 945693475..d0b055143 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; -import net.pitan76.mcpitanlib.api.tag.MineableToolTags; -import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.tag.MineableToolTags; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.v1.BlockUtilV1; import net.pitan76.mcpitanlib.api.util.v2.BlockUtilV2; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java index 89dd92c41..18fda59b1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java @@ -1,11 +1,10 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; -import net.pitan76.mcpitanlib.api.util.RecipeUtil; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; public class CompatibleRecipeEntryUtil { public static CompatibleRecipeEntry createShapelessRecipe(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java index 28077ba89..4947a0b3d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; +import net.pitan76.mcpitanlib.api.entity.Player; public class DamageSourceUtil { public static DamageSource thrownProjectile(Entity projectile, Entity attacker, Entity source) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 9e10354f9..1be594da5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; public class EntityUtil { public static World getWorld(Entity entity) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java index 0b1487723..9afdc655a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; -import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; import net.minecraft.sound.SoundEvent; +import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; +import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; public class EquipMaterialUtil { public static ToolMaterial createToolMaterial(int durability, float miningSpeedMultiplier, float attackDamage, int miningLevel, int enchantability, Ingredient repairIngredient) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java index ca7be1810..8fb88bdf0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.tag.TagKey; import net.minecraft.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.v1.ItemUtilV1; import net.pitan76.mcpitanlib.api.util.v2.ItemUtilV2; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerUtil.java index 017cc0f68..90f67e846 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerUtil.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ResourceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ResourceUtil.java index 8b7740a0e..cfb5df1d5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ResourceUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ResourceUtil.java @@ -6,7 +6,6 @@ import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; import java.util.Map; public class ResourceUtil { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java index ffb803902..7018af034 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.timer.MinecraftServerTimerAccess; -import net.pitan76.mcpitanlib.api.timer.ServerWorldTimerAccess; import net.minecraft.server.MinecraftServer; import net.minecraft.server.world.ServerWorld; +import net.pitan76.mcpitanlib.api.timer.MinecraftServerTimerAccess; +import net.pitan76.mcpitanlib.api.timer.ServerWorldTimerAccess; import java.util.function.Supplier; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index f3bcbceb4..7fe15c9ba 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.util; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.ExperienceOrbEntity; @@ -20,6 +19,7 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; import org.jetbrains.annotations.Nullable; import java.util.Objects; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java index dc7f4469a..e9a7aecc2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.util.client; -import net.pitan76.mcpitanlib.api.util.MathUtil; import net.minecraft.client.util.math.MatrixStack; +import net.pitan76.mcpitanlib.api.util.MathUtil; -import static net.pitan76.mcpitanlib.api.util.MathUtil.*; +import static net.pitan76.mcpitanlib.api.util.MathUtil.getRotationDegrees; public class MatrixStackUtil { public static void multiply(MatrixStack matrixStack, MathUtil.RotationAxisType type, float deg) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index bf70b0932..9ea75d4b0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -1,9 +1,5 @@ package net.pitan76.mcpitanlib.api.util.client; -import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; -import net.pitan76.mcpitanlib.api.client.gui.widget.RedrawableTexturedButtonWidget; -import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; @@ -16,6 +12,10 @@ import net.minecraft.text.OrderedText; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.gui.widget.RedrawableTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/BlockEventGenerator.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/BlockEventGenerator.java index f6290a120..9b6d83c3d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/BlockEventGenerator.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/BlockEventGenerator.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.util.event; +import net.minecraft.block.Block; import net.pitan76.mcpitanlib.api.event.block.BlockBreakEvent; import net.pitan76.mcpitanlib.api.event.block.BlockPlacedEvent; import net.pitan76.mcpitanlib.api.event.block.StateReplacedEvent; -import net.minecraft.block.Block; public class BlockEventGenerator { public static void onPlaced(Block block, BlockPlacedEvent e) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java index 73a18843c..caf91b12e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.api.util.event; -import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.TypedActionResult; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; public class ItemEventGenerator { public static TypedActionResult onRightClick(Item item, ItemUseEvent e) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/world/ExtendWorld.java b/common/src/main/java/net/pitan76/mcpitanlib/api/world/ExtendWorld.java index cabc6499c..865a2694f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/world/ExtendWorld.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/world/ExtendWorld.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.api.world; -import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.WorldUtil; public class ExtendWorld { public World world; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java index 2987a56aa..4aac66ae5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.core.player; -import net.pitan76.mcpitanlib.api.entity.Player; import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.entity.Player; public class ItemCooldown { public final Player player; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java index e4739840c..7f403b183 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java @@ -3,7 +3,8 @@ import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItem; -import static net.pitan76.mcpitanlib.MCPitanLib.*; +import static net.pitan76.mcpitanlib.MCPitanLib.id; +import static net.pitan76.mcpitanlib.MCPitanLib.registry; /** * A tool for debugging. diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 2d61563f5..8d31e566c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -1,8 +1,5 @@ package net.pitan76.mcpitanlib.mixin; -import net.pitan76.mcpitanlib.api.event.item.*; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider.Options; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -14,6 +11,9 @@ import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider.Options; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java index 6bb40e4be..e659f96fb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.mixin; -import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; +import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java index 47beee8aa..b62d23a71 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.mixin; +import net.minecraft.server.MinecraftServer; import net.pitan76.mcpitanlib.api.timer.MinecraftServerTimerAccess; import net.pitan76.mcpitanlib.api.timer.TimerItem; -import net.minecraft.server.MinecraftServer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index f16a664e0..c9a23b8a3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -2,14 +2,14 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; -import net.pitan76.mcpitanlib.api.event.v1.RecipeManagerRegistry; -import net.pitan76.mcpitanlib.api.event.v0.event.RecipeManagerEvent; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; +import net.pitan76.mcpitanlib.api.event.v0.event.RecipeManagerEvent; +import net.pitan76.mcpitanlib.api.event.v1.RecipeManagerRegistry; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java index 001458785..7c8b7a21d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.mixin; +import net.minecraft.server.world.ServerWorld; import net.pitan76.mcpitanlib.api.timer.ServerWorldTimerAccess; import net.pitan76.mcpitanlib.api.timer.TimerItem; -import net.minecraft.server.world.ServerWorld; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java index fe20eaf0a..568fa9c5d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleCommand.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.test; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.item.ItemStack; import net.pitan76.mcpitanlib.api.command.CommandSettings; import net.pitan76.mcpitanlib.api.command.LiteralCommand; import net.pitan76.mcpitanlib.api.command.argument.IntegerCommand; import net.pitan76.mcpitanlib.api.event.IntegerCommandEvent; import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; -import net.minecraft.item.ItemStack; public class ExampleCommand extends LiteralCommand { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java index b158a46b5..f2a5ef3e1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java @@ -1,14 +1,14 @@ package net.pitan76.mcpitanlib.test; -import net.pitan76.mcpitanlib.api.block.ExtendBlock; -import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; -import net.pitan76.mcpitanlib.api.util.TextUtil; import net.minecraft.block.BlockState; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.util.ActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; +import net.pitan76.mcpitanlib.api.util.TextUtil; public class ExampleGuiBlock extends ExtendBlock { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java index 46e36b176..12650ad2c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java @@ -1,13 +1,13 @@ package net.pitan76.mcpitanlib.test; -import net.pitan76.mcpitanlib.api.util.TextUtil; -import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.minecraft.item.ItemStack; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.util.TypedActionResult; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.util.TextUtil; public class ExampleGuiItem extends ExtendItem { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 23590bd46..1d6d72109 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -1,5 +1,9 @@ package net.pitan76.mcpitanlib.test; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.block.ExtendBlock; @@ -8,10 +12,6 @@ import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.DefaultItemGroups; import net.pitan76.mcpitanlib.api.item.ExtendItem; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import net.pitan76.mcpitanlib.api.util.ItemUtil; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java index b9164f732..45e7a0295 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java @@ -1,14 +1,14 @@ package net.pitan76.mcpitanlib.test; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.client.SimpleHandledScreen; import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; public class ExampleScreen extends SimpleHandledScreen { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java index 6f7ad6a67..db6b6e38a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.test; -import net.pitan76.mcpitanlib.api.entity.Player; -import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandler; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandler; public class ExampleScreenHandler extends SimpleScreenHandler { diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java index 42ac02f7c..939cd37a0 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/MCPitanLibFabric.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.fabric; -import net.pitan76.mcpitanlib.MCPitanLib; import net.fabricmc.api.ModInitializer; +import net.pitan76.mcpitanlib.MCPitanLib; public class MCPitanLibFabric implements ModInitializer { @Override diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java index 8c3380f7d..f16705691 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java @@ -1,10 +1,10 @@ package net.pitan76.mcpitanlib.fabric.mixin; -import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; From 1743c30b2bc1cd3d3a75d343ae718b43d8de825f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 15 Feb 2024 19:47:54 +0900 Subject: [PATCH 243/622] fix mixin --- build.gradle | 2 +- .../main/java/net/pitan76/mcpitanlib}/mixin/RecipeMixin.java | 2 +- common/src/main/resources/mcpitanlib-common.mixins.json | 3 ++- fabric/src/main/resources/fabric.mod.json | 2 +- fabric/src/main/resources/mcpitanlib.mixins.json | 2 +- info.properties | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) rename {fabric/src/main/java/net/pitan76/mcpitanlib/fabric => common/src/main/java/net/pitan76/mcpitanlib}/mixin/RecipeMixin.java (96%) diff --git a/build.gradle b/build.gradle index badc7e927..82a3e70ac 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false } architectury { diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java similarity index 96% rename from fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java index f16705691..8c06e793a 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.fabric.mixin; +package net.pitan76.mcpitanlib.mixin; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; diff --git a/common/src/main/resources/mcpitanlib-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json index 398165fe8..d8b00665a 100644 --- a/common/src/main/resources/mcpitanlib-common.mixins.json +++ b/common/src/main/resources/mcpitanlib-common.mixins.json @@ -9,7 +9,8 @@ "ItemUsageContextMixin", "MinecraftServerTimer", "RecipeManagerMixin", - "ServerWorldTimer" + "ServerWorldTimer", + "RecipeMixin" ], "client": [ ], diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 42bf27ed3..4b306ac98 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ "mcpitanlib.mixins.json", "mcpitanlib-common.mixins.json" ], - "accessWidener" : "mcpitanlib.accesswidener", + "accessWidener": "mcpitanlib.accesswidener", "depends": { "minecraft": ">1.20.2", "fabricloader": "*", diff --git a/fabric/src/main/resources/mcpitanlib.mixins.json b/fabric/src/main/resources/mcpitanlib.mixins.json index 0a36c5829..d4b92ebd9 100644 --- a/fabric/src/main/resources/mcpitanlib.mixins.json +++ b/fabric/src/main/resources/mcpitanlib.mixins.json @@ -4,7 +4,7 @@ "package": "net.pitan76.mcpitanlib.fabric.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ - "RecipeMixin" + ], "client": [ ], diff --git a/info.properties b/info.properties index 68982b6c2..2b6f072f2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.0 +mod_version=2.0.1 maven_group=net.pitan76 \ No newline at end of file From 2484db8b588cf87ad10007ee98cd5124364b09cd Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 01:14:18 +0900 Subject: [PATCH 244/622] readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7bf1c1ed6..f075c2493 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ MCPitanLibはライブラリです。 1つのjarで複数のMCバージョンを - [Architectury API (CurseForge)](https://www.curseforge.com/minecraft/mc-mods/architectury-api) ### ダウンロード -[CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) -[Modrinth](https://modrinth.com/mod/mcpitanlibarch) +- [CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) +- [Modrinth](https://modrinth.com/mod/mcpitanlibarch) ### 使い方 `build.gradle`に以下のように記述してください。 @@ -38,6 +38,7 @@ dependencies { `gradle.properties`に以下のように記述してください。 ```properties +# Example: mcpitanlib_version=+1.18.2:2.0.1 mcpitanlib_version=x.x.x ``` @@ -58,8 +59,8 @@ I am creating it for my own use, so I don't expect others to use it much.
- [Architectury API (CurseForge)](https://www.curseforge.com/minecraft/mc-mods/architectury-api) ### Download -[CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) -[Modrinth](https://modrinth.com/mod/mcpitanlibarch) +- [CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) +- [Modrinth](https://modrinth.com/mod/mcpitanlibarch) ### How to use Write as follows in `build.gradle`. @@ -84,7 +85,7 @@ dependencies { Write as follows in `gradle.properties`. ```properties -# Example: mcpitanlib_version=+1.18.2:1.9.5 +# Example: mcpitanlib_version=+1.18.2:2.0.1 mcpitanlib_version=+x.x.x:x.x.x ``` From 6a85956c73fe5113d4607234824de93044dee55c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:10:23 +0900 Subject: [PATCH 245/622] add APIs --- .../mcpitanlib/api/block/ExtendBlock.java | 52 +++++++ .../api/block/ExtendBlockProvider.java | 107 ++++++++++++++ .../api/event/block/CollisionShapeEvent.java | 13 ++ .../api/event/v1/BlockEventRegistry.java | 22 +++ .../api/event/v1/listener/BlockBreakTask.java | 9 ++ .../event/v1/listener/BlockPlacedTask.java | 8 + .../mcpitanlib/api/item/ExtendBlockItem.java | 138 ++++++++++++++++++ .../mcpitanlib/api/item/ExtendItem.java | 35 ++++- .../api/item/ExtendItemProvider.java | 4 +- .../mcpitanlib/mixin/AbstractBlockMixin.java | 95 ++++++++++++ .../pitan76/mcpitanlib/mixin/BlockMixin.java | 60 ++++++++ .../pitan76/mcpitanlib/mixin/ItemMixin.java | 9 +- .../mcpitanlib/mixin/RecipeManagerMixin.java | 1 + .../resources/mcpitanlib-common.mixins.json | 6 +- info.properties | 2 +- 15 files changed, 545 insertions(+), 16 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CollisionShapeEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockBreakTask.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockPlacedTask.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 1c6eeec4c..0944c1898 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -34,6 +34,26 @@ public ExtendBlock(CompatibleBlockSettings settings) { super(settings.build()); } + /** + * get collision voxel shape + * @param event CollisionShapeEvent + * @return VoxelShape + */ + public VoxelShape getCollisionShape(CollisionShapeEvent event) { + return super.getCollisionShape(event.state, event.world, event.pos, event.context); + } + + @Deprecated + @Override + public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return getCollisionShape(new CollisionShapeEvent(state, world, pos, context)); + } + + /** + * get outline voxel shape + * @param event OutlineShapeEvent + * @return VoxelShape + */ public VoxelShape getOutlineShape(OutlineShapeEvent event) { return super.getOutlineShape(event.state, event.world, event.pos, event.context); } @@ -44,6 +64,10 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po return getOutlineShape(new OutlineShapeEvent(state, world, pos, context)); } + /** + * block scheduled tick event + * @param event BlockScheduledTickEvent + */ public void scheduledTick(BlockScheduledTickEvent event) { super.scheduledTick(event.state, event.world, event.pos, event.random); } @@ -69,6 +93,7 @@ public ActionResult onRightClick(BlockUseEvent event) { return super.onUse(event.state, event.world, event.pos, event.player.getPlayerEntity(), event.hand, event.hit); } + @Deprecated @Nullable @Override public NamedScreenHandlerFactory createScreenHandlerFactory(BlockState state, World world, BlockPos pos) { @@ -77,11 +102,20 @@ public NamedScreenHandlerFactory createScreenHandlerFactory(BlockState state, Wo ); } + /** + * screen handler create event + * @param event ScreenHandlerCreateEvent + * @return ScreenHandler + */ @Nullable public ScreenHandler createScreenHandler(ScreenHandlerCreateEvent event) { return null; } + /** + * get screen title + * @return Text + */ @Nullable public Text getScreenTitle() { return TextUtil.literal(""); @@ -93,6 +127,10 @@ public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable Livi onPlaced(new BlockPlacedEvent(world, pos, state, placer, itemStack)); } + /** + * block placed event + * @param event BlockPlacedEvent + */ public void onPlaced(BlockPlacedEvent event) { super.onPlaced(event.world, event.pos, event.state, event.placer, event.stack); } @@ -103,6 +141,11 @@ public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEnt return onBreak(new BlockBreakEvent(world, pos, state, player)).state; } + /** + * block break event + * @param event BlockBreakEvent + * @return BlockBreakResult + */ public BlockBreakResult onBreak(BlockBreakEvent event) { BlockState state = super.onBreak(event.world, event.pos, event.state, event.getPlayerEntity()); return new BlockBreakResult(state); @@ -114,6 +157,11 @@ public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) { return getPickStack(new PickStackEvent(world, pos, state)); } + /** + * block pick stack event + * @param event PickStackEvent + * @return ItemStack + */ public ItemStack getPickStack(PickStackEvent event) { return super.getPickStack(event.worldView, event.pos, event.state); } @@ -124,6 +172,10 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt onStateReplaced(new StateReplacedEvent(state, world, pos, newState, moved)); } + /** + * block state replaced event + * @param event StateReplacedEvent + */ public void onStateReplaced(StateReplacedEvent event) { super.onStateReplaced(event.state, event.world, event.pos, event.newState, event.moved); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java new file mode 100644 index 000000000..1ae252675 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java @@ -0,0 +1,107 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.shape.VoxelShape; +import net.pitan76.mcpitanlib.api.event.block.*; +import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; +import net.pitan76.mcpitanlib.api.util.TextUtil; + +public interface ExtendBlockProvider { + + /** + * get collision voxel shape + * @param event CollisionShapeEvent + * @param options Options + * @return VoxelShape + */ + default VoxelShape getCollisionShape(CollisionShapeEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * get outline voxel shape + * @param event OutlineShapeEvent + * @param options Options + * @return VoxelShape + */ + default VoxelShape getOutlineShape(OutlineShapeEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * block scheduled tick event + * @param event BlockScheduledTickEvent + * @param options Options + */ + default void scheduledTick(BlockScheduledTickEvent event, Options options) { + options.cancel = false; + } + + /** + * block right click event + * @param event BlockUseEvent + * @param options Options + * @return ActionResult + */ + default ActionResult onRightClick(BlockUseEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * screen handler create event + * @param event ScreenHandlerCreateEvent + * @param options Options + * @return ScreenHandler + */ + default ScreenHandler createScreenHandler(ScreenHandlerCreateEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * get screen title + * @return Text + */ + default Text getScreenTitle() { + return TextUtil.literal(""); + } + + /** + * block placed event + * @param event BlockPlacedEvent + * @param options Options + */ + default void onPlaced(BlockPlacedEvent event, Options options) { + options.cancel = false; + } + + /** + * block break event + * @param event BlockBreakEvent + * @param options Options + * @return BlockBreakResult + */ + default BlockBreakResult onBreak(BlockBreakEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * block state replaced event + * @param event StateReplacedEvent + * @param options Options + */ + default void onStateReplaced(StateReplacedEvent event, Options options) { + options.cancel = false; + } + + public static class Options { + public boolean cancel = true; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CollisionShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CollisionShapeEvent.java new file mode 100644 index 000000000..43fab8bc5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CollisionShapeEvent.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; + +public class CollisionShapeEvent extends OutlineShapeEvent { + + public CollisionShapeEvent(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + super(state, world, pos, context); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java new file mode 100644 index 000000000..6b6465b87 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java @@ -0,0 +1,22 @@ +package net.pitan76.mcpitanlib.api.event.v1; + +import net.pitan76.mcpitanlib.api.event.v1.listener.BlockBreakTask; +import net.pitan76.mcpitanlib.api.event.v1.listener.BlockPlacedTask; + +import java.util.ArrayList; +import java.util.List; + +public class BlockEventRegistry { + public static List onPlacedListeners = new ArrayList<>(); + public static List onBreakListeners = new ArrayList<>(); + + public static void register(BlockPlacedTask listener) { + if (onPlacedListeners.contains(listener)) return; + onPlacedListeners.add(listener); + } + + public static void register(BlockBreakTask listener) { + if (onBreakListeners.contains(listener)) return; + onBreakListeners.add(listener); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockBreakTask.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockBreakTask.java new file mode 100644 index 000000000..ae0300d00 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockBreakTask.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.api.event.v1.listener; + +import net.pitan76.mcpitanlib.api.event.block.BlockBreakEvent; +import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; + +@FunctionalInterface +public interface BlockBreakTask { + BlockBreakResult onBreak(BlockBreakEvent event); +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockPlacedTask.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockPlacedTask.java new file mode 100644 index 000000000..eca682318 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/listener/BlockPlacedTask.java @@ -0,0 +1,8 @@ +package net.pitan76.mcpitanlib.api.event.v1.listener; + +import net.pitan76.mcpitanlib.api.event.block.BlockPlacedEvent; + +@FunctionalInterface +public interface BlockPlacedTask { + void onPlaced(BlockPlacedEvent event); +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java new file mode 100644 index 000000000..842e964ab --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java @@ -0,0 +1,138 @@ +package net.pitan76.mcpitanlib.api.item; + +import net.minecraft.block.Block; +import net.minecraft.client.item.TooltipContext; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.core.Dummy; +import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class ExtendBlockItem extends BlockItem { + public ExtendBlockItem(Block block, Settings settings) { + super(block, settings); + } + + public ExtendBlockItem(Block block, CompatibleItemSettings settings) { + super(block, settings.build()); + } + + + + // ExtendItem + @Deprecated + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + return onRightClick(new ItemUseEvent(world, user, hand)); + } + + @Deprecated + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; + return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); + } + + @Deprecated + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + return onFinishUsing(new ItemFinishUsingEvent(stack, world, user)); + } + + @Deprecated + @Override + public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) { + return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)); + } + + @Deprecated + @Override + public boolean hasRecipeRemainder() { + return hasRecipeRemainder(new Dummy()); + } + + @Deprecated + @Override + public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + appendTooltip(new ItemAppendTooltipEvent(stack, world, tooltip, context)); + } + + @Deprecated + @Override + public void onCraft(ItemStack stack, World world) { + onCraft(new CraftEvent(stack, world)); + } + + /** + * item right click event + * + * @param event ItemUseEvent + * @return ActionResultType + */ + public TypedActionResult onRightClick(ItemUseEvent event) { + return super.use(event.world, event.user.getPlayerEntity(), event.hand); + } + + /** + * item right click event on block + * @param event ItemUseOnBlockEvent + * @return ActionResultType + */ + public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { + return super.useOnBlock(event.toIUC()); + } + + /** + * item finish using event + * @param event ItemFinishUsingEvent + * @return ItemStack + */ + public ItemStack onFinishUsing(ItemFinishUsingEvent event) { + return super.finishUsing(event.stack, event.world, event.user); + } + + /** + * item right click event on entity + * @param event ItemUseOnEntityEvent + * @return ActionResultType + */ + public ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { + return super.useOnEntity(event.stack, event.user.getEntity(), event.entity, event.hand); + } + + /** + * check if item has recipe remainder + * @param dummy Dummy + * @return boolean + */ + public boolean hasRecipeRemainder(Dummy dummy) { + return super.hasRecipeRemainder(); + } + + /** + * append tooltip to item + * @param event ItemAppendTooltipEvent + */ + public void appendTooltip(ItemAppendTooltipEvent event) { + super.appendTooltip(event.stack, event.world, event.tooltip, event.context); + } + + /** + * on craft event + * @param event CraftEvent + */ + public void onCraft(CraftEvent event) { + super.onCraft(event.stack, event.world); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index b8ca76e0f..3b99b5fb1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -64,6 +64,12 @@ public void appendTooltip(ItemStack stack, @Nullable World world, List too appendTooltip(new ItemAppendTooltipEvent(stack, world, tooltip, context)); } + @Deprecated + @Override + public void onCraft(ItemStack stack, World world) { + onCraft(new CraftEvent(stack, world)); + } + /** * item right click event * @@ -83,28 +89,45 @@ public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { return super.useOnBlock(event.toIUC()); } + /** + * item finish using event + * @param event ItemFinishUsingEvent + * @return ItemStack + */ public ItemStack onFinishUsing(ItemFinishUsingEvent event) { return super.finishUsing(event.stack, event.world, event.user); } + /** + * item right click event on entity + * @param event ItemUseOnEntityEvent + * @return ActionResultType + */ public ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { return super.useOnEntity(event.stack, event.user.getEntity(), event.entity, event.hand); } + /** + * check if item has recipe remainder + * @param dummy Dummy + * @return boolean + */ public boolean hasRecipeRemainder(Dummy dummy) { return super.hasRecipeRemainder(); } + /** + * append tooltip to item + * @param event ItemAppendTooltipEvent + */ public void appendTooltip(ItemAppendTooltipEvent event) { super.appendTooltip(event.stack, event.world, event.tooltip, event.context); } - @Deprecated - @Override - public void onCraft(ItemStack stack, World world) { - onCraft(new CraftEvent(stack, world)); - } - + /** + * on craft event + * @param event CraftEvent + */ public void onCraft(CraftEvent event) { super.onCraft(event.stack, event.world); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java index 6b9512e4d..e8f6a3366 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java @@ -50,7 +50,7 @@ default ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event, Options op /** * item has recipe remainder - * @param dummy Dummy + * @param options Options * @return boolean */ default boolean hasRecipeRemainder(Options options) { @@ -63,7 +63,7 @@ default boolean hasRecipeRemainder(Options options) { * @param event ItemAppendTooltipEvent */ default void appendTooltip(ItemAppendTooltipEvent event, Options options) { - options.cancel = true; + options.cancel = false; } public static class Options { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java new file mode 100644 index 000000000..d499ae280 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -0,0 +1,95 @@ +package net.pitan76.mcpitanlib.mixin; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.SimpleNamedScreenHandlerFactory; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider; +import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider.Options; +import net.pitan76.mcpitanlib.api.event.block.*; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(AbstractBlock.class) +public class AbstractBlockMixin { + @Inject(method = "getCollisionShape", at = @At("HEAD"), cancellable = true) + private void inject_getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + VoxelShape returnValue = provider.getCollisionShape(new CollisionShapeEvent(state, world, pos, context), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true) + private void inject_getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + VoxelShape returnValue = provider.getOutlineShape(new OutlineShapeEvent(state, world, pos, context), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "scheduledTick", at = @At("HEAD"), cancellable = true) + private void inject_scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + provider.scheduledTick(new BlockScheduledTickEvent(state, world, pos, random), options); + if (options.cancel) + ci.cancel(); + } + } + + @Inject(method = "onUse", at = @At("HEAD"), cancellable = true) + private void inject_onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable cir) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + ActionResult returnValue = provider.onRightClick(new BlockUseEvent(state, world, pos, player, hand, hit), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "createScreenHandlerFactory", at = @At("HEAD"), cancellable = true) + private void inject_createScreenHandlerFactory(BlockState state, World world, BlockPos pos, CallbackInfoReturnable cir) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + NamedScreenHandlerFactory returnValue = new SimpleNamedScreenHandlerFactory((syncId, inventory, player) -> + provider.createScreenHandler(new ScreenHandlerCreateEvent(state, world, pos, syncId, inventory, player), options), provider.getScreenTitle()); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "onStateReplaced", at = @At("HEAD"), cancellable = true) + private void inject_onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved, CallbackInfo ci) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + provider.onStateReplaced(new StateReplacedEvent(state, world, pos, newState, moved), options); + if (options.cancel) + ci.cancel(); + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java new file mode 100644 index 000000000..404bdc047 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java @@ -0,0 +1,60 @@ +package net.pitan76.mcpitanlib.mixin; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider; +import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider.Options; +import net.pitan76.mcpitanlib.api.event.block.BlockBreakEvent; +import net.pitan76.mcpitanlib.api.event.block.BlockPlacedEvent; +import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; +import net.pitan76.mcpitanlib.api.event.v1.BlockEventRegistry; +import net.pitan76.mcpitanlib.api.event.v1.listener.BlockBreakTask; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Block.class) +public class BlockMixin { + + @Inject(method = "onPlaced", at = @At("HEAD"), cancellable = true) + private void inject_onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack, CallbackInfo ci) { + if (!BlockEventRegistry.onPlacedListeners.isEmpty()) { + BlockEventRegistry.onPlacedListeners.forEach(l -> l.onPlaced(new BlockPlacedEvent(world, pos, state, placer, stack))); + } + + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + provider.onPlaced(new BlockPlacedEvent(world, pos, state, placer, stack), options); + if (options.cancel) + ci.cancel(); + } + } + + @Inject(method = "onBreak", at = @At("HEAD"), cancellable = true) + private void inject_onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable cir) { + if (!BlockEventRegistry.onBreakListeners.isEmpty()) { + BlockState newState = state; + for (BlockBreakTask l : BlockEventRegistry.onBreakListeners) { + newState = l.onBreak(new BlockBreakEvent(world, pos, state, player)).getState(); + } + if (newState != state) + cir.setReturnValue(newState); + } + + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + BlockBreakResult returnValue = provider.onBreak(new BlockBreakEvent(world, pos, state, player), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue.getState()); + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 8d31e566c..9204af80c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -30,7 +30,7 @@ private void use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnab ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); TypedActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options); - if (options.cancel) + if (options.cancel && returnValue != null) cir.setReturnValue(returnValue); } } @@ -42,7 +42,7 @@ private void useOnBlock(ItemUsageContext context, CallbackInfoReturnable map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, Map, ImmutableMap.Builder>> map2) { + if (RecipeManagerRegistry.managers.isEmpty()) return; RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, map2))); } diff --git a/common/src/main/resources/mcpitanlib-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json index d8b00665a..c255e797f 100644 --- a/common/src/main/resources/mcpitanlib-common.mixins.json +++ b/common/src/main/resources/mcpitanlib-common.mixins.json @@ -4,13 +4,15 @@ "package": "net.pitan76.mcpitanlib.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ + "AbstractBlockMixin", + "BlockMixin", "ItemMixin", "ItemStackMixin", "ItemUsageContextMixin", "MinecraftServerTimer", "RecipeManagerMixin", - "ServerWorldTimer", - "RecipeMixin" + "RecipeMixin", + "ServerWorldTimer" ], "client": [ ], diff --git a/info.properties b/info.properties index 2b6f072f2..7bd2a3f7f 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.1 +mod_version=2.0.2 maven_group=net.pitan76 \ No newline at end of file From 96953e31234a176a0efe18e8b25fa6278cc0e651 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:10:40 +0900 Subject: [PATCH 246/622] gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 82a3e70ac..fbbbcfed2 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ allprojects { // for more information about repositories. } - tasks.withType(JavaCompile) { + tasks.withType(JavaCompile).configureEach { options.encoding = "UTF-8" options.release = 17 } From 1874c5e373565010aac49fef941c49ab6ddd4cbc Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:33:34 +0900 Subject: [PATCH 247/622] gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4da54cc5a..ed61df3ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ architectury_version=11.0.12 # https://fabricmc.net/develop/ fabric_loader_version=0.15.1 -yarn_mappings=1.20.4+build.1 +yarn_mappings=1.20.4+build.3 fabric_api_version=0.91.2+1.20.4 # https://files.minecraftforge.net/net/minecraftforge/forge/ From 520ae7c84586528a2041e0ed56a2663e546457c4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:36:47 +0900 Subject: [PATCH 248/622] Add new Event APIs --- .../api/event/v1/BlockEventRegistry.java | 24 +-- .../api/event/v2/AbstractEvent.java | 18 ++ .../api/event/v2/BlockEventRegistry.java | 25 +++ .../mcpitanlib/api/event/v2/OrderedEvent.java | 167 ++++++++++++++++++ .../api/registry/CompatRegistry.java | 14 ++ .../api/registry/result/RegistryResult.java | 10 ++ .../pitan76/mcpitanlib/mixin/BlockMixin.java | 29 ++- info.properties | 2 +- 8 files changed, 271 insertions(+), 18 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/AbstractEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/BlockEventRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/OrderedEvent.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java index 6b6465b87..cfc8397de 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/BlockEventRegistry.java @@ -3,20 +3,24 @@ import net.pitan76.mcpitanlib.api.event.v1.listener.BlockBreakTask; import net.pitan76.mcpitanlib.api.event.v1.listener.BlockPlacedTask; -import java.util.ArrayList; -import java.util.List; - +@Deprecated public class BlockEventRegistry { - public static List onPlacedListeners = new ArrayList<>(); - public static List onBreakListeners = new ArrayList<>(); - + @Deprecated public static void register(BlockPlacedTask listener) { - if (onPlacedListeners.contains(listener)) return; - onPlacedListeners.add(listener); + net.pitan76.mcpitanlib.api.event.v2.BlockEventRegistry.ON_PLACED.register(listener); } + @Deprecated public static void register(BlockBreakTask listener) { - if (onBreakListeners.contains(listener)) return; - onBreakListeners.add(listener); + net.pitan76.mcpitanlib.api.event.v2.BlockEventRegistry.ON_BREAK.register(listener); + } + + public static void registerPlacedListener(BlockPlacedTask listener) { + net.pitan76.mcpitanlib.api.event.v2.BlockEventRegistry.ON_PLACED.register(listener); + + } + + public static void registerBreakListener(BlockBreakTask listener) { + net.pitan76.mcpitanlib.api.event.v2.BlockEventRegistry.ON_BREAK.register(listener); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/AbstractEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/AbstractEvent.java new file mode 100644 index 000000000..4ad62500e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/AbstractEvent.java @@ -0,0 +1,18 @@ +package net.pitan76.mcpitanlib.api.event.v2; + +import java.util.List; + +public abstract class AbstractEvent { + + public abstract void register(T listener); + + public abstract void unregister(T listener); + + public abstract T getListener(int index); + + public abstract List getListenersAsList(); + + public int getListenerCount() { + return getListenersAsList().size(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/BlockEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/BlockEventRegistry.java new file mode 100644 index 000000000..50f50a605 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/BlockEventRegistry.java @@ -0,0 +1,25 @@ +package net.pitan76.mcpitanlib.api.event.v2; + +import net.pitan76.mcpitanlib.api.event.v1.listener.BlockBreakTask; +import net.pitan76.mcpitanlib.api.event.v1.listener.BlockPlacedTask; + +public class BlockEventRegistry { + /** + * Event that is called when a block is placed + * 
{@code
+     * BlockEventRegistry.ON_PLACED.register((event) -> {
+     *     // Do something
+     * }
+ */ + public static OrderedEvent ON_PLACED = new OrderedEvent<>(); + + /** + * Event that is called when a block is broken + * 
{@code
+     * BlockEventRegistry.ON_BREAK.register((event) -> {
+     *     // Do something
+     *     return new BlockBreakResult(event.state);
+     * }
+ */ + public static OrderedEvent ON_BREAK = new OrderedEvent<>(); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/OrderedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/OrderedEvent.java new file mode 100644 index 000000000..019d5f5a7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/OrderedEvent.java @@ -0,0 +1,167 @@ +package net.pitan76.mcpitanlib.api.event.v2; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class OrderedEvent extends AbstractEvent { + + public volatile Map listeners = new HashMap<>(); + public volatile int maxPriority = 0; + + /** + * Check if the event has any listeners + * @return Whether the event has any listeners + */ + public boolean isEmpty() { + return listeners.isEmpty(); + } + + /** + * Check if a listener is registered + * @param listener The listener to check + * @return Whether the listener is registered + */ + public boolean isExists(T listener) { + return listeners.containsKey(listener); + } + + /** + * Alias for isExists + * @param listener The listener to check + * @return Whether the listener is registered + */ + public boolean has(T listener) { + return isExists(listener); + } + + /** + * Check if a listener has a priority + * @param listener The listener to check + * @return Whether the listener has a priority + */ + public boolean hasPriority(T listener) { + if (!isExists(listener)) return false; + return listeners.get(listener) != null && listeners.get(listener) != 0; + } + + /** + * Set the priority of a listener + * @param listener The listener to set the priority of + * @param priority The priority to set + */ + public void setPriority(T listener, int priority) { + if (!isExists(listener)) { + listeners.put(listener, priority); + return; + } + listeners.replace(listener, priority); + } + + /** + * Register a listener with a priority + * @param listener The listener to register + * @param priority The priority of the listener + */ + public void register(T listener, int priority) { + this.listeners.put(listener, priority); + if (priority > maxPriority) { + maxPriority = priority; + } + } + + /** + * Register a listener (no priority) + * @param listener The listener to register + * @throws IllegalArgumentException If the listener is already registered + */ + @Override + public void register(T listener) { + if (isExists(listener)) throw new IllegalArgumentException("Listener already exists"); + this.listeners.put(listener, 0); + } + + /** + * Register a listener (no priority) + * @param listener The listener to register + */ + public void registerNonSafe(T listener) { + if (isExists(listener)) return; + register(listener); + } + + /** + * Unregister a listener + * @param listener The listener to unregister + */ + @Override + public void unregister(T listener) { + if (!isExists(listener)) return; + this.listeners.remove(listener); + } + + /** + * Get all listeners + * @return A list of all listeners + */ + @Override + public List getListenersAsList() { + return listeners.keySet().stream().toList(); + } + + /** + * get the priority of a listener + * @param listener The listener to get the priority of + * @return The priority of the listener + */ + public int getPriority(T listener) { + return listeners.get(listener); + } + + /** + * Get the highest priority + * @return The highest priority + */ + public int getMaxPriority() { + return maxPriority; + } + + /** + * Get the next priority + * @return The next priority + */ + public int nextPriority() { + return maxPriority + 1; + } + + @Deprecated + public T getListener(int index) { + return getListenersAsList().get(index); + } + + /** + * Get all listeners with a specific priority + * @param priority The priority to get listeners for + * @return A list of listeners with the specified priority + */ + public List getListenersAsList(int priority) { + List listeners = new ArrayList<>(); + for (Map.Entry entry : this.listeners.entrySet()) { + if (entry.getValue() == priority) { + listeners.add(entry.getKey()); + } + } + return listeners; + } + + @Deprecated + @SuppressWarnings("unchecked") + public T[] getListeners(int priority) { + return (T[]) getListenersAsList(priority).toArray(); + } + + public Map getListeners() { + return listeners; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index 4ebbf1eb7..dd5b5750f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -32,15 +32,29 @@ public class CompatRegistry { private final MCPLRegistry mcplr; private final MCPLRegistry1_20 mcplr1_20; + /** + * @deprecated Use {@link #createRegistry(String)} instead + */ public CompatRegistry(String MOD_ID) { mcplr = new MCPLRegistry(MOD_ID); mcplr1_20 = new MCPLRegistry1_20(mcplr); } + /** + * Create a new CompatRegistry + * @param MOD_ID The mod id + * @return The new CompatRegistry + */ public static CompatRegistry createRegistry(String MOD_ID) { return new CompatRegistry(MOD_ID); } + /** + * Register an item + * @param id The item id + * @param supplier The item supplier + * @return The registry result + */ public RegistryResult registerItem(Identifier id, Supplier supplier) { if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java index a19dd2e16..52fc504e7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java @@ -3,6 +3,16 @@ import dev.architectury.registry.registries.RegistrySupplier; import org.jetbrains.annotations.Nullable; +/** + * The result of a registry + * @param The type of the registry + * + * 
{@code
+ * RegistryResult ITEM = registry.registerItem(new Identifier("mcpitanlib", "example"), ExampleItem::new);
+ * ITEM.getOrNull(); => The item (Item.class) or null
+ * ITEM.get(); => The item (Item.class)
+ * }
+ */ public class RegistryResult { public RegistrySupplier supplier; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java index 404bdc047..9c8386c92 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java @@ -12,8 +12,9 @@ import net.pitan76.mcpitanlib.api.event.block.BlockBreakEvent; import net.pitan76.mcpitanlib.api.event.block.BlockPlacedEvent; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; -import net.pitan76.mcpitanlib.api.event.v1.BlockEventRegistry; import net.pitan76.mcpitanlib.api.event.v1.listener.BlockBreakTask; +import net.pitan76.mcpitanlib.api.event.v1.listener.BlockPlacedTask; +import net.pitan76.mcpitanlib.api.event.v2.BlockEventRegistry; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -25,10 +26,17 @@ public class BlockMixin { @Inject(method = "onPlaced", at = @At("HEAD"), cancellable = true) private void inject_onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack, CallbackInfo ci) { - if (!BlockEventRegistry.onPlacedListeners.isEmpty()) { - BlockEventRegistry.onPlacedListeners.forEach(l -> l.onPlaced(new BlockPlacedEvent(world, pos, state, placer, stack))); + // イベントを呼び出す + if (!BlockEventRegistry.ON_PLACED.isEmpty()) { + int maxPriority = BlockEventRegistry.ON_PLACED.getMaxPriority(); + for (int p = maxPriority; p >= 0; p--) { + for (BlockPlacedTask listener : BlockEventRegistry.ON_PLACED.getListenersAsList(p)) { + listener.onPlaced(new BlockPlacedEvent(world, pos, state, placer, stack)); + } + } } + // ExtendBlockProviderを実装している場合 if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); @@ -40,15 +48,22 @@ private void inject_onPlaced(World world, BlockPos pos, BlockState state, Living @Inject(method = "onBreak", at = @At("HEAD"), cancellable = true) private void inject_onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable cir) { - if (!BlockEventRegistry.onBreakListeners.isEmpty()) { + // イベントを呼び出す + if (!BlockEventRegistry.ON_BREAK.isEmpty()) { BlockState newState = state; - for (BlockBreakTask l : BlockEventRegistry.onBreakListeners) { - newState = l.onBreak(new BlockBreakEvent(world, pos, state, player)).getState(); + int maxPriority = BlockEventRegistry.ON_BREAK.getMaxPriority(); + for (int p = maxPriority; p >= 0; p--) { + for (BlockBreakTask listener : BlockEventRegistry.ON_BREAK.getListenersAsList(p)) { + listener.onBreak(new BlockBreakEvent(world, pos, newState, player)); + } } - if (newState != state) + if (newState != state) { cir.setReturnValue(newState); + state = newState; + } } + // ExtendBlockProviderを実装している場合 if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); diff --git a/info.properties b/info.properties index 7bd2a3f7f..7b95e0339 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.2 +mod_version=2.0.3 maven_group=net.pitan76 \ No newline at end of file From fe9e9cf133389b2cc1577ed938283fe663f4b03e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:41:58 +0900 Subject: [PATCH 249/622] Deprecated --- .../java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index dd5b5750f..e535950ea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -35,6 +35,7 @@ public class CompatRegistry { /** * @deprecated Use {@link #createRegistry(String)} instead */ + @Deprecated public CompatRegistry(String MOD_ID) { mcplr = new MCPLRegistry(MOD_ID); mcplr1_20 = new MCPLRegistry1_20(mcplr); From e8da8167efa20e8aaa6c5a1c4a9a486472e8ad56 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:43:56 +0900 Subject: [PATCH 250/622] fix --- .../src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java index 9c8386c92..44ee0e7a3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java @@ -54,7 +54,7 @@ private void inject_onBreak(World world, BlockPos pos, BlockState state, PlayerE int maxPriority = BlockEventRegistry.ON_BREAK.getMaxPriority(); for (int p = maxPriority; p >= 0; p--) { for (BlockBreakTask listener : BlockEventRegistry.ON_BREAK.getListenersAsList(p)) { - listener.onBreak(new BlockBreakEvent(world, pos, newState, player)); + newState = listener.onBreak(new BlockBreakEvent(world, pos, newState, player)).state; } } if (newState != state) { From 1f23b1aef2730abb762c6236aee663339ae9f57d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:50:20 +0900 Subject: [PATCH 251/622] add CompatibleArmorItem (2.0.4) --- .../api/item/CompatibleArmorItem.java | 40 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java new file mode 100644 index 000000000..8a81fb2ba --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.api.item; + +import net.minecraft.item.ArmorItem; + +public class CompatibleArmorItem extends ArmorItem implements ExtendItemProvider { + public final ArmorEquipmentType type; + + public CompatibleArmorItem(CompatibleArmorMaterial material, ArmorEquipmentType type, CompatibleItemSettings settings) { + super(material, type.getType(), settings.build()); + this.type = type; + } + + /** + * get ArmorEquipmentType + * @return ArmorEquipmentType + */ + public ArmorEquipmentType getArmorEquipmentType() { + return type; + } + + /** + * @deprecated Use {@link #getArmorEquipmentType()} instead + */ + @Deprecated + @Override + public Type getType() { + return super.getType(); + } + + /** + * get ArmorMaterial + * @return CompatibleArmorMaterial + */ + public CompatibleArmorMaterial getArmorMaterial() { + if (!(this.getMaterial() instanceof CompatibleArmorMaterial)) { + throw new IllegalStateException("ArmorMaterial is not CompatibleArmorMaterial"); + } + return (CompatibleArmorMaterial) this.getMaterial(); + } +} diff --git a/info.properties b/info.properties index 7b95e0339..d364431c7 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.3 +mod_version=2.0.4 maven_group=net.pitan76 \ No newline at end of file From a0741b1944440120cf072d09ecb5740bd01f66dd Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 17 Feb 2024 21:19:07 +0900 Subject: [PATCH 252/622] add access.widener task --- fabric/build.gradle | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/fabric/build.gradle b/fabric/build.gradle index dfc5d9382..c11cecf1f 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -89,4 +89,16 @@ publishing { repositories { // Add repositories to publish to here. } +} + +tasks.runClient.doFirst { + def from = new File("../common/src/main/resources/mcpitanlib.accesswidener") + def to = new File("src/main/resources/mcpitanlib.accesswidener") + to.bytes = from.bytes +} + +tasks.remapJar.doFirst { + if (file("src/main/resources/mcpitanlib.accesswidener").exists()) { + delete file("src/main/resources/mcpitanlib.accesswidener") + } } \ No newline at end of file From dff88b42f9acd9838d98c1c24800b27306e73fd7 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:00:51 +0900 Subject: [PATCH 253/622] add APIs --- .../api/block/CompatChestBlock.java | 33 ++++ .../api/block/ExtendBlockEntityProvider.java | 15 ++ .../api/block/ExtendBlockProvider.java | 1 - .../api/client/SimpleInventoryScreen.java | 34 ++++ .../client/registry/ArchRegistryClient.java | 1 + .../client/registry/CompatRegistryClient.java | 179 ++++++++++++++++++ .../api/event/tile/TileTickEvent.java | 6 +- .../api/tile/CompatBlockEntity.java | 60 ++++++ .../api/tile/CompatChestBlockEntity.java | 58 ++++++ .../api/tile/ExtendBlockEntity.java | 45 +---- .../api/tile/ExtendBlockEntityTicker.java | 6 +- .../mcpitanlib/api/util/BlockUtil.java | 20 ++ .../pitan76/mcpitanlib/api/util/ItemUtil.java | 20 ++ .../util/client/BlockEntityRendererUtil.java | 14 ++ .../mcpitanlib/api/util/v2/BlockUtilV2.java | 20 ++ .../mcpitanlib/api/util/v2/ItemUtilV2.java | 20 ++ 16 files changed, 482 insertions(+), 50 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/BlockEntityRendererUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java new file mode 100644 index 000000000..b507732c8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java @@ -0,0 +1,33 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.block.BlockState; +import net.minecraft.block.ChestBlock; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.entity.ChestBlockEntity; +import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; + +import java.util.function.Supplier; + +public class CompatChestBlock extends ChestBlock { + public CompatChestBlock(Settings settings, Supplier> supplier) { + super(settings, supplier); + } + + /** + * @deprecated Use {@link #createBlockEntity(TileCreateEvent)} instead. + */ + @Deprecated + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return createBlockEntity(new TileCreateEvent(pos, state)); + } + + /** + * @see ExtendBlockEntityProvider#createBlockEntity(TileCreateEvent) + */ + public BlockEntity createBlockEntity(TileCreateEvent event) { + return super.createBlockEntity(event.getBlockPos(), event.getBlockState()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java index 47b1a124e..2b9481a95 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockEntityProvider.java @@ -12,11 +12,26 @@ import org.jetbrains.annotations.Nullable; public interface ExtendBlockEntityProvider extends BlockEntityProvider { + + /** + * @deprecated Use {@link #createBlockEntity(TileCreateEvent)} instead. + */ + @Deprecated @Nullable default BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return createBlockEntity(new TileCreateEvent(pos, state)); } + /** + * create instance of BlockEntity + * @param event TileCreateEvent + * @return BlockEntity + * + * 
{@code
+     * public BlockEntity createBlockEntity(TileCreateEvent e) {
+     *    return new ExampleBlockEntity(e); // ExampleBlockEntity extends CompatBlockEntity
+     * }
+ */ @Nullable default BlockEntity createBlockEntity(TileCreateEvent event) { if (getBlockEntityType() == null) return null; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java index 1ae252675..aa475c456 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.block; -import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java new file mode 100644 index 000000000..c8587bd0c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java @@ -0,0 +1,34 @@ +package net.pitan76.mcpitanlib.api.client; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawForegroundArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; +import net.pitan76.mcpitanlib.api.util.client.RenderUtil; + +public abstract class SimpleInventoryScreen extends SimpleHandledScreen { + + public SimpleInventoryScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + public abstract Identifier getTexture(); + + @Override + public void drawBackgroundOverride(DrawBackgroundArgs args) { + RenderUtil.setShaderToPositionTexProgram(); + RenderUtil.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + callDrawTexture(args.drawObjectDM, getTexture(), x, y, 0, 0, backgroundWidth, backgroundHeight); + } + + @Override + public void renderOverride(RenderArgs args) { + this.callRenderBackground(args); + super.renderOverride(args); + this.callDrawMouseoverTooltip(new DrawMouseoverTooltipArgs(args.drawObjectDM, args.mouseX, args.mouseY)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/ArchRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/ArchRegistryClient.java index 4b58f9179..89a0facf0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/ArchRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/ArchRegistryClient.java @@ -42,6 +42,7 @@ import java.util.List; import java.util.function.Supplier; +@Deprecated @Environment(EnvType.CLIENT) public class ArchRegistryClient { public static > void registerScreen(ScreenHandlerType type, ScreenFactory factory) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java new file mode 100644 index 000000000..a71c39e0e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -0,0 +1,179 @@ +package net.pitan76.mcpitanlib.api.client.registry; + +import dev.architectury.registry.client.level.entity.EntityRendererRegistry; +import dev.architectury.registry.client.particle.ParticleProviderRegistry; +import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry; +import dev.architectury.registry.client.rendering.RenderTypeRegistry; +import dev.architectury.registry.menu.MenuRegistry; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.client.model.ModelPart; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.SpriteProvider; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.block.BlockRenderManager; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.entity.EntityRenderDispatcher; +import net.minecraft.client.render.entity.EntityRendererFactory; +import net.minecraft.client.render.entity.model.EntityModelLayer; +import net.minecraft.client.render.entity.model.EntityModelLoader; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.texture.SpriteAtlasTexture; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.fluid.Fluid; +import net.minecraft.particle.ParticleEffect; +import net.minecraft.particle.ParticleType; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.random.Random; + +import java.util.List; +import java.util.function.Supplier; + +@Environment(EnvType.CLIENT) +public class CompatRegistryClient { + public static > void registerScreen(ScreenHandlerType type, ScreenFactory factory) { + MenuRegistry.registerScreenFactory(type, factory::create); + } + + public interface ScreenFactory> { + S create(H handler, PlayerInventory inventory, Text text); + } + + public static void registerParticle(ParticleType type, ParticleFactory factory) { + ParticleProviderRegistry.register(type, factory); + } + + public static void registerParticle(ParticleType type, DeferredParticleProvider provider) { + ParticleProviderRegistry.register(type, spriteSet -> provider.create(new ExtendedSpriteSet() { + @Override + public SpriteAtlasTexture getAtlas() { + return spriteSet.getAtlas(); + } + + @Override + public List getSprites() { + return spriteSet.getSprites(); + } + + @Override + public Sprite getSprite(int age, int maxAge) { + return spriteSet.getSprite(age, maxAge); + } + + @Override + public Sprite getSprite(Random random) { + return spriteSet.getSprite(random); + } + })); + } + + public static void registerEntityRenderer(Supplier> type, EntityRendererFactory provider) { + EntityRendererRegistry.register(type, provider); + } + + @FunctionalInterface + public interface DeferredParticleProvider { + ParticleFactory create(ExtendedSpriteSet spriteSet); + } + + public interface ExtendedSpriteSet extends SpriteProvider { + SpriteAtlasTexture getAtlas(); + + List getSprites(); + } + + public static void registryClientSpriteAtlasTexture(Identifier identifier) { + //registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, identifier); + } + + public static void registryClientSpriteAtlasTexture(Sprite sprite) { + //registryClientSprite(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, sprite); + } + + public static void registryClientSprite(Identifier atlasId, Identifier identifier) { + // ～1.19.2 + } + + public static void registryClientSprite(Identifier atlasId, Sprite sprite) { + // ～1.19.2 + } + + public static void registerBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { + BlockEntityRendererRegistry.register(type, ctx -> provider.create(new BlockEntityRendererFactory.Context( + ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer() + ))); + } + + @FunctionalInterface + public interface BlockEntityRendererFactory { + BlockEntityRenderer create(Context ctx); + + class Context { + private final BlockEntityRenderDispatcher renderDispatcher; + private final BlockRenderManager renderManager; + private final ItemRenderer itemRenderer; + private final EntityRenderDispatcher entityRenderDispatcher; + private final EntityModelLoader layerRenderDispatcher; + private final TextRenderer textRenderer; + + public Context(BlockEntityRenderDispatcher renderDispatcher, BlockRenderManager renderManager, ItemRenderer itemRenderer, EntityRenderDispatcher entityRenderDispatcher, EntityModelLoader layerRenderDispatcher, TextRenderer textRenderer) { + this.renderDispatcher = renderDispatcher; + this.renderManager = renderManager; + this.itemRenderer = itemRenderer; + this.entityRenderDispatcher = entityRenderDispatcher; + this.layerRenderDispatcher = layerRenderDispatcher; + this.textRenderer = textRenderer; + } + + public BlockEntityRenderDispatcher getRenderDispatcher() { + return this.renderDispatcher; + } + + public BlockRenderManager getRenderManager() { + return this.renderManager; + } + + public EntityRenderDispatcher getEntityRenderDispatcher() { + return this.entityRenderDispatcher; + } + + public ItemRenderer getItemRenderer() { + return this.itemRenderer; + } + + public EntityModelLoader getLayerRenderDispatcher() { + return this.layerRenderDispatcher; + } + + public ModelPart getLayerModelPart(EntityModelLayer modelLayer) { + return this.layerRenderDispatcher.getModelPart(modelLayer); + } + + public TextRenderer getTextRenderer() { + return this.textRenderer; + } + } + } + + + public static void registerRenderTypeBlock(RenderLayer layer, Block block) { + RenderTypeRegistry.register(layer, block); + } + + public static void registerRenderTypeFluid(RenderLayer layer, Fluid fluid) { + RenderTypeRegistry.register(layer, fluid); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java index b3000b0d3..80f543f56 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java @@ -5,13 +5,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class TileTickEvent { +public class TileTickEvent { public World world; public BlockPos pos; public BlockState state; - public BlockEntity blockEntity; + public T blockEntity; - public TileTickEvent(World world, BlockPos pos, BlockState state, BlockEntity blockEntity) { + public TileTickEvent(World world, BlockPos pos, BlockState state, T blockEntity) { this.world = world; this.pos = pos; this.state = state; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java new file mode 100644 index 000000000..a48939ae5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -0,0 +1,60 @@ +package net.pitan76.mcpitanlib.api.tile; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; +import net.pitan76.mcpitanlib.api.world.ExtendWorld; +import org.jetbrains.annotations.Nullable; + +public class CompatBlockEntity extends BlockEntity { + public CompatBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + public CompatBlockEntity(BlockEntityType type, TileCreateEvent event) { + this(type, event.getBlockPos(), event.getBlockState()); + } + + @Nullable + @Override + @Deprecated + public Packet toUpdatePacket() { + switch (getUpdatePacketType().name) { + case "BLOCK_ENTITY_UPDATE_S2C": + return BlockEntityUpdateS2CPacket.create(this); + } + return super.toUpdatePacket(); + } + + public UpdatePacketType getUpdatePacketType() { + return UpdatePacketType.NONE; + } + + public void writeNbtOverride(NbtCompound nbt) { + super.writeNbt(nbt); + } + + public void readNbtOverride(NbtCompound nbt) { + super.readNbt(nbt); + } + + @Deprecated + @Override + public void writeNbt(NbtCompound nbt) { + writeNbtOverride(nbt); + } + + @Deprecated + @Override + public void readNbt(NbtCompound nbt) { + readNbtOverride(nbt); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java new file mode 100644 index 000000000..272c775a5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java @@ -0,0 +1,58 @@ +package net.pitan76.mcpitanlib.api.tile; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.entity.ChestBlockEntity; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; +import org.jetbrains.annotations.Nullable; + +public class CompatChestBlockEntity extends ChestBlockEntity { + protected CompatChestBlockEntity(BlockEntityType blockEntityType, BlockPos blockPos, BlockState blockState) { + super(blockEntityType, blockPos, blockState); + } + + public CompatChestBlockEntity(BlockEntityType type, TileCreateEvent event) { + this(type, event.getBlockPos(), event.getBlockState()); + } + + @Nullable + @Override + @Deprecated + public Packet toUpdatePacket() { + switch (getUpdatePacketType().name) { + case "BLOCK_ENTITY_UPDATE_S2C": + return BlockEntityUpdateS2CPacket.create(this); + } + return super.toUpdatePacket(); + } + + public UpdatePacketType getUpdatePacketType() { + return UpdatePacketType.NONE; + } + + public void writeNbtOverride(NbtCompound nbt) { + super.writeNbt(nbt); + } + + public void readNbtOverride(NbtCompound nbt) { + super.readNbt(nbt); + } + + @Deprecated + @Override + public void writeNbt(NbtCompound nbt) { + writeNbtOverride(nbt); + } + + @Deprecated + @Override + public void readNbt(NbtCompound nbt) { + readNbtOverride(nbt); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java index abc11a2ee..01ea4f2e2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntity.java @@ -1,21 +1,15 @@ package net.pitan76.mcpitanlib.api.tile; import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.network.listener.ClientPlayPacketListener; -import net.minecraft.network.packet.Packet; -import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; -import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; import net.pitan76.mcpitanlib.api.world.ExtendWorld; -import org.jetbrains.annotations.Nullable; -public class ExtendBlockEntity extends BlockEntity { +public class ExtendBlockEntity extends CompatBlockEntity { public ExtendWorld world; + public ExtendBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); } @@ -24,41 +18,6 @@ public ExtendBlockEntity(BlockEntityType type, TileCreateEvent event) { this(type, event.getBlockPos(), event.getBlockState()); } - @Nullable - @Override - @Deprecated - public Packet toUpdatePacket() { - switch (getUpdatePacketType().name) { - case "BLOCK_ENTITY_UPDATE_S2C": - return BlockEntityUpdateS2CPacket.create(this); - } - return super.toUpdatePacket(); - } - - public UpdatePacketType getUpdatePacketType() { - return UpdatePacketType.NONE; - } - - public void writeNbtOverride(NbtCompound nbt) { - super.writeNbt(nbt); - } - - public void readNbtOverride(NbtCompound nbt) { - super.readNbt(nbt); - } - - @Deprecated - @Override - public void writeNbt(NbtCompound nbt) { - writeNbtOverride(nbt); - } - - @Deprecated - @Override - public void readNbt(NbtCompound nbt) { - readNbtOverride(nbt); - } - @Override public void setWorld(World world) { super.setWorld(world); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java index d5c0edda9..8bce6ee96 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/ExtendBlockEntityTicker.java @@ -9,9 +9,9 @@ public interface ExtendBlockEntityTicker extends BlockEntityTicker { @Override - default void tick(World world, BlockPos pos, BlockState state, BlockEntity blockEntity) { - tick(new TileTickEvent(world, pos, state, blockEntity)); + default void tick(World world, BlockPos pos, BlockState state, T blockEntity) { + tick(new TileTickEvent<>(world, pos, state, blockEntity)); } - void tick(TileTickEvent event); + void tick(TileTickEvent event); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java index d0b055143..1e7813136 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -198,4 +198,24 @@ public static List getBlocks(String id) { public static List getBlocks(String id, List blocks) { return BlockUtilV2.getBlocks(id, blocks); } + + /** + * Check if the block is in the tag. + * @param block Block to check. + * @param identifier Identifier of the tag. + * @return If the block is in the tag. + */ + public static boolean isBlockInTag(Block block, Identifier identifier) { + return BlockUtilV2.isBlockInTag(block, identifier); + } + + /** + * Check if the block is in the tag. + * @param block Block to check. + * @param id String of the tag. + * @return If the block is in the tag. + */ + public static boolean isBlockInTag(Block block, String id) { + return BlockUtilV2.isBlockInTag(block, id); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java index 8fb88bdf0..d584e1e18 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java @@ -212,4 +212,24 @@ public static List getItems(String id) { public static List getItems(String id, List items) { return ItemUtilV2.getItems(id, items); } + + /** + * Check if the item is in the tag. + * @param item Item to check. + * @param identifier Identifier of the tag. + * @return If the item is in the tag. + */ + public static boolean isItemInTag(Item item, Identifier identifier) { + return ItemUtilV2.isItemInTag(item, identifier); + } + + /** + * Check if the item is in the tag. + * @param item Item to check. + * @param id String of the tag. + * @return If the item is in the tag. + */ + public static boolean isItemInTag(Item item, String id) { + return ItemUtilV2.isItemInTag(item, id); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/BlockEntityRendererUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/BlockEntityRendererUtil.java new file mode 100644 index 000000000..a6481e5e5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/BlockEntityRendererUtil.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.util.client; + +import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; + +public class BlockEntityRendererUtil { + public static BlockEntityRendererFactory.Context convert(CompatRegistryClient.BlockEntityRendererFactory.Context ctx) { + return new BlockEntityRendererFactory.Context(ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer()); + } + + public static CompatRegistryClient.BlockEntityRendererFactory.Context convert(BlockEntityRendererFactory.Context ctx) { + return new CompatRegistryClient.BlockEntityRendererFactory.Context(ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java index a3d771a06..2b3c9fa6a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java @@ -91,4 +91,24 @@ public static List getBlocks(String id) { public static List getBlocks(String id, List blocks) { return getBlocks(new Identifier(id), blocks); } + + /** + * Check if the block is in the tag. + * @param block Block to check. + * @param identifier Identifier of the tag. + * @return If the block is in the tag. + */ + public static boolean isBlockInTag(Block block, Identifier identifier) { + return BlockUtil.isIn(block, (TagKey) TagKey.create(TagKey.Type.BLOCK, identifier)); + } + + /** + * Check if the block is in the tag. + * @param block Block to check. + * @param id String of the tag. + * @return If the block is in the tag. + */ + public static boolean isBlockInTag(Block block, String id) { + return isBlockInTag(block, new Identifier(id)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java index ff8ded40b..d65ee69fc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java @@ -70,4 +70,24 @@ public static List getItems(String id) { public static List getItems(String id, List items) { return getItems(new Identifier(id), items); } + + /** + * Check if the item is in the tag. + * @param item Item to check. + * @param identifier Identifier of the tag. + * @return True if the item is in the tag. + */ + public static boolean isItemInTag(Item item, Identifier identifier) { + return ItemUtil.isIn(item, (TagKey) TagKey.create(TagKey.Type.ITEM, identifier)); + } + + /** + * Check if the item is in the tag. + * @param item Item to check. + * @param id String of the tag. + * @return True if the item is in the tag. + */ + public static boolean isItemInTag(Item item, String id) { + return isItemInTag(item, new Identifier(id)); + } } From 8d76af5600cd6e4eb018734ab833abf1e0b416c6 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:57:57 +0900 Subject: [PATCH 254/622] fix apis --- .../mcpitanlib/api/event/item/CraftEvent.java | 21 +++++++++++++++++++ .../resources/mcpitanlib-common.mixins.json | 1 - .../mcpitanlib/fabric}/mixin/RecipeMixin.java | 2 +- .../src/main/resources/mcpitanlib.mixins.json | 2 +- info.properties | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) rename {common/src/main/java/net/pitan76/mcpitanlib => fabric/src/main/java/net/pitan76/mcpitanlib/fabric}/mixin/RecipeMixin.java (96%) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CraftEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CraftEvent.java index 6281f4248..a80abdbba 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CraftEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CraftEvent.java @@ -1,12 +1,28 @@ package net.pitan76.mcpitanlib.api.event.item; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import org.jetbrains.annotations.Nullable; public class CraftEvent { public ItemStack stack; public World world; + public Player player; + + public CraftEvent(ItemStack stack, World world, Player player) { + this.stack = stack; + this.world = world; + this.player = player; + } + + public CraftEvent(ItemStack stack, World world, PlayerEntity player) { + this.stack = stack; + this.world = world; + this.player = new Player(player); + } public CraftEvent(ItemStack stack, World world) { this.stack = stack; @@ -21,6 +37,11 @@ public World getWorld() { return world; } + @Nullable + public Player getPlayer() { + return player; + } + public boolean isClient() { return world.isClient(); } diff --git a/common/src/main/resources/mcpitanlib-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json index c255e797f..6dad93704 100644 --- a/common/src/main/resources/mcpitanlib-common.mixins.json +++ b/common/src/main/resources/mcpitanlib-common.mixins.json @@ -11,7 +11,6 @@ "ItemUsageContextMixin", "MinecraftServerTimer", "RecipeManagerMixin", - "RecipeMixin", "ServerWorldTimer" ], "client": [ diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java similarity index 96% rename from common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java rename to fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java index 8c06e793a..f16705691 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.mixin; +package net.pitan76.mcpitanlib.fabric.mixin; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; diff --git a/fabric/src/main/resources/mcpitanlib.mixins.json b/fabric/src/main/resources/mcpitanlib.mixins.json index d4b92ebd9..0a36c5829 100644 --- a/fabric/src/main/resources/mcpitanlib.mixins.json +++ b/fabric/src/main/resources/mcpitanlib.mixins.json @@ -4,7 +4,7 @@ "package": "net.pitan76.mcpitanlib.fabric.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ - + "RecipeMixin" ], "client": [ ], diff --git a/info.properties b/info.properties index d364431c7..e70cdca41 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.4 +mod_version=2.0.5 maven_group=net.pitan76 \ No newline at end of file From 48802579e490d869854f52348b974dc70f23c60c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 17 Feb 2024 23:07:23 +0900 Subject: [PATCH 255/622] 1204 --- .../java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index a48939ae5..56d9b39ee 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -8,10 +8,8 @@ import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; -import net.pitan76.mcpitanlib.api.world.ExtendWorld; import org.jetbrains.annotations.Nullable; public class CompatBlockEntity extends BlockEntity { From 4881d400f3c156e48401cd4f4d1e78bc91d8cca1 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:46:22 +0900 Subject: [PATCH 256/622] add APIs --- .../mcpitanlib/api/gen/OreRegistry.java | 42 +++++++ .../api/item/CompatibleItemSettings.java | 15 ++- .../api/item/CreativeTabBuilder.java | 21 +++- .../mcpitanlib/api/item/ExtendSettings.java | 7 +- .../api/registry/CompatRegistry.java | 16 ++- .../api/registry/WorldGenRegistry.java | 107 ++++++++++++++++++ .../api/util/FeatureConfigUtil.java | 81 +++++++++++++ .../mcpitanlib/api/util/PlacedFutureUtil.java | 35 ++++++ .../core/registry/MCPLRegistry1_20.java | 24 +++- 9 files changed, 337 insertions(+), 11 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gen/OreRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/registry/WorldGenRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/FeatureConfigUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gen/OreRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gen/OreRegistry.java new file mode 100644 index 000000000..f1ce3ec98 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gen/OreRegistry.java @@ -0,0 +1,42 @@ +package net.pitan76.mcpitanlib.api.gen; + +import net.minecraft.block.Block; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.PlacedFeature; +import net.pitan76.mcpitanlib.api.registry.WorldGenRegistry; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.FeatureConfigUtil; +import net.pitan76.mcpitanlib.api.util.PlacedFutureUtil; + +@Deprecated +public class OreRegistry { + /** + * Generating custom ore in stone + * @param registry WorldGenRegistry + * @param block Block + * @param size Ore size + * @param height generating height + * @param count generating count per chunk + * @return Identifier of feature + */ + public static Identifier registerStoneOre(WorldGenRegistry registry, Block block, int size, int height, int count) { + Identifier identifier = BlockUtil.toID(block).withSuffixedPath("_ore_feature"); + RegistryResult> configuredFuture = registry.registerFeature(identifier, + () -> FeatureConfigUtil.createConfiguredFeature( + FeatureConfigUtil.createStoneOreFeatureConfig(block.getDefaultState(), size) + ) + ); + + RegistryResult placedFeature = registry.registerPlacedFeature(identifier, + () -> PlacedFutureUtil.create(configuredFuture.getOrNull(), + PlacedFutureUtil.createPlacementModifiers(count, height) + ) + ); + + WorldGenRegistry.addProperties(GenerationStep.Feature.UNDERGROUND_DECORATION, placedFeature); + return identifier; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index 10311f23f..b24588bb4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -1,16 +1,20 @@ package net.pitan76.mcpitanlib.api.item; +import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; import java.util.function.Supplier; public class CompatibleItemSettings { private final ExtendSettings settings = new ExtendSettings(); + protected Identifier itemGroupId = null; + public static CompatibleItemSettings of() { return new CompatibleItemSettings(); } @@ -30,11 +34,17 @@ public CompatibleItemSettings addGroup(ItemGroup itemGroup, Identifier identifie return this; } + @Deprecated public CompatibleItemSettings addGroup(Supplier itemGroup, Identifier identifier) { settings.addGroup(itemGroup, identifier); return this; } + public CompatibleItemSettings addGroup(CreativeTabBuilder itemGroup) { + this.itemGroupId = itemGroup.getIdentifier(); + return this; + } + public CompatibleItemSettings maxCount(int maxCount) { settings.maxCount(maxCount); return this; @@ -66,7 +76,10 @@ public CompatibleItemSettings recipeRemainder(Item recipeRemainder) { } public ExtendSettings build() { + if (itemGroupId != null) { + RegistrySupplier itemGroup = MCPLRegistry1_20.REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.get(itemGroupId); + settings.arch$tab(itemGroup); + } return settings; - } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java index c10594531..7b5c6e7bb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java @@ -8,10 +8,11 @@ import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.TextUtil; +import java.util.HashMap; +import java.util.Map; import java.util.function.Supplier; public class CreativeTabBuilder { - private final Identifier identifier; private Text displayName = null; private Supplier iconSupplier = null; @@ -35,11 +36,21 @@ public CreativeTabBuilder setDisplayName(Text text) { return this; } + /** + * Set icon + * @param iconSupplier Icon supplier + * @return CreativeTabBuilder + */ public CreativeTabBuilder setIcon(Supplier iconSupplier) { this.iconSupplier = iconSupplier; return this; } + /** + * Set icon (Already registered item only) + * @param item Item + * @return CreativeTabBuilder + */ public CreativeTabBuilder setIcon(Item item) { return setIcon(() -> new ItemStack(item)); } @@ -60,6 +71,10 @@ public void setTexture(String texture) { this.texture = texture; } + /** + * Build ItemGroup (If loader is forge, not recommended) + * @return ItemGroup + */ public ItemGroup build() { return CreativeTabRegistry.create((builder -> { if (displayName != null) builder.displayName(displayName); @@ -72,4 +87,8 @@ public ItemGroup build() { if (texture != null) builder.texture(texture); })); } + + public Identifier getIdentifier() { + return identifier; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java index 469b2cc8d..4a971d0e2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java @@ -6,6 +6,9 @@ import java.util.function.Supplier; +/** + * Use {@link CompatibleItemSettings} instead. + */ public class ExtendSettings extends Item.Settings { // ～1.19.2 @@ -18,12 +21,14 @@ public ExtendSettings addGroup(ItemGroup itemGroup) { // identifier: Item ID @Deprecated public ExtendSettings addGroup(ItemGroup itemGroup, Identifier identifier) { + this.arch$tab(itemGroup); CreativeTabManager.addItem(itemGroup, identifier); return this; } + @Deprecated public ExtendSettings addGroup(Supplier itemGroup, Identifier identifier) { - CreativeTabManager.addItem(itemGroup, identifier); + //CreativeTabManager.addItem(itemGroup, identifier); return this; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index e535950ea..6f414679a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -17,6 +17,7 @@ import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerTypeBuilder; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.CreativeTabManager; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import net.pitan76.mcpitanlib.api.util.BlockUtil; @@ -29,8 +30,11 @@ public class CompatRegistry { - private final MCPLRegistry mcplr; - private final MCPLRegistry1_20 mcplr1_20; + protected final MCPLRegistry mcplr; + protected final MCPLRegistry1_20 mcplr1_20; + protected final WorldGenRegistry worldGenRegistry; + + protected String MOD_ID; /** * @deprecated Use {@link #createRegistry(String)} instead @@ -38,7 +42,9 @@ public class CompatRegistry { @Deprecated public CompatRegistry(String MOD_ID) { mcplr = new MCPLRegistry(MOD_ID); - mcplr1_20 = new MCPLRegistry1_20(mcplr); + mcplr1_20 = new MCPLRegistry1_20(mcplr, MOD_ID); + worldGenRegistry = new WorldGenRegistry(MOD_ID); + this.MOD_ID = MOD_ID; } /** @@ -114,6 +120,10 @@ public RegistryResult registerItemGroup(Identifier id, Supplier(mcplr1_20.registryItemGroup(id, supplier)); } + public RegistryResult registerItemGroup(Identifier id, CreativeTabBuilder builder) { + return new RegistryResult<>(mcplr1_20.registryItemGroup(id, builder)); + } + public static void registerFuel(int time, ItemConvertible... item) { FuelRegistry.register(time, item); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/WorldGenRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/WorldGenRegistry.java new file mode 100644 index 000000000..4a4071011 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/WorldGenRegistry.java @@ -0,0 +1,107 @@ +package net.pitan76.mcpitanlib.api.registry; + +import dev.architectury.registry.level.biome.BiomeModifications; +import dev.architectury.registry.registries.DeferredRegister; +import dev.architectury.registry.registries.RegistrySupplier; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.PlacedFeature; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; + +import java.util.function.Supplier; + +public class WorldGenRegistry { + protected String MOD_ID; + + protected DeferredRegister> CONFIGURED_FEATURE; + protected DeferredRegister PLACED_FEATURE; + + @Deprecated + public WorldGenRegistry(String MOD_ID) { + this.MOD_ID = MOD_ID; + CONFIGURED_FEATURE = DeferredRegister.create(MOD_ID, RegistryKeys.CONFIGURED_FEATURE); + PLACED_FEATURE = DeferredRegister.create(MOD_ID, RegistryKeys.PLACED_FEATURE); + } + + /** + * Create a new CompatRegistry + * @param MOD_ID The mod id + * @return The new CompatRegistry + */ + public static WorldGenRegistry createRegistry(String MOD_ID) { + return new WorldGenRegistry(MOD_ID); + } + + public static WorldGenRegistry createRegistry(CompatRegistry registry) { + return registry.worldGenRegistry; + } + + /** + * Register a configured feature + * @param id The id of the configured feature + * @param supplier The supplier of the configured feature + * @return The result of the registration + */ + public RegistryResult> registerFeature(Identifier id, Supplier> supplier) { + RegistrySupplier> feature = CONFIGURED_FEATURE.register(id, supplier); + return new RegistryResult<>(feature); + } + + /** + * Register a placed feature + * @param id The id of the placed feature + * @param supplier The supplier of the placed feature + * @return The result of the registration + */ + public RegistryResult registerPlacedFeature(Identifier id, Supplier supplier) { + RegistrySupplier feature = PLACED_FEATURE.register(id, supplier); + return new RegistryResult<>(feature); + } + + /** + * Replace the properties of a biome + * @param decoration The decoration step + * @param feature The feature to replace + */ + public static void replaceProperties(GenerationStep.Feature decoration, RegistrySupplier feature) { + BiomeModifications.replaceProperties((ctx, mutable) -> mutable.getGenerationProperties().addFeature(decoration, feature)); + } + + public static void replaceProperties(GenerationStep.Feature decoration, RegistryResult feature) { + replaceProperties(decoration, feature.supplier); + } + + /** + * Replace the properties of a biome + * @param decoration The decoration step + * @param feature The feature to replace + */ + public static void replaceProperties(GenerationStep.Feature decoration, PlacedFeature feature) { + BiomeModifications.replaceProperties((ctx, mutable) -> mutable.getGenerationProperties().addFeature(decoration, RegistryEntry.of(feature))); + } + + /** + * Add a feature to the biome properties + * @param decoration The decoration step + * @param feature The feature to add + */ + public static void addProperties(GenerationStep.Feature decoration, RegistrySupplier feature) { + BiomeModifications.addProperties((ctx, mutable) -> mutable.getGenerationProperties().addFeature(decoration, feature)); + } + + public static void addProperties(GenerationStep.Feature decoration, RegistryResult feature) { + addProperties(decoration, feature.supplier); + } + + /** + * Add a feature to the biome properties + * @param decoration The decoration step + * @param feature The feature to add + */ + public static void addProperties(GenerationStep.Feature decoration, PlacedFeature feature) { + BiomeModifications.addProperties((ctx, mutable) -> mutable.getGenerationProperties().addFeature(decoration, RegistryEntry.of(feature))); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FeatureConfigUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FeatureConfigUtil.java new file mode 100644 index 000000000..5b2a4a017 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FeatureConfigUtil.java @@ -0,0 +1,81 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.structure.rule.RuleTest; +import net.minecraft.structure.rule.TagMatchRuleTest; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.OreFeatureConfig; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class FeatureConfigUtil { + + /** + * Create a new ConfiguredFeature + * @param oreFeatureConfig The ore feature config + * @return The new ConfiguredFeature + */ + public static ConfiguredFeature createConfiguredFeature(OreFeatureConfig oreFeatureConfig) { + return new ConfiguredFeature<>(Feature.ORE, oreFeatureConfig); + } + + /** + * Create a new OreFeatureConfig + * @param test The rule test + * @param state The block state + * @param size The size + * @return The new OreFeatureConfig + */ + public static OreFeatureConfig createOreFeatureConfig(RuleTest test, BlockState state, int size) { + return new OreFeatureConfig(test, state, size); + } + + /** + * Create a new OreFeatureConfig + * @param test The rule test + * @param block The block + * @param size The size + * @return The new OreFeatureConfig + */ + public static OreFeatureConfig createOreFeatureConfig(RuleTest test, Block block, int size) { + return createOreFeatureConfig(test, block.getDefaultState(), size); + } + + /** + * Create a new OreFeatureConfig + * @param targets The targets + * @param size The size + * @return The new OreFeatureConfig + */ + public static OreFeatureConfig createOreFeatureConfig(List targets, int size) { + return new OreFeatureConfig(targets, size); + } + + /** + * Create a new OreFeatureConfig + * @param targetMap The target map + * @param size The size + * @return The new OreFeatureConfig + */ + public static OreFeatureConfig createOreFeatureConfig(Map targetMap, int size) { + List targets = new ArrayList<>(); + targetMap.forEach((ruleTest, blockState) -> targets.add(OreFeatureConfig.createTarget(ruleTest, blockState))); + return createOreFeatureConfig(targets, size); + } + + /** + * Create a new OreFeatureConfig + * @param state The block state + * @param size The size + * @return The new OreFeatureConfig + */ + public static OreFeatureConfig createStoneOreFeatureConfig(BlockState state, int size) { + RuleTest ruleTest = new TagMatchRuleTest(BlockTags.BASE_STONE_OVERWORLD); + return createOreFeatureConfig(ruleTest, state, size); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java new file mode 100644 index 000000000..ffed05079 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.world.gen.YOffset; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.PlacedFeature; +import net.minecraft.world.gen.placementmodifier.*; + +import java.util.List; + +public class PlacedFutureUtil { + public static PlacedFeature create(ConfiguredFeature configuredFeature, List placementModifiers) { + return new PlacedFeature(RegistryEntry.of(configuredFeature), placementModifiers); + } + + public static List createPlacementModifiers(CountPlacementModifier countPlacementModifier, SquarePlacementModifier squarePlacementModifier, HeightRangePlacementModifier heightRangePlacementModifier) { + return List.of(countPlacementModifier, squarePlacementModifier, heightRangePlacementModifier); + } + + public static List createPlacementModifiers(int chunkCount, int top, int bottom) { + return createPlacementModifiers( +CountPlacementModifier.of(chunkCount), + SquarePlacementModifier.of(), + HeightRangePlacementModifier.uniform(YOffset.fixed(bottom), YOffset.fixed(top)) + ); + } + + public static List createPlacementModifiers(int chunkCount, int top) { + return createPlacementModifiers( + CountPlacementModifier.of(chunkCount), + SquarePlacementModifier.of(), + HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(top)) + ); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java index 5f6c68868..dbfb41d92 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java @@ -1,26 +1,40 @@ package net.pitan76.mcpitanlib.core.registry; +import dev.architectury.registry.registries.DeferredRegister; import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.item.ItemGroup; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; +import java.util.HashMap; +import java.util.Map; import java.util.function.Supplier; @Deprecated public class MCPLRegistry1_20 { - private final MCPLRegistry mcplr; + @Deprecated + public static final Map> REGISTRY_SUPPLIER_ITEM_GROUP_CACHE = new HashMap<>(); - public Registrar ITEM_GROUP; + private final MCPLRegistry mcplr; + protected DeferredRegister ITEM_GROUP; - public MCPLRegistry1_20(MCPLRegistry mcplr) { + public MCPLRegistry1_20(MCPLRegistry mcplr, String MOD_ID) { this.mcplr = mcplr; - ITEM_GROUP = mcplr.REGISTRIES.get().get(RegistryKeys.ITEM_GROUP); + ITEM_GROUP = DeferredRegister.create(MOD_ID, RegistryKeys.ITEM_GROUP); } public RegistrySupplier registryItemGroup(Identifier id, Supplier supplier) { - return ITEM_GROUP.register(id, supplier); + RegistrySupplier itemGroup = ITEM_GROUP.register(id, supplier); + REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.put(id, itemGroup); + return itemGroup; + } + + public RegistrySupplier registryItemGroup(Identifier id, CreativeTabBuilder builder) { + RegistrySupplier itemGroup = ITEM_GROUP.register(id, builder::build); + REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.put(id, itemGroup); + return itemGroup; } } From 62ca3bd2728f991fab018d52db28d981a3d19a4f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:46:46 +0900 Subject: [PATCH 257/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index e70cdca41..220a1c255 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.5 +mod_version=2.0.6 maven_group=net.pitan76 \ No newline at end of file From 7980e65ad3f2eaa250fbb2d88907becd153a48ee Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:09:30 +0900 Subject: [PATCH 258/622] fix apis --- .../pitan76/mcpitanlib/api/item/CompatibleItemSettings.java | 3 --- .../java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java | 2 +- .../mcpitanlib/api/item/tool/CompatibleToolMaterial.java | 3 ++- .../net/pitan76/mcpitanlib/api/registry/CompatRegistry.java | 2 ++ .../pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java | 4 ++++ info.properties | 2 +- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index b24588bb4..5f0e37214 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -20,7 +20,6 @@ public static CompatibleItemSettings of() { } // ～1.19.2 - @Deprecated public CompatibleItemSettings addGroup(ItemGroup itemGroup) { settings.addGroup(itemGroup); return this; @@ -28,13 +27,11 @@ public CompatibleItemSettings addGroup(ItemGroup itemGroup) { // 1.19.3～ // identifier: Item ID - @Deprecated public CompatibleItemSettings addGroup(ItemGroup itemGroup, Identifier identifier) { settings.addGroup(itemGroup, identifier); return this; } - @Deprecated public CompatibleItemSettings addGroup(Supplier itemGroup, Identifier identifier) { settings.addGroup(itemGroup, identifier); return this; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java index 4a971d0e2..bbf502359 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendSettings.java @@ -28,7 +28,7 @@ public ExtendSettings addGroup(ItemGroup itemGroup, Identifier identifier) { @Deprecated public ExtendSettings addGroup(Supplier itemGroup, Identifier identifier) { - //CreativeTabManager.addItem(itemGroup, identifier); + CreativeTabManager.addItem(itemGroup, identifier); return this; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java index 22631df08..9d0e28410 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java @@ -3,4 +3,5 @@ import net.minecraft.item.ToolMaterial; public interface CompatibleToolMaterial extends ToolMaterial { -} + +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index 6f414679a..aeb09efb1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -132,6 +132,8 @@ public void allRegister() { // 1.16 Register mcplr.allRegister1_16(); + mcplr1_20.register(); + // ItemGroup CreativeTabManager.allRegister(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java index dbfb41d92..fa1ea5630 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java @@ -26,6 +26,10 @@ public MCPLRegistry1_20(MCPLRegistry mcplr, String MOD_ID) { ITEM_GROUP = DeferredRegister.create(MOD_ID, RegistryKeys.ITEM_GROUP); } + public void register() { + ITEM_GROUP.register(); + } + public RegistrySupplier registryItemGroup(Identifier id, Supplier supplier) { RegistrySupplier itemGroup = ITEM_GROUP.register(id, supplier); REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.put(id, itemGroup); diff --git a/info.properties b/info.properties index 220a1c255..d0f52a643 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.6 +mod_version=2.0.7 maven_group=net.pitan76 \ No newline at end of file From 83e599aca74e20537f15ab75d3d39a1126bb3927 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 19 Feb 2024 17:16:02 +0900 Subject: [PATCH 259/622] getCompatMiningLevel --- .../api/item/tool/CompatibleToolMaterial.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java index 9d0e28410..be0a037f9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java @@ -1,7 +1,29 @@ package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; public interface CompatibleToolMaterial extends ToolMaterial { + @Deprecated + @Override + default int getMiningLevel() { + return getCompatMiningLevel(); + } + int getCompatMiningLevel(); + + @Override + float getAttackDamage(); + + @Override + float getMiningSpeedMultiplier(); + + @Override + Ingredient getRepairIngredient(); + + @Override + int getDurability(); + + @Override + int getEnchantability(); } \ No newline at end of file From 43094c5b8dfd25f80692ac0a1af4ea3f596e08ab Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 20 Feb 2024 00:46:26 +0900 Subject: [PATCH 260/622] add apis --- .../api/item/tool/CompatibleToolMaterial.java | 40 +++++- .../api/util/ArmorMaterialUtil.java | 128 ++++++++++++++++++ .../mcpitanlib/api/util/ToolMaterialUtil.java | 40 ++++++ info.properties | 2 +- 4 files changed, 202 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java index be0a037f9..bbd737fd7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java @@ -4,26 +4,52 @@ import net.minecraft.recipe.Ingredient; public interface CompatibleToolMaterial extends ToolMaterial { + + int getCompatMiningLevel(); + + float getCompatAttackDamage(); + + float getCompatMiningSpeedMultiplier(); + + Ingredient getCompatRepairIngredient(); + + int getCompatDurability(); + + int getCompatEnchantability(); + @Deprecated @Override default int getMiningLevel() { return getCompatMiningLevel(); } - int getCompatMiningLevel(); - + @Deprecated @Override - float getAttackDamage(); + default float getAttackDamage() { + return getCompatAttackDamage(); + } + @Deprecated @Override - float getMiningSpeedMultiplier(); + default float getMiningSpeedMultiplier() { + return getCompatMiningSpeedMultiplier(); + } + @Deprecated @Override - Ingredient getRepairIngredient(); + default Ingredient getRepairIngredient() { + return getCompatRepairIngredient(); + } + @Deprecated @Override - int getDurability(); + default int getDurability() { + return getCompatDurability(); + } + @Deprecated @Override - int getEnchantability(); + default int getEnchantability() { + return getCompatEnchantability(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java new file mode 100644 index 000000000..1957cfe9e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java @@ -0,0 +1,128 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.recipe.Ingredient; +import net.minecraft.sound.SoundEvent; +import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; +import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; + +public class ArmorMaterialUtil { + public static CompatibleArmorMaterial create(String name, int[] durability, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { + return new CompatibleArmorMaterial() { + @Override + public int getDurability(ArmorEquipmentType type) { + switch (type.getSlot()) { + case HEAD -> { + return durability[0]; + } + case CHEST -> { + return durability[1]; + } + case LEGS -> { + return durability[2]; + } + case FEET -> { + return durability[3]; + } + default -> { + return 0; + } + } + } + + @Override + public int getProtection(ArmorEquipmentType type) { + switch (type.getSlot()) { + case HEAD -> { + return protectionAmounts[0]; + } + case CHEST -> { + return protectionAmounts[1]; + } + case LEGS -> { + return protectionAmounts[2]; + } + case FEET -> { + return protectionAmounts[3]; + } + default -> { + return 0; + } + } + } + + @Override + public int getEnchantability() { + return enchantability; + } + + @Override + public SoundEvent getEquipSound() { + return equipSound; + } + + @Override + public Ingredient getRepairIngredient() { + return repairIngredient; + } + + @Override + public String getName() { + return name; + } + + @Override + public float getToughness() { + return toughness; + } + + @Override + public float getKnockbackResistance() { + return knockbackResistance; + } + }; + } + + public static CompatibleArmorMaterial create(String name, int durability, int protectionAmount, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { + return new CompatibleArmorMaterial() { + @Override + public int getDurability(ArmorEquipmentType type) { + return durability; + } + + @Override + public int getProtection(ArmorEquipmentType type) { + return protectionAmount; + } + + @Override + public int getEnchantability() { + return enchantability; + } + + @Override + public SoundEvent getEquipSound() { + return equipSound; + } + + @Override + public Ingredient getRepairIngredient() { + return repairIngredient; + } + + @Override + public String getName() { + return name; + } + + @Override + public float getToughness() { + return toughness; + } + + @Override + public float getKnockbackResistance() { + return knockbackResistance; + } + }; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java new file mode 100644 index 000000000..1a61aa75d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.recipe.Ingredient; +import net.pitan76.mcpitanlib.api.item.tool.CompatibleToolMaterial; + +public class ToolMaterialUtil { + public CompatibleToolMaterial create(int miningLevel, int durability, float miningSpeed, float attackDamage, int enchantability, Ingredient repairIngredient) { + return new CompatibleToolMaterial() { + @Override + public int getCompatMiningLevel() { + return miningLevel; + } + + @Override + public int getCompatDurability() { + return durability; + } + + @Override + public float getCompatMiningSpeedMultiplier() { + return miningSpeed; + } + + @Override + public Ingredient getCompatRepairIngredient() { + return repairIngredient; + } + + @Override + public float getCompatAttackDamage() { + return attackDamage; + } + + @Override + public int getCompatEnchantability() { + return enchantability; + } + }; + } +} diff --git a/info.properties b/info.properties index d0f52a643..8df57b8e6 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.7 +mod_version=2.0.8 maven_group=net.pitan76 \ No newline at end of file From bf2e01ad7f28cd14dc0038f82bcde47979d8c950 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:07:55 +0900 Subject: [PATCH 261/622] renderWidget --- .../api/client/gui/widget/CompatibleTexturedButtonWidget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java index f25874171..6d9c2ab44 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -48,7 +48,7 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt int i = v; if (!this.isNarratable()) { i = v + hoveredVOffset * 2; - } else if (this.isSelected()) { + } else if (this.isHovered() || this.isFocused()) { i = v + hoveredVOffset; } context.drawTexture(texture, this.getX(), this.getY(), u, i, this.width, this.height, textureWidth, textureHeight); From c76537248d325e6a2e22b445cfb117711725d817 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:11:44 +0900 Subject: [PATCH 262/622] renderWidget hovered --- .../api/client/gui/widget/CompatibleTexturedButtonWidget.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java index 6d9c2ab44..ee4013b59 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -48,8 +48,8 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt int i = v; if (!this.isNarratable()) { i = v + hoveredVOffset * 2; - } else if (this.isHovered() || this.isFocused()) { - i = v + hoveredVOffset; + } else if (this.isHovered()) { + i += hoveredVOffset; } context.drawTexture(texture, this.getX(), this.getY(), u, i, this.width, this.height, textureWidth, textureHeight); } From 2b1ec823bc292e6b04eff688be4a1afedefa7b92 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:12:02 +0900 Subject: [PATCH 263/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 8df57b8e6..312741e15 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.8 +mod_version=2.0.9 maven_group=net.pitan76 \ No newline at end of file From 08ac1fcb7264a6b24db35084edeada5d1432aaa1 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:49:16 +0900 Subject: [PATCH 264/622] optimize imports --- .../net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java index fa1ea5630..52a1d7fca 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_20.java @@ -1,7 +1,6 @@ package net.pitan76.mcpitanlib.core.registry; import dev.architectury.registry.registries.DeferredRegister; -import dev.architectury.registry.registries.Registrar; import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.item.ItemGroup; import net.minecraft.registry.RegistryKeys; From 4ed45334f7d543eeb88b51b001185e4167fd8358 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:49:20 +0900 Subject: [PATCH 265/622] optimize imports --- .../pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java | 1 - .../net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java | 2 -- .../net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java | 5 ++++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java index c8587bd0c..d642de247 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java @@ -5,7 +5,6 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawForegroundArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java index 7b5c6e7bb..86ee7914b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java @@ -8,8 +8,6 @@ import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.TextUtil; -import java.util.HashMap; -import java.util.Map; import java.util.function.Supplier; public class CreativeTabBuilder { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java index ffed05079..228e4eedd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlacedFutureUtil.java @@ -4,7 +4,10 @@ import net.minecraft.world.gen.YOffset; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.PlacedFeature; -import net.minecraft.world.gen.placementmodifier.*; +import net.minecraft.world.gen.placementmodifier.CountPlacementModifier; +import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier; +import net.minecraft.world.gen.placementmodifier.PlacementModifier; +import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier; import java.util.List; From 4086cb0839044eccfca2d82e387bc659cd809b3c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:49:23 +0900 Subject: [PATCH 266/622] add APIs v2.1-series --- .../net/pitan76/easyapi/config/Config.java | 28 +++++-- .../mcpitanlib/api/block/ExtendBlock.java | 18 +++++ .../api/event/block/BlockUseEvent.java | 5 +- .../api/event/block/DroppedStacksArgs.java | 30 ++++++++ .../event/block/ScreenHandlerCreateEvent.java | 28 +++++++ .../api/event/block/StateReplacedEvent.java | 7 +- .../api/event/item/PostHitEvent.java | 41 ++++++++++ .../api/event/item/PostMineEvent.java | 77 +++++++++++++++++++ .../mcpitanlib/api/item/ExtendItem.java | 32 ++++++++ .../api/item/ExtendItemProvider.java | 20 +++++ .../api/item/tool/CompatibleAxeItem.java | 35 +++++++++ .../api/item/tool/CompatibleHoeItem.java | 35 +++++++++ .../item/tool/CompatibleMiningToolItem.java | 76 ++++++++++++++++++ .../api/item/tool/CompatiblePickaxeItem.java | 35 +++++++++ .../api/item/tool/CompatibleShearsItem.java | 72 +++++++++++++++++ .../api/item/tool/CompatibleShovelItem.java | 35 +++++++++ .../api/item/tool/CompatibleSwordItem.java | 35 +++++++++ .../api/item/tool/CompatibleToolItem.java | 74 ++++++++++++++++++ .../api/registry/CompatRegistry.java | 16 +++- .../mcpitanlib/api/util/DamageSourceUtil.java | 4 + .../mcpitanlib/api/util/WorldUtil.java | 27 +++++++ .../api/util/client/ScreenUtil.java | 16 +--- .../client/widget/ClickableWidgetUtil.java | 10 +++ .../api/util/client/widget/TextFieldUtil.java | 26 +++++++ .../pitan76/mcpitanlib/mixin/ItemMixin.java | 23 ++++++ info.properties | 2 +- 26 files changed, 781 insertions(+), 26 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/ClickableWidgetUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java diff --git a/common/src/main/java/net/pitan76/easyapi/config/Config.java b/common/src/main/java/net/pitan76/easyapi/config/Config.java index c1fd89093..a24d9d3d1 100644 --- a/common/src/main/java/net/pitan76/easyapi/config/Config.java +++ b/common/src/main/java/net/pitan76/easyapi/config/Config.java @@ -10,7 +10,7 @@ public class Config implements IConfig { /** * 任意ファイルを読み込み、Mapへ変換 * - * @param file + * @param file ファイル */ public Config(File file) { load(file); @@ -19,7 +19,7 @@ public Config(File file) { /** * 任意ファイルを読み込み、Mapへ変換 * - * @param file + * @param file ファイル名 */ public Config(String file) { this(new File(file)); @@ -30,7 +30,7 @@ public Config(String file) { /** * Configの変換 * - * @param config + * @param config Config */ public Config(Config config) { configMap = config.configMap; @@ -89,7 +89,7 @@ public String getString(String key) { } /** - * マップのキーから値(数値)を取得 + * マップのキーから値(整数)を取得 * "."でパスを区切る * * @param key キー @@ -109,6 +109,13 @@ public int getInt(String key) { return (Integer) obj; } + /** + * マップのキーから値(数値)を取得 + * "."でパスを区切る + * + * @param key キー + * @return 取得した値 + */ public double getDouble(String key) { return (Double) get(key); } @@ -159,7 +166,7 @@ public String getStringOrDefault(String key, String defaultValue) { } /** - * マップのキーから値(数値)を取得、存在しない場合はデフォルト値を返す + * マップのキーから値(整数)を取得、存在しない場合はデフォルト値を返す * "."でパスを区切る * * @param key キー @@ -264,7 +271,7 @@ public boolean setString(String key, String value) { } /** - * マップのキーに値(数値)をセット + * マップのキーに値(整数)をセット * "."でパスを区切る * 失敗するとfalseを返す * @@ -276,6 +283,15 @@ public boolean setInt(String key, int value) { return set(key, value); } + /** + * マップのキーに値(数値)をセット + * "."でパスを区切る + * 失敗するとfalseを返す + * + * @param key キー + * @param value 値 + * @return 真偽値 + */ public boolean setDouble(String key, double value) { return set(key, value); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 0944c1898..5a8fb4fb8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -6,6 +6,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; @@ -25,6 +26,8 @@ import net.pitan76.mcpitanlib.api.util.TextUtil; import org.jetbrains.annotations.Nullable; +import java.util.List; + public class ExtendBlock extends Block { public ExtendBlock(Settings settings) { super(settings); @@ -179,4 +182,19 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt public void onStateReplaced(StateReplacedEvent event) { super.onStateReplaced(event.state, event.world, event.pos, event.newState, event.moved); } + + @Deprecated + @Override + public List getDroppedStacks(BlockState state, LootContextParameterSet.Builder builder) { + return getDroppedStacks(new DroppedStacksArgs(state, builder)); + } + + /** + * block dropped stacks event + * @param args DroppedStacksArgs + * @return List + */ + public List getDroppedStacks(DroppedStacksArgs args) { + return super.getDroppedStacks(args.state, args.builder); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java index 6f20ad6a1..27ac0f670 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java @@ -11,6 +11,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; public class BlockUseEvent extends BaseEvent { public BlockState state; @@ -84,7 +85,7 @@ public ActionResult consume() { * @return true if the block has a block entity */ public boolean hasBlockEntity() { - return world.getBlockEntity(pos) != null; + return WorldUtil.hasBlockEntity(world, pos); } /** @@ -92,6 +93,6 @@ public boolean hasBlockEntity() { * @return the block entity of the block */ public BlockEntity getBlockEntity() { - return world.getBlockEntity(pos); + return WorldUtil.getBlockEntity(world, pos); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java new file mode 100644 index 000000000..edb85cb20 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java @@ -0,0 +1,30 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.loot.context.LootContextParameterSet; +import net.minecraft.loot.context.LootContextParameters; +import net.pitan76.mcpitanlib.api.event.BaseEvent; + +public class DroppedStacksArgs extends BaseEvent { + public BlockState state; + public LootContextParameterSet.Builder builder; + + public DroppedStacksArgs(BlockState state, LootContextParameterSet.Builder builder) { + this.state = state; + this.builder = builder; + } + + public BlockState getState() { + return state; + } + + @Deprecated + public LootContextParameterSet.Builder getBuilder() { + return builder; + } + + public BlockEntity getBlockEntity() { + return builder.get(LootContextParameters.BLOCK_ENTITY); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java index 603fb0d27..013f0c069 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ScreenHandlerCreateEvent.java @@ -25,4 +25,32 @@ public ScreenHandlerCreateEvent(BlockState state, World world, BlockPos pos, int this.inventory = inventory; this.player = new Player(player); } + + public BlockState getState() { + return state; + } + + public BlockPos getPos() { + return pos; + } + + public World getWorld() { + return world; + } + + public int getSyncId() { + return syncId; + } + + public PlayerInventory getInventory() { + return inventory; + } + + public Player getPlayer() { + return player; + } + + public boolean isClient() { + return world.isClient; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java index 4cbe8096d..3e08d355c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java @@ -7,6 +7,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; public class StateReplacedEvent extends BaseEvent { @@ -61,7 +62,7 @@ public boolean isSameState() { * @return BlockEntity */ public boolean hasBlockEntity() { - return world.getBlockEntity(pos) != null; + return WorldUtil.hasBlockEntity(world, pos); } /** @@ -69,14 +70,14 @@ public boolean hasBlockEntity() { * @return BlockEntity */ public BlockEntity getBlockEntity() { - return world.getBlockEntity(pos); + return WorldUtil.getBlockEntity(world, pos); } /** * spawn the drops in the container */ public void spawnDropsInContainer() { - BlockEntity blockEntity = world.getBlockEntity(pos); + BlockEntity blockEntity = getBlockEntity(); if (blockEntity instanceof Inventory) { Inventory inventory = (Inventory) blockEntity; ItemScatterer.spawn(world, pos, inventory); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java new file mode 100644 index 000000000..ee9d20894 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java @@ -0,0 +1,41 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.event.BaseEvent; + +public class PostHitEvent extends BaseEvent { + public ItemStack stack; + public LivingEntity target; + public LivingEntity attacker; + + public PostHitEvent(ItemStack stack, LivingEntity target, LivingEntity attacker) { + this.stack = stack; + this.target = target; + this.attacker = attacker; + } + + public ItemStack getStack() { + return stack; + } + + public LivingEntity getAttacker() { + return attacker; + } + + public LivingEntity getTarget() { + return target; + } + + /** + * Damages the stack in the given slot + * @param amount the amount of damage to deal + * @param slot the slot to damage + */ + public void damageStack(int amount, EquipmentSlot slot) { + stack.damage(amount, attacker, (entity) -> { + entity.sendEquipmentBreakStatus(slot); + }); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java new file mode 100644 index 000000000..153954d77 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java @@ -0,0 +1,77 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +public class PostMineEvent extends BaseEvent { + public ItemStack stack; + public World world; + public BlockState state; + public BlockPos pos; + public LivingEntity miner; + + public PostMineEvent(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + this.stack = stack; + this.world = world; + this.state = state; + this.pos = pos; + this.miner = miner; + } + + public BlockState getState() { + return state; + } + + public BlockPos getPos() { + return pos; + } + + public World getWorld() { + return world; + } + + public ItemStack getStack() { + return stack; + } + + public LivingEntity getMiner() { + return miner; + } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(world, pos); + } + + public boolean isClient() { + return world.isClient; + } + + public boolean stateIsIn(TagKey tagKey) { + return BlockUtil.isIn(state.getBlock(), tagKey); + } + + public boolean stateIsOf(Block block) { + return BlockUtil.isEqual(state.getBlock(), block); + } + + /** + * Damages the stack in the given slot + * @param amount the amount of damage to deal + * @param slot the slot to damage + */ + public void damageStack(int amount, EquipmentSlot slot) { + stack.damage(amount, miner, (entity) -> { + entity.sendEquipmentBreakStatus(slot); + }); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 3b99b5fb1..280e85660 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.item; +import net.minecraft.block.BlockState; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -10,6 +11,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.core.Dummy; @@ -70,6 +72,18 @@ public void onCraft(ItemStack stack, World world) { onCraft(new CraftEvent(stack, world)); } + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + /** * item right click event * @@ -131,4 +145,22 @@ public void appendTooltip(ItemAppendTooltipEvent event) { public void onCraft(CraftEvent event) { super.onCraft(event.stack, event.world); } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java index e8f6a3366..0c7648bf0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java @@ -66,6 +66,26 @@ default void appendTooltip(ItemAppendTooltipEvent event, Options options) { options.cancel = false; } + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + default boolean postHit(PostHitEvent event, Options options) { + options.cancel = false; + return false; + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + default boolean postMine(PostMineEvent event, Options options) { + options.cancel = false; + return false; + } + public static class Options { public boolean cancel = true; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index cdec86aa8..519993d89 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -1,9 +1,14 @@ package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.AxeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterial; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; @@ -35,4 +40,34 @@ public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { return overrideGetMiningSpeedMultiplier(stack, state); } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index f384d4790..870d9cb56 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -1,9 +1,14 @@ package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.HoeItem; import net.minecraft.item.ItemStack; import net.minecraft.item.ToolMaterial; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; @@ -35,4 +40,34 @@ public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { return overrideGetMiningSpeedMultiplier(stack, state); } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java new file mode 100644 index 000000000..c028fc48b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -0,0 +1,76 @@ +package net.pitan76.mcpitanlib.api.item.tool; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.MiningToolItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.tag.TagKey; + +public class CompatibleMiningToolItem extends MiningToolItem implements ExtendItemProvider { + @Deprecated + protected CompatibleMiningToolItem(float attackDamage, float attackSpeed, ToolMaterial material, net.minecraft.registry.tag.TagKey effectiveBlocks, Settings settings) { + super(attackDamage, attackSpeed, material, effectiveBlocks, settings); + } + + public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, TagKey tagKey, CompatibleItemSettings settings) { + this(attackDamage, attackSpeed, material, tagKey.getTagKey(), settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index ef69ed51b..a70c5f4c1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -1,9 +1,14 @@ package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterial; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; @@ -35,4 +40,34 @@ public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { return overrideGetMiningSpeedMultiplier(stack, state); } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java new file mode 100644 index 000000000..fb1811e29 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java @@ -0,0 +1,72 @@ +package net.pitan76.mcpitanlib.api.item.tool; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ShearsItem; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; + +public class CompatibleShearsItem extends ShearsItem implements ExtendItemProvider { + public CompatibleShearsItem(Settings settings) { + super(settings); + } + + public CompatibleShearsItem(CompatibleItemSettings settings) { + this(settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index 7efc94dac..cdfcbb7fd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -1,9 +1,14 @@ package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ShovelItem; import net.minecraft.item.ToolMaterial; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; @@ -35,4 +40,34 @@ public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { return overrideGetMiningSpeedMultiplier(stack, state); } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index e18a53618..605fcccae 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -1,9 +1,14 @@ package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolMaterial; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; @@ -35,4 +40,34 @@ public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { return overrideGetMiningSpeedMultiplier(stack, state); } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java new file mode 100644 index 000000000..41e3c7f87 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java @@ -0,0 +1,74 @@ +package net.pitan76.mcpitanlib.api.item.tool; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolItem; +import net.minecraft.item.ToolMaterial; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; +import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; + +public class CompatibleToolItem extends ToolItem implements ExtendItemProvider { + @Deprecated + protected CompatibleToolItem(ToolMaterial material, Settings settings) { + super(material, settings); + } + + public CompatibleToolItem(CompatibleToolMaterial material, CompatibleItemSettings settings) { + this(material, settings.build()); + } + + public boolean overrideIsSuitableFor(BlockState state) { + return super.isSuitableFor(state); + } + + @Deprecated + @Override + public boolean isSuitableFor(BlockState state) { + return overrideIsSuitableFor(state); + } + + public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return super.getMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state); + } + + @Deprecated + @Override + public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { + return postHit(new PostHitEvent(stack, target, attacker)); + } + + @Deprecated + @Override + public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { + return postMine(new PostMineEvent(stack, world, state, pos, miner)); + } + + /** + * post hit event + * @param event PostHitEvent + * @return boolean + */ + public boolean postHit(PostHitEvent event) { + return super.postHit(event.stack, event.target, event.attacker); + } + + /** + * post mine event + * @param event PostMineEvent + * @return boolean + */ + public boolean postMine(PostMineEvent event) { + return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index aeb09efb1..e0618a0cd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -47,13 +47,21 @@ public CompatRegistry(String MOD_ID) { this.MOD_ID = MOD_ID; } + /** + * create(new CompatRegistry)'s alias + * @see #create(String) + */ + public static CompatRegistry createRegistry(String MOD_ID) { + return new CompatRegistry(MOD_ID); + } + /** * Create a new CompatRegistry * @param MOD_ID The mod id * @return The new CompatRegistry */ - public static CompatRegistry createRegistry(String MOD_ID) { - return new CompatRegistry(MOD_ID); + public static CompatRegistry create(String MOD_ID) { + return createRegistry(MOD_ID); } /** @@ -124,6 +132,10 @@ public RegistryResult registerItemGroup(Identifier id, CreativeTabBui return new RegistryResult<>(mcplr1_20.registryItemGroup(id, builder)); } + public RegistryResult registerItemGroup(CreativeTabBuilder builder) { + return registerItemGroup(builder.getIdentifier(), builder); + } + public static void registerFuel(int time, ItemConvertible... item) { FuelRegistry.register(time, item); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java index 4947a0b3d..b5733480d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DamageSourceUtil.java @@ -37,4 +37,8 @@ public static DamageSource mobProjectile(Entity projectile, LivingEntity attacke public static DamageSource mobProjectile(Entity projectile, LivingEntity attacker) { return mobProjectile(projectile, attacker, projectile); } + + public static DamageSource fall(Entity source) { + return source.getDamageSources().fall(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 7fe15c9ba..bd900209f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -1,11 +1,14 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.ExperienceOrbEntity; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; import net.minecraft.item.ItemStack; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; @@ -147,4 +150,28 @@ public static int getTopY(World world) { public static int getDimensionHeight(World world) { return world.getDimension().height(); } + + public static BlockEntity getBlockEntity(World world, BlockPos pos) { + return world.getBlockEntity(pos); + } + + public static boolean hasBlockEntity(World world, BlockPos pos) { + return getBlockEntity(world, pos) != null; + } + + public static BlockState getBlockState(World world, BlockPos pos) { + return world.getBlockState(pos); + } + + public static FluidState getFluidState(World world, BlockPos pos) { + return world.getFluidState(pos); + } + + public static boolean hasFluidState(World world, BlockPos pos) { + return ! getFluidState(world, pos).isEmpty(); + } + + public static boolean isAir(World world, BlockPos pos) { + return getBlockState(world, pos).isAir(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index 9ea75d4b0..15b37a3c7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -93,20 +93,12 @@ public static Text empty() { } } - public static class TextFieldUtil { - public static void setFocused(TextFieldWidget widget, boolean focused) { - widget.setFocused(focused); - } - - public static void render(TextFieldWidget widget, RenderArgs args) { - widget.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); - } + public static class TextFieldUtil extends net.pitan76.mcpitanlib.api.util.client.widget.TextFieldUtil { + // Nothing } - public static class ClickableWidgetUtil { - public static void render(ClickableWidget widget, RenderArgs args) { - widget.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); - } + public static class ClickableWidgetUtil extends net.pitan76.mcpitanlib.api.util.client.widget.ClickableWidgetUtil { + // Nothing } public static class RendererUtil { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/ClickableWidgetUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/ClickableWidgetUtil.java new file mode 100644 index 000000000..7182eb723 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/ClickableWidgetUtil.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.util.client.widget; + +import net.minecraft.client.gui.widget.ClickableWidget; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; + +public class ClickableWidgetUtil { + public static void render(ClickableWidget widget, RenderArgs args) { + widget.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java new file mode 100644 index 000000000..33114cc19 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.util.client.widget; + +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; + +public class TextFieldUtil { + public static void setFocused(TextFieldWidget widget, boolean focused) { + widget.setFocused(focused); + } + + public static void render(TextFieldWidget widget, RenderArgs args) { + widget.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } + + public static void setEditable(TextFieldWidget widget, boolean editable) { + widget.setEditable(editable); + } + + public static void setMaxLength(TextFieldWidget widget, int maxLength) { + widget.setMaxLength(maxLength); + } + + public static void setSuggestion(TextFieldWidget widget, String suggestion) { + widget.setSuggestion(suggestion); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 9204af80c..c1dc0e421 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.mixin; +import net.minecraft.block.BlockState; import net.minecraft.client.item.TooltipContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -10,6 +11,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; @@ -91,4 +93,25 @@ private void appendTooltip(ItemStack stack, World world, List tooltip, Too } } + @Inject(method = "postHit", at = @At("HEAD"), cancellable = true) + private void postHit(ItemStack stack, LivingEntity target, LivingEntity attacker, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + boolean returnValue = provider.postHit(new PostHitEvent(stack, target, attacker), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "postMine", at = @At("HEAD"), cancellable = true) + private void postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + boolean returnValue = provider.postMine(new PostMineEvent(stack, world, state, pos, miner), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } } diff --git a/info.properties b/info.properties index 312741e15..c4d2dbdc8 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.0.9 +mod_version=2.1.0 maven_group=net.pitan76 \ No newline at end of file From c7c9a6c2f7104b99a116dd0cef4b2a42a2cf41c3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 22 Feb 2024 21:50:02 +0900 Subject: [PATCH 267/622] remove imports --- .../net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index 15b37a3c7..3e6402eaa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -6,8 +6,6 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.ClickableWidget; -import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.OrderedText; import net.minecraft.text.Text; @@ -15,7 +13,6 @@ import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.gui.widget.RedrawableTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) From bbad204cc979a78567e11ee082833da1d10057b8 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:09:36 +0900 Subject: [PATCH 268/622] add APIs --- .../mcpitanlib/api/block/ExtendBlock.java | 29 +++++++++ .../api/event/block/AppendPropertiesArgs.java | 23 +++++++ .../api/event/block/NeighborUpdateEvent.java | 63 +++++++++++++++++++ .../event/item/ItemAppendTooltipEvent.java | 20 ++++++ .../api/event/item/ItemUseOnBlockEvent.java | 15 +++++ .../mcpitanlib/api/util/WorldUtil.java | 40 ++++++++++++ info.properties | 2 +- 7 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 5a8fb4fb8..a01275e6f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -11,6 +11,7 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.world.ServerWorld; +import net.minecraft.state.StateManager; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; @@ -197,4 +198,32 @@ public List getDroppedStacks(BlockState state, LootContextParameterSe public List getDroppedStacks(DroppedStacksArgs args) { return super.getDroppedStacks(args.state, args.builder); } + + @Deprecated + @Override + public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { + neighborUpdate(new NeighborUpdateEvent(state, world, pos, sourceBlock, sourcePos, notify)); + } + + /** + * block neighbor update event + * @param event NeighborUpdateEvent + */ + public void neighborUpdate(NeighborUpdateEvent event) { + super.neighborUpdate(event.state, event.world, event.pos, event.sourceBlock, event.sourcePos, event.notify); + } + + @Deprecated + @Override + public void appendProperties(StateManager.Builder builder) { + appendProperties(new AppendPropertiesArgs(builder)); + } + + /** + * append properties event + * @param args AppendPropertiesArgs + */ + public void appendProperties(AppendPropertiesArgs args) { + super.appendProperties(args.builder); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java new file mode 100644 index 000000000..412e03a58 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.Property; +import net.pitan76.mcpitanlib.api.event.BaseEvent; + +public class AppendPropertiesArgs extends BaseEvent { + public StateManager.Builder builder; + + public AppendPropertiesArgs(StateManager.Builder builder) { + this.builder = builder; + } + + public StateManager.Builder getBuilder() { + return builder; + } + + public void addProperty(Property... properties) { + builder.add(properties); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java new file mode 100644 index 000000000..399bb414a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java @@ -0,0 +1,63 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +public class NeighborUpdateEvent extends BaseEvent { + public BlockState state; + public World world; + public BlockPos pos; + public Block sourceBlock; + public BlockPos sourcePos; + public boolean notify; + + public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { + this.state = state; + this.world = world; + this.pos = pos; + this.sourceBlock = sourceBlock; + this.sourcePos = sourcePos; + this.notify = notify; + } + + public BlockState getState() { + return state; + } + + public World getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public Block getSourceBlock() { + return sourceBlock; + } + + public BlockPos getSourcePos() { + return sourcePos; + } + + public boolean isNotify() { + return notify; + } + + public boolean isReceivingRedstonePower() { + return WorldUtil.isReceivingRedstonePower(world, pos); + } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(world, pos); + } + + public boolean hasBlockEntity() { + return WorldUtil.hasBlockEntity(world, pos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java index cd06bce81..29dfbb2f7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java @@ -37,4 +37,24 @@ public List getTooltip() { public TooltipContext getContext() { return context; } + + public void addTooltip(Text text) { + tooltip.add(text); + } + + public void addTooltip(List texts) { + tooltip.addAll(texts); + } + + public boolean removeTooltip(Text text) { + return tooltip.remove(text); + } + + public boolean isCreative() { + return context.isAdvanced(); + } + + public boolean isAdvanced() { + return context.isAdvanced(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java index 2b124cef1..6145a0855 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.api.event.item; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; @@ -10,6 +12,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; import org.jetbrains.annotations.Nullable; public class ItemUseOnBlockEvent extends BaseEvent { @@ -81,4 +84,16 @@ public ActionResult pass() { public ActionResult consume() { return ActionResult.CONSUME; } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(world, blockPos); + } + + public boolean hasBlockEntity() { + return WorldUtil.hasBlockEntity(world, blockPos); + } + + public BlockState getBlockState() { + return WorldUtil.getBlockState(world, blockPos); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index bd900209f..c20535671 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -174,4 +174,44 @@ public static boolean hasFluidState(World world, BlockPos pos) { public static boolean isAir(World world, BlockPos pos) { return getBlockState(world, pos).isAir(); } + + public static void setBlockState(World world, BlockPos pos, BlockState state, int flags) { + world.setBlockState(pos, state, flags); + } + + public static void setBlockState(World world, BlockPos pos, BlockState state) { + setBlockState(world, pos, state, 3); + } + + public static void setBlockState(World world, BlockPos pos, Block block, int flags) { + setBlockState(world, pos, block.getDefaultState(), flags); + } + + public static void setBlockState(World world, BlockPos pos, Block block) { + setBlockState(world, pos, block, 3); + } + + public static void breakBlock(World world, BlockPos pos, boolean drop) { + world.breakBlock(pos, drop); + } + + public static void breakBlock(World world, BlockPos pos) { + breakBlock(world, pos, true); + } + + public static void breakBlock(World world, BlockPos pos, boolean drop, @Nullable Player player) { + world.breakBlock(pos, drop, player.getPlayerEntity()); + } + + public static void breakBlock(World world, BlockPos pos, @Nullable Player player) { + breakBlock(world, pos, true, player); + } + + public static void removeBlockEntity(World world, BlockPos pos) { + world.removeBlockEntity(pos); + } + + public static void removeBlock(World world, BlockPos pos, boolean move) { + world.removeBlock(pos, move); + } } diff --git a/info.properties b/info.properties index c4d2dbdc8..b7b1b5ac3 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.0 +mod_version=2.1.1 maven_group=net.pitan76 \ No newline at end of file From da7a0035498c16ac55804bfbb104a97587feeb7c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 23 Feb 2024 22:45:31 +0900 Subject: [PATCH 269/622] add APIs --- .../api/util/PlayerManagerUtil.java | 85 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java new file mode 100644 index 000000000..2dbcfa02d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java @@ -0,0 +1,85 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +public class PlayerManagerUtil { + + /** + * Get player by UUID + * @param server MinecraftServer + * @param uuid UUID + * @return Player + */ + public static Player getPlayerByUUID(MinecraftServer server, UUID uuid) { + return PlayerUtil.getPlayerByUUID(server, uuid); + } + + /** + * Get player by name + * @param server MinecraftServer + * @param name String + * @return Player + */ + public static Player getPlayerByName(MinecraftServer server, String name) { + return PlayerUtil.getPlayerByName(server, name); + } + + /** + * Get players by IP + * @param server MinecraftServer + * @param ip String + * @return List + */ + public static List getPlayersByIP(MinecraftServer server, String ip) { + return PlayerUtil.getPlayersByIP(server, ip); + } + + /** + * Get players + * @param server MinecraftServer + * @return List + */ + public static List getPlayers(MinecraftServer server) { + return PlayerUtil.getPlayers(server); + } + + /** + * Get players + * @param world World + * @return List + */ + public static List getPlayers(World world) { + List players = new ArrayList<>(); + for (PlayerEntity p : world.getPlayers()) { + players.add(new Player(p)); + } + return players; + } + + /** + * Get player by UUID + * @param world World + * @param uuid UUID + * @return Player + */ + public static Player getPlayerByUUID(World world, UUID uuid) { + return PlayerUtil.getPlayerByUUID(world, uuid); + } + + /** + * Get player by name + * @param world World + * @param name String + * @return Player + */ + public static Player getPlayerByName(World world, String name) { + return PlayerUtil.getPlayerByName(world, name); + } +} diff --git a/info.properties b/info.properties index b7b1b5ac3..64c4227ff 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.1 +mod_version=2.1.2 maven_group=net.pitan76 \ No newline at end of file From 51f827d873b045c3a93ceb92b73f6253a37c6e61 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 25 Feb 2024 15:17:21 +0900 Subject: [PATCH 270/622] add screen apis --- .../mcpitanlib/api/client/SimpleScreen.java | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java new file mode 100644 index 000000000..5677a318e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -0,0 +1,132 @@ +package net.pitan76.mcpitanlib.api.client; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; + +public abstract class SimpleScreen extends Screen { + + public int width, height; + public TextRenderer textRenderer; + public ItemRenderer itemRenderer; + + public SimpleScreen(Text title) { + super(title); + fixScreen(); + } + + public T addDrawableChild_compatibility(T drawableElement) { + return super.addDrawableChild(drawableElement); + // addButton + } + + public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWidget widget) { + return addDrawableChild_compatibility(widget); + } + + public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { + //ScreenUtil.setBackground(GUI); + //super.drawTexture(matrices, x, y, u, v, width, height); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); + } + + @Deprecated + @Override + public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) { + renderBackground(new RenderArgs(new DrawObjectDM(context), mouseX, mouseY, delta)); + } + + + public void renderBackground(RenderArgs args) { + super.renderBackground(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } + + public void render(RenderArgs args) { + super.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } + + public void resizeOverride(MinecraftClient client, int width, int height) { + } + + public void initOverride() { + } + + @Deprecated + @Override + protected void init() { + super.init(); + fixScreen(); + initOverride(); + } + + @Deprecated + @Override + public void resize(MinecraftClient client, int width, int height) { + super.resize(client, width, height); + fixScreen(); + resizeOverride(client, width, height); + } + + public void fixScreen() { + this.textRenderer = super.textRenderer; + this.itemRenderer = MinecraftClient.getInstance().getItemRenderer(); + this.width = super.width; + this.height = super.height; + } + + public void setTextRenderer(TextRenderer textRenderer) { + this.textRenderer = textRenderer; + super.textRenderer = textRenderer; + } + + public void setItemRenderer(ItemRenderer itemRenderer) { + this.itemRenderer = itemRenderer; + } + + public void setWidth(int width) { + this.width = width; + super.width = width; + } + + public void setHeight(int height) { + this.height = height; + super.height = height; + } + + @Deprecated + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + DrawObjectDM drawObjectDM = new DrawObjectDM(context); + render(new RenderArgs(drawObjectDM, mouseX, mouseY, delta)); + } + + public boolean keyReleased(KeyEventArgs args) { + return super.keyReleased(args.keyCode, args.scanCode, args.modifiers); + } + + public boolean keyPressed(KeyEventArgs args) { + return super.keyPressed(args.keyCode, args.scanCode, args.modifiers); + } + + @Deprecated + @Override + public boolean keyReleased(int keyCode, int scanCode, int modifiers) { + return this.keyReleased(new KeyEventArgs(keyCode, scanCode, modifiers)); + } + + @Deprecated + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + return this.keyPressed(new KeyEventArgs(keyCode, scanCode, modifiers)); + } +} From 51a84736c75169b9a8fec8a5cccaffee0b96d029 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 25 Feb 2024 15:57:17 +0900 Subject: [PATCH 271/622] ver --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 64c4227ff..3263f8e7e 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.2 +mod_version=2.1.3 maven_group=net.pitan76 \ No newline at end of file From 282b9be544c62c4c3197afd8102156c24ffa3125 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:39:46 +0900 Subject: [PATCH 272/622] add apis --- .../api/client/SimpleOptionsScreen.java | 27 +++++++++++++++++++ .../api/command/argument/DoubleCommand.java | 19 +++++++++++++ .../api/command/argument/FloatCommand.java | 19 +++++++++++++ .../api/event/DoubleCommandEvent.java | 11 ++++++++ .../api/event/FloatCommandEvent.java | 10 +++++++ 5 files changed, 86 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleOptionsScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/FloatCommand.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/FloatCommandEvent.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleOptionsScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleOptionsScreen.java new file mode 100644 index 000000000..572621b5a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleOptionsScreen.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.client; + +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.option.GameOptions; +import net.minecraft.text.Text; + +public class SimpleOptionsScreen extends SimpleScreen { + + protected final Screen parent; + protected final GameOptions gameOptions; + + public SimpleOptionsScreen(Text title, Screen parent, GameOptions gameOptions) { + super(title); + this.parent = parent; + this.gameOptions = gameOptions; + } + + @Override + public void removed() { + client.options.write(); + } + + @Override + public void close() { + client.setScreen(this.parent); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java new file mode 100644 index 000000000..74453b865 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.command.argument; + +import com.mojang.brigadier.arguments.DoubleArgumentType; +import net.pitan76.mcpitanlib.api.event.DoubleCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; + +public abstract class DoubleCommand extends RequiredCommand { + @Override + public DoubleArgumentType getArgumentType() { + return DoubleArgumentType.doubleArg(); + } + + public abstract void execute(DoubleCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((DoubleCommandEvent) event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/FloatCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/FloatCommand.java new file mode 100644 index 000000000..1b178e01b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/FloatCommand.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.command.argument; + +import com.mojang.brigadier.arguments.FloatArgumentType; +import net.pitan76.mcpitanlib.api.event.FloatCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; + +public abstract class FloatCommand extends RequiredCommand { + @Override + public FloatArgumentType getArgumentType() { + return FloatArgumentType.floatArg(); + } + + public abstract void execute(FloatCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((FloatCommandEvent) event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java new file mode 100644 index 000000000..09fe6e051 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java @@ -0,0 +1,11 @@ +package net.pitan76.mcpitanlib.api.event; + +import com.mojang.brigadier.arguments.DoubleArgumentType; +import com.mojang.brigadier.arguments.FloatArgumentType; +import net.pitan76.mcpitanlib.api.command.argument.FloatCommand; + +public class DoubleCommandEvent extends RequiredCommandEvent { + public Double getValue() { + return DoubleArgumentType.getDouble(context, ((FloatCommand) getCommand()).getArgumentName()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/FloatCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/FloatCommandEvent.java new file mode 100644 index 000000000..931d4e194 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/FloatCommandEvent.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.event; + +import com.mojang.brigadier.arguments.FloatArgumentType; +import net.pitan76.mcpitanlib.api.command.argument.FloatCommand; + +public class FloatCommandEvent extends RequiredCommandEvent { + public Float getValue() { + return FloatArgumentType.getFloat(context, ((FloatCommand) getCommand()).getArgumentName()); + } +} From b27a40ab6b4295116f9675d12799bb6ed51ef348 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 1 Mar 2024 15:40:16 +0900 Subject: [PATCH 273/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 3263f8e7e..30544b72b 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.3 +mod_version=2.1.4 maven_group=net.pitan76 \ No newline at end of file From 1c50fe50b751d71cbd84cded8990ed11226724f9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 00:41:25 +0900 Subject: [PATCH 274/622] fix --- .../main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java index 1e7813136..3888d10a7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -19,7 +19,7 @@ public class BlockUtil { * @return Block of the Identifier. */ public static Block block(Identifier id) { - return Registries.BLOCK.get(id); + return BlockUtilV1.block(id); } /** From d0436a869243244a83e5ecf44cc4e9b81952243a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 00:46:13 +0900 Subject: [PATCH 275/622] add APIs --- .../api/client/SimpleHandledScreen.java | 10 ++ .../mcpitanlib/api/client/SimpleScreen.java | 10 ++ .../api/client/gui/screen/ScreenTexts.java | 21 ++++ .../api/command/argument/DoubleCommand.java | 2 +- .../api/event/DoubleCommandEvent.java | 5 +- .../mcpitanlib/api/util/SoundEventUtil.java | 27 +++++ .../util/client/widget/SimpleListWidget.java | 103 ++++++++++++++++++ .../client/widget/SimpleSliderWidget.java | 66 +++++++++++ info.properties | 2 +- 9 files changed, 241 insertions(+), 5 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/ScreenTexts.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleListWidget.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleSliderWidget.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index bcf47ccea..161504ef4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -177,6 +177,10 @@ public boolean keyPressed(KeyEventArgs args) { return super.keyPressed(args.keyCode, args.scanCode, args.modifiers); } + public void renderBackgroundTexture(DrawObjectDM drawObjectDM) { + super.renderBackgroundTexture(drawObjectDM.getContext()); + } + @Deprecated @Override public boolean keyReleased(int keyCode, int scanCode, int modifiers) { @@ -188,4 +192,10 @@ public boolean keyReleased(int keyCode, int scanCode, int modifiers) { public boolean keyPressed(int keyCode, int scanCode, int modifiers) { return this.keyPressed(new KeyEventArgs(keyCode, scanCode, modifiers)); } + + @Deprecated + @Override + public void renderBackgroundTexture(DrawContext context) { + this.renderBackgroundTexture(new DrawObjectDM(context)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index 5677a318e..02491dea3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -118,6 +118,10 @@ public boolean keyPressed(KeyEventArgs args) { return super.keyPressed(args.keyCode, args.scanCode, args.modifiers); } + public void renderBackgroundTexture(DrawObjectDM drawObjectDM) { + super.renderBackgroundTexture(drawObjectDM.getContext()); + } + @Deprecated @Override public boolean keyReleased(int keyCode, int scanCode, int modifiers) { @@ -129,4 +133,10 @@ public boolean keyReleased(int keyCode, int scanCode, int modifiers) { public boolean keyPressed(int keyCode, int scanCode, int modifiers) { return this.keyPressed(new KeyEventArgs(keyCode, scanCode, modifiers)); } + + @Deprecated + @Override + public void renderBackgroundTexture(DrawContext context) { + this.renderBackgroundTexture(new DrawObjectDM(context)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/ScreenTexts.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/ScreenTexts.java new file mode 100644 index 000000000..da47fb543 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/ScreenTexts.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.client.gui.screen; + +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.util.TextUtil; + +public class ScreenTexts { + public static final Text ON = TextUtil.translatable("options.on"); + public static final Text OFF = TextUtil.translatable("options.off"); + public static final Text DONE = TextUtil.translatable("gui.done"); + public static final Text CANCEL = TextUtil.translatable("gui.cancel"); + public static final Text YES = TextUtil.translatable("gui.yes"); + public static final Text NO = TextUtil.translatable("gui.no"); + public static final Text PROCEED = TextUtil.translatable("gui.proceed"); + public static final Text BACK = TextUtil.translatable("gui.back"); + public static final Text CONNECT_FAILED = TextUtil.translatable("connect.failed"); + public static final Text LINE_BREAK = TextUtil.literal("\n"); + public static final Text SENTENCE_SEPARATOR = TextUtil.literal(". "); + + public ScreenTexts() { + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java index 74453b865..b8ede9b0d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/DoubleCommand.java @@ -4,7 +4,7 @@ import net.pitan76.mcpitanlib.api.event.DoubleCommandEvent; import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; -public abstract class DoubleCommand extends RequiredCommand { +public abstract class DoubleCommand extends RequiredCommand { @Override public DoubleArgumentType getArgumentType() { return DoubleArgumentType.doubleArg(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java index 09fe6e051..b67d482a7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/DoubleCommandEvent.java @@ -1,11 +1,10 @@ package net.pitan76.mcpitanlib.api.event; import com.mojang.brigadier.arguments.DoubleArgumentType; -import com.mojang.brigadier.arguments.FloatArgumentType; -import net.pitan76.mcpitanlib.api.command.argument.FloatCommand; +import net.pitan76.mcpitanlib.api.command.argument.DoubleCommand; public class DoubleCommandEvent extends RequiredCommandEvent { public Double getValue() { - return DoubleArgumentType.getDouble(context, ((FloatCommand) getCommand()).getArgumentName()); + return DoubleArgumentType.getDouble(context, ((DoubleCommand) getCommand()).getArgumentName()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java new file mode 100644 index 000000000..dc0b47099 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.registry.Registries; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +public class SoundEventUtil { + public static Identifier getId(SoundEvent soundEvent) { + return soundEvent.getId(); + } + + public static SoundEvent getSoundEvent(Identifier id) { + return SoundEvent.of(id); + } + + public static List getAllSoundEvents() { + return Registries.SOUND_EVENT.stream().collect(Collectors.toList()); + } + + public static List getAllSoundEventIds() { + return new ArrayList<>(Registries.SOUND_EVENT.getIds()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleListWidget.java new file mode 100644 index 000000000..54d67d7da --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleListWidget.java @@ -0,0 +1,103 @@ +package net.pitan76.mcpitanlib.api.util.client.widget; + +import com.google.common.collect.ImmutableList; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.client.gui.widget.ElementListWidget; +import org.jetbrains.annotations.Nullable; + +import java.util.List; +import java.util.Optional; + +@Environment(EnvType.CLIENT) +public class SimpleListWidget extends ElementListWidget { + + public SimpleListWidget(MinecraftClient client, int width, int height, int top, int bottom, int itemHeight) { + this(client, width, bottom - top, top, itemHeight); + } + + public SimpleListWidget(MinecraftClient client, int width, int height, int y, int itemHeight) { + super(client, width, height, y, itemHeight); + this.centerListVertically = false; + } + + public void add(ClickableWidget widget) { + super.addEntry(WidgetEntry.create(widget)); + } + + @Override + public int getRowWidth() { + return 400; + } + + public int getWidth() { + return this.width; + } + + public int getHeight() { + return this.height; + } + + @Override + protected int getScrollbarPositionX() { + return super.getScrollbarPositionX() + 32; + } + + @Nullable + public ClickableWidget getWidget(int index) { + if (index < 0 || index >= this.children().size()) { + return null; + } + return this.children().get(index).getWidget(); + } + + public Optional getHoveredWidget(double mouseX, double mouseY) { + for (WidgetEntry entry : this.children()) { + if (entry.getWidget().isMouseOver(mouseX, mouseY)) { + return Optional.of(entry.getWidget()); + } + } + return Optional.empty(); + } + + @Environment(EnvType.CLIENT) + public static class WidgetEntry extends Entry { + protected final ClickableWidget widget; + + public WidgetEntry(ClickableWidget widget) { + this.widget = widget; + } + + public static WidgetEntry create(ClickableWidget widget) { + return new WidgetEntry(widget); + } + + @Deprecated + @Override + public void render(DrawContext matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { + widget.setY(y); + widget.render(matrices, mouseX, mouseY, tickDelta); + } + + @Deprecated + @Override + public List children() { + return ImmutableList.of(widget); + } + + @Deprecated + @Override + public List selectableChildren() { + return ImmutableList.of(widget); + } + + public ClickableWidget getWidget() { + return widget; + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleSliderWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleSliderWidget.java new file mode 100644 index 000000000..3d1a120b5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleSliderWidget.java @@ -0,0 +1,66 @@ +package net.pitan76.mcpitanlib.api.util.client.widget; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.widget.SliderWidget; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.util.TextUtil; + +import java.util.function.Consumer; +import java.util.function.Function; + +@Environment(EnvType.CLIENT) +public class SimpleSliderWidget extends SliderWidget { + protected final Function textGetter; + protected final Consumer changeCallback; + + public SimpleSliderWidget(int x, int y, int width, int height, Text text, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { + super(x, y, width, height, text, defaultValue); + this.textGetter = (Double value) -> valueTextGetter.get(text, value); + this.changeCallback = changeCallback; + this.updateMessage(); + } + public SimpleSliderWidget(int x, int y, int width, int height, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { + this(x, y, width, height, TextUtil.empty(), defaultValue, valueTextGetter, changeCallback); + } + + public SimpleSliderWidget(int x, int y, int width, Text text, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { + this(x, y, width, 20, text, defaultValue, valueTextGetter, changeCallback); + } + + public SimpleSliderWidget(int x, int y, int width, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { + this(x, y, width, 20, defaultValue, valueTextGetter, changeCallback); + } + + public SimpleSliderWidget(SimpleListWidget listWidget, int width, Text text, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { + this(listWidget.getWidth() / 2 - 155, 0, width, 20, text, defaultValue, valueTextGetter, changeCallback); + } + + public SimpleSliderWidget(SimpleListWidget listWidget, int width, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { + this(listWidget, width, TextUtil.empty(), defaultValue, valueTextGetter, changeCallback); + } + + public void setValue(double value) { + super.value = value; + } + + public double getValue() { + return super.value; + } + + @Override + protected void updateMessage() { + this.setMessage(this.textGetter.apply(this.getValue())); + } + + @Override + protected void applyValue() { + this.changeCallback.accept(this.getValue()); + } + + @Environment(EnvType.CLIENT) + @FunctionalInterface + public interface ValueTextGetter { + Text get(Text optionText, Double value); + } +} diff --git a/info.properties b/info.properties index 30544b72b..d32afc1c5 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.4 +mod_version=2.1.5 maven_group=net.pitan76 \ No newline at end of file From d7439e03822fbf94639d274b6308eee8a601072e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 01:04:02 +0900 Subject: [PATCH 276/622] fix apis --- .../mcpitanlib/api/client/SimpleScreen.java | 7 ++-- .../gui}/widget/SimpleListWidget.java | 2 +- .../gui}/widget/SimpleSliderWidget.java | 2 +- .../screen/RenderBackgroundTextureArgs.java | 34 +++++++++++++++++++ 4 files changed, 40 insertions(+), 5 deletions(-) rename common/src/main/java/net/pitan76/mcpitanlib/api/{util/client => client/gui}/widget/SimpleListWidget.java (98%) rename common/src/main/java/net/pitan76/mcpitanlib/api/{util/client => client/gui}/widget/SimpleSliderWidget.java (98%) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/screen/RenderBackgroundTextureArgs.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index 02491dea3..372e151b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -13,6 +13,7 @@ import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; +import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; public abstract class SimpleScreen extends Screen { @@ -118,8 +119,8 @@ public boolean keyPressed(KeyEventArgs args) { return super.keyPressed(args.keyCode, args.scanCode, args.modifiers); } - public void renderBackgroundTexture(DrawObjectDM drawObjectDM) { - super.renderBackgroundTexture(drawObjectDM.getContext()); + public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { + super.renderBackgroundTexture(args.getDrawObjectDM().getContext()); } @Deprecated @@ -137,6 +138,6 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Deprecated @Override public void renderBackgroundTexture(DrawContext context) { - this.renderBackgroundTexture(new DrawObjectDM(context)); + this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java similarity index 98% rename from common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleListWidget.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index 54d67d7da..c9907c547 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.api.util.client.widget; +package net.pitan76.mcpitanlib.api.client.gui.widget; import com.google.common.collect.ImmutableList; import net.fabricmc.api.EnvType; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleSliderWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java similarity index 98% rename from common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleSliderWidget.java rename to common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java index 3d1a120b5..36509aee5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/SimpleSliderWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.api.util.client.widget; +package net.pitan76.mcpitanlib.api.client.gui.widget; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/screen/RenderBackgroundTextureArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/screen/RenderBackgroundTextureArgs.java new file mode 100644 index 000000000..610b56280 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/screen/RenderBackgroundTextureArgs.java @@ -0,0 +1,34 @@ +package net.pitan76.mcpitanlib.api.client.render.screen; + +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; + +public class RenderBackgroundTextureArgs { + public DrawObjectDM drawObjectDM; + int vOffset; + + public RenderBackgroundTextureArgs(DrawObjectDM drawObjectDM, int vOffset) { + this.drawObjectDM = drawObjectDM; + this.vOffset = vOffset; + } + + public RenderBackgroundTextureArgs(RenderArgs args) { + this(args.drawObjectDM, 0); + } + + public DrawObjectDM getDrawObjectDM() { + return drawObjectDM; + } + + public int getvOffset() { + return vOffset; + } + + public void setDrawObjectDM(DrawObjectDM drawObjectDM) { + this.drawObjectDM = drawObjectDM; + } + + public void setvOffset(int vOffset) { + this.vOffset = vOffset; + } +} From 842a4e4c11e5c19275aa092d01c3e8f88f442003 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 01:04:36 +0900 Subject: [PATCH 277/622] fix apis2 --- .../pitan76/mcpitanlib/api/client/SimpleHandledScreen.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 161504ef4..e8933661b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -15,6 +15,7 @@ import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; +import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; public abstract class SimpleHandledScreen extends HandledScreen { @@ -177,8 +178,8 @@ public boolean keyPressed(KeyEventArgs args) { return super.keyPressed(args.keyCode, args.scanCode, args.modifiers); } - public void renderBackgroundTexture(DrawObjectDM drawObjectDM) { - super.renderBackgroundTexture(drawObjectDM.getContext()); + public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { + super.renderBackgroundTexture(args.getDrawObjectDM().getContext()); } @Deprecated @@ -196,6 +197,6 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Deprecated @Override public void renderBackgroundTexture(DrawContext context) { - this.renderBackgroundTexture(new DrawObjectDM(context)); + this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); } } From 3883d2820df371c12613233bdc3c6ea72d91230e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Mon, 4 Mar 2024 16:05:38 +0900 Subject: [PATCH 278/622] add APIs --- .../mcpitanlib/api/client/SimpleHandledScreen.java | 4 ++++ .../pitan76/mcpitanlib/api/client/SimpleScreen.java | 4 ++++ .../api/client/gui/widget/SimpleListWidget.java | 11 +++++++++++ .../api/client/gui/widget/SimpleSliderWidget.java | 12 ++++++++++++ info.properties | 2 +- 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index e8933661b..63c6b78c5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -35,6 +35,10 @@ public T addDrawableChild_compatibil // addButton } + public T addSelectableChild_compatibility(T selectableElement) { + return super.addSelectableChild(selectableElement); + } + public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWidget widget) { return addDrawableChild_compatibility(widget); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index 372e151b9..aa8941e32 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -31,6 +31,10 @@ public T addDrawableChild_compatibil // addButton } + public T addSelectableChild_compatibility(T selectableElement) { + return super.addSelectableChild(selectableElement); + } + public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWidget widget) { return addDrawableChild_compatibility(widget); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index c9907c547..e57e7212a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -9,6 +9,8 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.ElementListWidget; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -65,6 +67,15 @@ public Optional getHoveredWidget(double mouseX, double mouseY) return Optional.empty(); } + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + this.render(new RenderArgs(new DrawObjectDM(context), mouseX, mouseY, delta)); + } + + public void render(RenderArgs args) { + super.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } + @Environment(EnvType.CLIENT) public static class WidgetEntry extends Entry { protected final ClickableWidget widget; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java index 36509aee5..835f4ab49 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java @@ -2,8 +2,11 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.SliderWidget; import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import net.pitan76.mcpitanlib.api.util.TextUtil; import java.util.function.Consumer; @@ -39,6 +42,15 @@ public SimpleSliderWidget(SimpleListWidget listWidget, int width, Text text, dou public SimpleSliderWidget(SimpleListWidget listWidget, int width, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { this(listWidget, width, TextUtil.empty(), defaultValue, valueTextGetter, changeCallback); } + + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + this.render(new RenderArgs(new DrawObjectDM(context), mouseX, mouseY, delta)); + } + + public void render(RenderArgs args) { + super.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } public void setValue(double value) { super.value = value; diff --git a/info.properties b/info.properties index d32afc1c5..ece52162e 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.5 +mod_version=2.1.6 maven_group=net.pitan76 \ No newline at end of file From ff245667f426f661f57a2ab85e7cd8c85f9b5f91 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 16:34:24 +0900 Subject: [PATCH 279/622] gradle --- fabric/build.gradle | 6 +++--- forge/build.gradle | 6 +++--- neoforge/build.gradle | 6 +++--- quilt/build.gradle | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index c11cecf1f..c15d40963 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -51,18 +51,18 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - archiveClassifier = "dev-shadow" + archiveClassifier.set "dev-shadow" } remapJar { injectAccessWidener = true inputFile.set shadowJar.archiveFile dependsOn shadowJar - archiveClassifier = null + archiveClassifier.set null } jar { - archiveClassifier = "dev" + archiveClassifier.set "dev" } sourcesJar { diff --git a/forge/build.gradle b/forge/build.gradle index 378e0c24d..f08ff1335 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -56,17 +56,17 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - archiveClassifier = "dev-shadow" + archiveClassifier.set "dev-shadow" } remapJar { inputFile.set shadowJar.archiveFile dependsOn shadowJar - archiveClassifier = null + archiveClassifier.set null } jar { - archiveClassifier = "dev" + archiveClassifier.set "dev" } sourcesJar { diff --git a/neoforge/build.gradle b/neoforge/build.gradle index a36c68364..70bb1f042 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -59,19 +59,19 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - archiveClassifier = "dev-shadow" + archiveClassifier.set "dev-shadow" } remapJar { inputFile.set shadowJar.archiveFile dependsOn shadowJar - archiveClassifier = null + archiveClassifier.set null atAccessWideners.add(loom.accessWidenerPath.get().asFile.name) } jar { - archiveClassifier = "dev" + archiveClassifier.set "dev" } sourcesJar { diff --git a/quilt/build.gradle b/quilt/build.gradle index 57bde079b..316fda87e 100644 --- a/quilt/build.gradle +++ b/quilt/build.gradle @@ -50,18 +50,18 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] - archiveClassifier = "dev-shadow" + archiveClassifier.set "dev-shadow" } remapJar { injectAccessWidener = true inputFile.set shadowJar.archiveFile dependsOn shadowJar - archiveClassifier = null + archiveClassifier.set null } jar { - archiveClassifier = "dev" + archiveClassifier.set "dev" } sourcesJar { From bd8d669c4f330f33f5299f2a6a8f6deaa3428d25 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 16:36:05 +0900 Subject: [PATCH 280/622] 1204 --- .../mcpitanlib/api/client/gui/widget/SimpleListWidget.java | 2 ++ .../mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index e57e7212a..066395600 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -67,10 +67,12 @@ public Optional getHoveredWidget(double mouseX, double mouseY) return Optional.empty(); } + /* @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { this.render(new RenderArgs(new DrawObjectDM(context), mouseX, mouseY, delta)); } + */ public void render(RenderArgs args) { super.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java index 835f4ab49..d32993250 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java @@ -43,10 +43,12 @@ public SimpleSliderWidget(SimpleListWidget listWidget, int width, double default this(listWidget, width, TextUtil.empty(), defaultValue, valueTextGetter, changeCallback); } + /* @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { this.render(new RenderArgs(new DrawObjectDM(context), mouseX, mouseY, delta)); } + */ public void render(RenderArgs args) { super.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); From aec75bb564d9f15609686a1c8cc1d2316674cc23 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 20:33:42 +0900 Subject: [PATCH 281/622] fix apis --- .../mcpitanlib/api/client/gui/widget/SimpleListWidget.java | 6 ++++++ .../api/client/gui/widget/SimpleSliderWidget.java | 2 ++ info.properties | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index 066395600..d6796e7d9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -94,6 +94,12 @@ public static WidgetEntry create(ClickableWidget widget) { @Override public void render(DrawContext matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { widget.setY(y); + if (widget instanceof SimpleSliderWidget) { + SimpleSliderWidget slider = (SimpleSliderWidget) widget; + if (y + slider.getHeight() > slider.listWidget.getHeight()) + return; + + } widget.render(matrices, mouseX, mouseY, tickDelta); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java index d32993250..7c4b87d68 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleSliderWidget.java @@ -16,6 +16,7 @@ public class SimpleSliderWidget extends SliderWidget { protected final Function textGetter; protected final Consumer changeCallback; + public SimpleListWidget listWidget = null; public SimpleSliderWidget(int x, int y, int width, int height, Text text, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { super(x, y, width, height, text, defaultValue); @@ -37,6 +38,7 @@ public SimpleSliderWidget(int x, int y, int width, double defaultValue, ValueTex public SimpleSliderWidget(SimpleListWidget listWidget, int width, Text text, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { this(listWidget.getWidth() / 2 - 155, 0, width, 20, text, defaultValue, valueTextGetter, changeCallback); + this.listWidget = listWidget; } public SimpleSliderWidget(SimpleListWidget listWidget, int width, double defaultValue, ValueTextGetter valueTextGetter, Consumer changeCallback) { diff --git a/info.properties b/info.properties index ece52162e..c2f9ccc29 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.6 +mod_version=2.1.7 maven_group=net.pitan76 \ No newline at end of file From 0773a3da52c1ca7c013aff70e9892ba0ec971190 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 21:29:34 +0900 Subject: [PATCH 282/622] fix apis --- .../mcpitanlib/api/client/gui/widget/SimpleListWidget.java | 2 +- info.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index d6796e7d9..4abe65abf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -96,7 +96,7 @@ public void render(DrawContext matrices, int index, int y, int x, int entryWidth widget.setY(y); if (widget instanceof SimpleSliderWidget) { SimpleSliderWidget slider = (SimpleSliderWidget) widget; - if (y + slider.getHeight() > slider.listWidget.getHeight()) + if (y + slider.getHeight() > slider.listWidget.getY() + slider.listWidget.getHeight()) return; } diff --git a/info.properties b/info.properties index c2f9ccc29..07c914c9d 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.7 +mod_version=2.1.8 maven_group=net.pitan76 \ No newline at end of file From ccd0d04d3158c5d0d1310e24bdc8ba7c2a6767f4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:17:09 +0900 Subject: [PATCH 283/622] fix apis2 --- .../mcpitanlib/api/client/gui/widget/SimpleListWidget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index 4abe65abf..3052684d0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -96,7 +96,7 @@ public void render(DrawContext matrices, int index, int y, int x, int entryWidth widget.setY(y); if (widget instanceof SimpleSliderWidget) { SimpleSliderWidget slider = (SimpleSliderWidget) widget; - if (y + slider.getHeight() > slider.listWidget.getY() + slider.listWidget.getHeight()) + if (y >= slider.listWidget.getY() + slider.listWidget.getHeight()) return; } From 6a3b73b43222ed88179a2686f7dcbe37003e1634 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:52:37 +0900 Subject: [PATCH 284/622] fix apis4 --- .../api/client/SimpleHandledScreen.java | 18 ++++++++++++++++++ .../mcpitanlib/api/client/SimpleScreen.java | 18 ++++++++++++++++++ .../client/gui/widget/SimpleListWidget.java | 7 ------- .../mcpitanlib/api/util/client/ClientUtil.java | 14 ++++++++++++++ 4 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 63c6b78c5..b140697b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -203,4 +203,22 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { public void renderBackgroundTexture(DrawContext context) { this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); } + + public void closeOverride() { + super.close(); + } + + public void removedOverride() { + super.removed(); + } + + @Override + public void close() { + closeOverride(); + } + + @Override + public void removed() { + removedOverride(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index aa8941e32..884232747 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -144,4 +144,22 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { public void renderBackgroundTexture(DrawContext context) { this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); } + + public void closeOverride() { + super.close(); + } + + public void removedOverride() { + super.removed(); + } + + @Override + public void close() { + closeOverride(); + } + + @Override + public void removed() { + removedOverride(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index 3052684d0..02335aaca 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -9,7 +9,6 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.gui.widget.ElementListWidget; -import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import org.jetbrains.annotations.Nullable; @@ -94,12 +93,6 @@ public static WidgetEntry create(ClickableWidget widget) { @Override public void render(DrawContext matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { widget.setY(y); - if (widget instanceof SimpleSliderWidget) { - SimpleSliderWidget slider = (SimpleSliderWidget) widget; - if (y >= slider.listWidget.getY() + slider.listWidget.getHeight()) - return; - - } widget.render(matrices, mouseX, mouseY, tickDelta); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java new file mode 100644 index 000000000..695b74065 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.util.client; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.Screen; + +public class ClientUtil { + public static void setScreen(Screen screen) { + MinecraftClient.getInstance().setScreen(screen); + } + + public static Screen getScreen() { + return MinecraftClient.getInstance().currentScreen; + } +} From c3c5d6b61b5c9d58187efb9626f2ae74f8d84eb4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 6 Mar 2024 22:39:16 +0900 Subject: [PATCH 285/622] fix apis --- .../mcpitanlib/api/client/SimpleHandledScreen.java | 9 +++++++++ .../net/pitan76/mcpitanlib/api/client/SimpleScreen.java | 8 ++++++++ info.properties | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index b140697b9..997bd6c3f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -24,10 +24,15 @@ public abstract class SimpleHandledScreen extends HandledScreen { public TextRenderer textRenderer; public ItemRenderer itemRenderer; + public Text title; + public MinecraftClient client; + public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); fixScreen(); this.handler = handler; + this.title = title; + } public T addDrawableChild_compatibility(T drawableElement) { @@ -118,6 +123,10 @@ public void fixScreen() { this.itemRenderer = MinecraftClient.getInstance().getItemRenderer(); this.width = super.width; this.height = super.height; + if (super.client == null) + this.client = MinecraftClient.getInstance(); + else + this.client = super.client; } public void setX(int x) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index 884232747..f96edeaac 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -21,9 +21,13 @@ public abstract class SimpleScreen extends Screen { public TextRenderer textRenderer; public ItemRenderer itemRenderer; + public Text title; + public MinecraftClient client; + public SimpleScreen(Text title) { super(title); fixScreen(); + this.title = title; } public T addDrawableChild_compatibility(T drawableElement) { @@ -87,6 +91,10 @@ public void fixScreen() { this.itemRenderer = MinecraftClient.getInstance().getItemRenderer(); this.width = super.width; this.height = super.height; + if (super.client == null) + this.client = MinecraftClient.getInstance(); + else + this.client = super.client; } public void setTextRenderer(TextRenderer textRenderer) { diff --git a/info.properties b/info.properties index 07c914c9d..fa268962b 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.8 +mod_version=2.1.9 maven_group=net.pitan76 \ No newline at end of file From cc1bddf1febf89cf404f9b9d4e38f378801917ac Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:56:03 +0900 Subject: [PATCH 286/622] gradle --- common/build.gradle | 2 +- gradle.properties | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index 8d6073e0f..94ddda702 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,7 +7,7 @@ dependencies { } architectury { - common("fabric", "forge", "neoforge") + common("fabric") } loom { diff --git a/gradle.properties b/gradle.properties index ed61df3ec..413e3d1da 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.20.4 +minecraft_version=24w10a # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=11.0.12 +architectury_version=12.0.16 # https://fabricmc.net/develop/ -fabric_loader_version=0.15.1 -yarn_mappings=1.20.4+build.3 -fabric_api_version=0.91.2+1.20.4 +fabric_loader_version=0.15.7 +yarn_mappings=24w10a+build.3 +fabric_api_version=0.96.8+1.20.5 # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.20.4-49.0.3 @@ -23,6 +23,6 @@ neoforge_version=20.4.159-beta cloth_config_version=13.0.121 fabricEnabled=true -forgeEnabled=true +forgeEnabled=false quiltEnabled=false -neoforgeEnabled=true \ No newline at end of file +neoforgeEnabled=false \ No newline at end of file From 75711ba4a803e45ea61f851e7ea9631b1ab5f330 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 10 Mar 2024 00:49:08 +0900 Subject: [PATCH 287/622] add fix API (all) --- .../pitan76/mcpitanlib/api/entity/Player.java | 6 +- .../api/item/ArmorEquipmentType.java | 3 + .../api/item/CompatibleArmorItem.java | 9 ++- .../api/item/CompatibleArmorMaterial.java | 72 +++++++++++++++---- .../api/timer/MinecraftServerTimerAccess.java | 2 +- .../api/timer/ServerWorldTimerAccess.java | 2 +- .../mcpitanlib/api/util/TimerUtil.java | 4 +- .../mcpitanlib/mixin/AbstractBlockMixin.java | 12 ++-- .../pitan76/mcpitanlib/mixin/BlockMixin.java | 4 +- .../pitan76/mcpitanlib/mixin/ItemMixin.java | 16 ++--- .../mcpitanlib/mixin/ItemStackMixin.java | 2 +- .../mixin/MinecraftServerTimer.java | 14 ++-- .../mcpitanlib/mixin/RecipeManagerMixin.java | 2 +- .../mcpitanlib/mixin/ServerWorldTimer.java | 12 ++-- 14 files changed, 109 insertions(+), 51 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 7f8e101be..64657bf49 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -251,7 +251,11 @@ public float getPitch() { } public void playSound(SoundEvent event, SoundCategory category, float volume, float pitch) { - getEntity().playSound(event, category, volume, pitch); + playSound(event, volume, pitch); + } + + public void playSound(SoundEvent event, float volume, float pitch) { + getEntity().playSound(event, volume, pitch); } public ItemCooldown itemCooldown = new ItemCooldown(this); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java index c38831225..c1ec04ae7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java @@ -11,6 +11,9 @@ public class ArmorEquipmentType { public static ArmorEquipmentType LEGS = new ArmorEquipmentType(EquipmentSlot.LEGS, ArmorItem.Type.LEGGINGS); public static ArmorEquipmentType FEET = new ArmorEquipmentType(EquipmentSlot.FEET, ArmorItem.Type.BOOTS); + // New type for animals from 1.20.5 + public static ArmorEquipmentType BODY = new ArmorEquipmentType(EquipmentSlot.BODY, ArmorItem.Type.BODY); + protected final EquipmentSlot slot; protected final ArmorItem.Type type; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java index 8a81fb2ba..b3def3454 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java @@ -1,12 +1,19 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.registry.entry.RegistryEntry; + +import java.util.Map; public class CompatibleArmorItem extends ArmorItem implements ExtendItemProvider { public final ArmorEquipmentType type; + @Deprecated + public static final Map> CACHE = new java.util.HashMap<>(); + public CompatibleArmorItem(CompatibleArmorMaterial material, ArmorEquipmentType type, CompatibleItemSettings settings) { - super(material, type.getType(), settings.build()); + super(material.build(), type.getType(), settings.build()); this.type = type; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java index c435e7f05..19bb91e67 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java @@ -3,34 +3,78 @@ import net.minecraft.item.ArmorItem; import net.minecraft.item.ArmorMaterial; import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.Identifier; +import net.minecraft.util.Util; -public interface CompatibleArmorMaterial extends ArmorMaterial { +import java.util.EnumMap; +import java.util.List; +import java.util.function.Supplier; + +public interface CompatibleArmorMaterial { int getDurability(ArmorEquipmentType type); int getProtection(ArmorEquipmentType type); - @Override - @Deprecated - default int getDurability(ArmorItem.Type type) { - return getDurability(ArmorEquipmentType.of(type)); - } - - @Override - @Deprecated - default int getProtection(ArmorItem.Type type) { - return getProtection(ArmorEquipmentType.of(type)); - } - int getEnchantability(); SoundEvent getEquipSound(); Ingredient getRepairIngredient(); - String getName(); + /** + * @return the name of the material + */ + default String getName() { + return getId().getPath(); + } + + /** + * @return the id of the material + */ + Identifier getId(); float getToughness(); float getKnockbackResistance(); + + @Deprecated + default RegistryEntry build() { + if (CompatibleArmorItem.CACHE.containsKey(this)) { + return CompatibleArmorItem.CACHE.get(this); + } + + RegistryEntry entry = register(getId(), Util.make(new EnumMap<>(ArmorItem.Type.class), (map) -> { + map.put(ArmorItem.Type.HELMET, this.getProtection(ArmorEquipmentType.HEAD)); + map.put(ArmorItem.Type.CHESTPLATE, this.getProtection(ArmorEquipmentType.CHEST)); + map.put(ArmorItem.Type.LEGGINGS, this.getProtection(ArmorEquipmentType.LEGS)); + map.put(ArmorItem.Type.BOOTS, this.getProtection(ArmorEquipmentType.FEET)); + + map.put(ArmorItem.Type.BODY, this.getProtection(ArmorEquipmentType.BODY)); + }), getEnchantability(), SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, getToughness(), getKnockbackResistance(), + this::getRepairIngredient + ); + CompatibleArmorItem.CACHE.put(this, entry); + return entry; + } + + private static RegistryEntry register(Identifier id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient) { + List list = List.of(new ArmorMaterial.Layer(id)); + return register(id, defense, enchantability, equipSound, toughness, knockbackResistance, repairIngredient, list); + } + + private static RegistryEntry register(Identifier id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient, List layers) { + EnumMap enumMap = new EnumMap<>(ArmorItem.Type.class); + ArmorItem.Type[] var9 = ArmorItem.Type.values(); + + for (ArmorItem.Type type : var9) { + enumMap.put(type, defense.get(type)); + } + + return Registry.registerReference(Registries.ARMOR_MATERIAL, id, new ArmorMaterial(enumMap, enchantability, equipSound, repairIngredient, layers, toughness, knockbackResistance)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/timer/MinecraftServerTimerAccess.java b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/MinecraftServerTimerAccess.java index 6d4c81259..58e042b3e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/timer/MinecraftServerTimerAccess.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/MinecraftServerTimerAccess.java @@ -3,5 +3,5 @@ import java.util.function.Supplier; public interface MinecraftServerTimerAccess { - void addTimer(long ticksUntilSomething, Supplier supplier); + void mcpitanlib$addTimer(long ticksUntilSomething, Supplier supplier); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/timer/ServerWorldTimerAccess.java b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/ServerWorldTimerAccess.java index 01eeb5f27..8dbd2dc14 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/timer/ServerWorldTimerAccess.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/timer/ServerWorldTimerAccess.java @@ -3,5 +3,5 @@ import java.util.function.Supplier; public interface ServerWorldTimerAccess { - void addTimer(long ticksUntilSomething, Supplier supplier); + void mcpitanlib$addTimer(long ticksUntilSomething, Supplier supplier); } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java index 7018af034..eaf08acdb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TimerUtil.java @@ -9,10 +9,10 @@ public class TimerUtil { public static void addTimer(ServerWorld world, long ticksUntilSomething, Supplier supplier) { - ((ServerWorldTimerAccess) world).addTimer(ticksUntilSomething, supplier); + ((ServerWorldTimerAccess) world).mcpitanlib$addTimer(ticksUntilSomething, supplier); } public static void addTimer(MinecraftServer server, long ticksUntilSomething, Supplier supplier) { - ((MinecraftServerTimerAccess) server).addTimer(ticksUntilSomething, supplier); + ((MinecraftServerTimerAccess) server).mcpitanlib$addTimer(ticksUntilSomething, supplier); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java index d499ae280..df0579715 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -27,7 +27,7 @@ @Mixin(AbstractBlock.class) public class AbstractBlockMixin { @Inject(method = "getCollisionShape", at = @At("HEAD"), cancellable = true) - private void inject_getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { + private void mcpitanlib$inject_getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); @@ -38,7 +38,7 @@ private void inject_getCollisionShape(BlockState state, BlockView world, BlockPo } @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true) - private void inject_getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { + private void mcpitanlib$inject_getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); @@ -49,7 +49,7 @@ private void inject_getOutlineShape(BlockState state, BlockView world, BlockPos } @Inject(method = "scheduledTick", at = @At("HEAD"), cancellable = true) - private void inject_scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) { + private void mcpitanlib$inject_scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); @@ -60,7 +60,7 @@ private void inject_scheduledTick(BlockState state, ServerWorld world, BlockPos } @Inject(method = "onUse", at = @At("HEAD"), cancellable = true) - private void inject_onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable cir) { + private void mcpitanlib$inject_onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable cir) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); @@ -71,7 +71,7 @@ private void inject_onUse(BlockState state, World world, BlockPos pos, PlayerEnt } @Inject(method = "createScreenHandlerFactory", at = @At("HEAD"), cancellable = true) - private void inject_createScreenHandlerFactory(BlockState state, World world, BlockPos pos, CallbackInfoReturnable cir) { + private void mcpitanlib$inject_createScreenHandlerFactory(BlockState state, World world, BlockPos pos, CallbackInfoReturnable cir) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); @@ -83,7 +83,7 @@ private void inject_createScreenHandlerFactory(BlockState state, World world, Bl } @Inject(method = "onStateReplaced", at = @At("HEAD"), cancellable = true) - private void inject_onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved, CallbackInfo ci) { + private void mcpitanlib$inject_onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved, CallbackInfo ci) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java index 44ee0e7a3..752dd16b4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java @@ -25,7 +25,7 @@ public class BlockMixin { @Inject(method = "onPlaced", at = @At("HEAD"), cancellable = true) - private void inject_onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack, CallbackInfo ci) { + private void mcpitanlib$onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack, CallbackInfo ci) { // イベントを呼び出す if (!BlockEventRegistry.ON_PLACED.isEmpty()) { int maxPriority = BlockEventRegistry.ON_PLACED.getMaxPriority(); @@ -47,7 +47,7 @@ private void inject_onPlaced(World world, BlockPos pos, BlockState state, Living } @Inject(method = "onBreak", at = @At("HEAD"), cancellable = true) - private void inject_onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable cir) { + private void mcpitanlib$onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player, CallbackInfoReturnable cir) { // イベントを呼び出す if (!BlockEventRegistry.ON_BREAK.isEmpty()) { BlockState newState = state; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index c1dc0e421..7ca2872b2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -27,7 +27,7 @@ @Mixin(Item.class) public class ItemMixin { @Inject(method = "use", at = @At("HEAD"), cancellable = true) - private void use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { + private void mcpitanlib$use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); @@ -38,7 +38,7 @@ private void use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnab } @Inject(method = "useOnBlock", at = @At("HEAD"), cancellable = true) - private void useOnBlock(ItemUsageContext context, CallbackInfoReturnable cir) { + private void mcpitanlib$useOnBlock(ItemUsageContext context, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; @@ -50,7 +50,7 @@ private void useOnBlock(ItemUsageContext context, CallbackInfoReturnable cir) { + private void mcpitanlib$useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); @@ -61,7 +61,7 @@ private void useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity } @Inject(method = "finishUsing", at = @At("HEAD"), cancellable = true) - private void finishUsing(ItemStack stack, World world, LivingEntity user, CallbackInfoReturnable cir) { + private void mcpitanlib$finishUsing(ItemStack stack, World world, LivingEntity user, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); @@ -72,7 +72,7 @@ private void finishUsing(ItemStack stack, World world, LivingEntity user, Callba } @Inject(method = "hasRecipeRemainder", at = @At("HEAD"), cancellable = true) - private void hasRecipeRemainder(CallbackInfoReturnable cir) { + private void mcpitanlib$hasRecipeRemainder(CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); @@ -83,7 +83,7 @@ private void hasRecipeRemainder(CallbackInfoReturnable cir) { } @Inject(method = "appendTooltip", at = @At("HEAD"), cancellable = true) - private void appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context, CallbackInfo ci) { + private void mcpitanlib$appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context, CallbackInfo ci) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); @@ -94,7 +94,7 @@ private void appendTooltip(ItemStack stack, World world, List tooltip, Too } @Inject(method = "postHit", at = @At("HEAD"), cancellable = true) - private void postHit(ItemStack stack, LivingEntity target, LivingEntity attacker, CallbackInfoReturnable cir) { + private void mcpitanlib$postHit(ItemStack stack, LivingEntity target, LivingEntity attacker, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); @@ -105,7 +105,7 @@ private void postHit(ItemStack stack, LivingEntity target, LivingEntity attacker } @Inject(method = "postMine", at = @At("HEAD"), cancellable = true) - private void postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner, CallbackInfoReturnable cir) { + private void mcpitanlib$postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java index e659f96fb..6029dc222 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java @@ -12,7 +12,7 @@ public abstract class ItemStackMixin { @Inject(method = "damage(ILnet/minecraft/util/math/random/Random;Lnet/minecraft/server/network/ServerPlayerEntity;)Z", at = @At("HEAD"), cancellable = true) - public void damage(int amount, net.minecraft.util.math.random.Random random, ServerPlayerEntity player, CallbackInfoReturnable cir) { + public void mcpitanlib$damage(int amount, net.minecraft.util.math.random.Random random, ServerPlayerEntity player, CallbackInfoReturnable cir) { ItemStackActionEvent.returnValue = null; ItemStackActionEvent.call((ItemStack) (Object) this); if (ItemStackActionEvent.returnValue != null) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java index b62d23a71..f4c81ebb0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/MinecraftServerTimer.java @@ -16,23 +16,23 @@ @Mixin(MinecraftServer.class) public class MinecraftServerTimer implements MinecraftServerTimerAccess { @Unique - private final List timerItems = new ArrayList<>(); + private final List mcpitanlib$timerItems = new ArrayList<>(); @Inject(method = "tick", at = @At("TAIL")) - private void onTick(CallbackInfo ci) { - if (timerItems.isEmpty()) return; - List items = new ArrayList<>(timerItems); + private void mcpitanlib$onTick(CallbackInfo ci) { + if (mcpitanlib$timerItems.isEmpty()) return; + List items = new ArrayList<>(mcpitanlib$timerItems); for (TimerItem item : items) { if (--item.ticksUntilSomething == 0L) { if (item.executeSupplier.get()) - timerItems.remove(item); + mcpitanlib$timerItems.remove(item); } } } @Override - public void addTimer(long ticksUntilSomething, Supplier executeSupplier) { - timerItems.add(new TimerItem(ticksUntilSomething, executeSupplier)); + public void mcpitanlib$addTimer(long ticksUntilSomething, Supplier executeSupplier) { + mcpitanlib$timerItems.add(new TimerItem(ticksUntilSomething, executeSupplier)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 2e8de26ee..0fa71f718 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -23,7 +23,7 @@ public class RecipeManagerMixin { @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", at = @At(value = "INVOKE", target = "Ljava/util/Map;entrySet()Ljava/util/Set;", ordinal = 1), locals = LocalCapture.CAPTURE_FAILHARD) - private void invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, Map, ImmutableMap.Builder>> map2) { + private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, Map, ImmutableMap.Builder>> map2) { if (RecipeManagerRegistry.managers.isEmpty()) return; RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, map2))); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java index 7c8b7a21d..72663172e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ServerWorldTimer.java @@ -16,23 +16,23 @@ @Mixin(ServerWorld.class) public class ServerWorldTimer implements ServerWorldTimerAccess { @Unique - private final List timerItems = new ArrayList<>(); + private final List mcpitanlib$timerItems = new ArrayList<>(); @Inject(method = "tick", at = @At("TAIL")) private void onTick(CallbackInfo ci) { - if (timerItems.isEmpty()) return; - List items = new ArrayList<>(timerItems); + if (mcpitanlib$timerItems.isEmpty()) return; + List items = new ArrayList<>(mcpitanlib$timerItems); for (TimerItem item : items) { if (--item.ticksUntilSomething == 0L) { if (item.executeSupplier.get()) - timerItems.remove(item); + mcpitanlib$timerItems.remove(item); } } } @Override - public void addTimer(long ticksUntilSomething, Supplier executeSupplier) { - timerItems.add(new TimerItem(ticksUntilSomething, executeSupplier)); + public void mcpitanlib$addTimer(long ticksUntilSomething, Supplier executeSupplier) { + mcpitanlib$timerItems.add(new TimerItem(ticksUntilSomething, executeSupplier)); } } From 9e52b957992cc6d761860a6f195cb311d1566197 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 10 Mar 2024 01:11:55 +0900 Subject: [PATCH 288/622] add fix API (all) 2 --- .../mcpitanlib/api/util/ArmorMaterialUtil.java | 18 +++++++++++++----- .../mcpitanlib/api/util/ItemStackUtil.java | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java index 1957cfe9e..665e13ee1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java @@ -2,11 +2,19 @@ import net.minecraft.recipe.Ingredient; import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; public class ArmorMaterialUtil { public static CompatibleArmorMaterial create(String name, int[] durability, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { + return create(new Identifier(name), durability, protectionAmounts, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); + } + public static CompatibleArmorMaterial create(String name, int durability, int protectionAmount, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { + return create(new Identifier(name), durability, protectionAmount, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); + } + + public static CompatibleArmorMaterial create(Identifier id, int[] durability, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { return new CompatibleArmorMaterial() { @Override public int getDurability(ArmorEquipmentType type) { @@ -66,8 +74,8 @@ public Ingredient getRepairIngredient() { } @Override - public String getName() { - return name; + public Identifier getId() { + return id; } @Override @@ -82,7 +90,7 @@ public float getKnockbackResistance() { }; } - public static CompatibleArmorMaterial create(String name, int durability, int protectionAmount, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { + public static CompatibleArmorMaterial create(Identifier id, int durability, int protectionAmount, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { return new CompatibleArmorMaterial() { @Override public int getDurability(ArmorEquipmentType type) { @@ -110,8 +118,8 @@ public Ingredient getRepairIngredient() { } @Override - public String getName() { - return name; + public Identifier getId() { + return id; } @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 19ab3fdb7..3768d6bed 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -18,6 +18,7 @@ public static boolean areItemsEqual(ItemStack left, ItemStack right) { } public static boolean areNbtEqual(ItemStack left, ItemStack right) { + // 1.20.5からはComponentを比較し、それ以前はNBTを比較する return Objects.equals(left.getNbt(), right.getNbt()); } } From e0ee3086984e35a1254bd6f9f0a6e9bf70e860f8 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 10 Mar 2024 12:39:04 +0900 Subject: [PATCH 289/622] port to 1.20.5 --- .../mcpitanlib/api/block/ExtendBlock.java | 6 +-- .../api/client/SimpleHandledScreen.java | 5 +- .../mcpitanlib/api/client/SimpleScreen.java | 4 +- .../mcpitanlib/api/entity/ExtendEntity.java | 7 +++ .../api/event/item/PostHitEvent.java | 4 +- .../api/event/item/PostMineEvent.java | 4 +- .../api/item/tool/CompatibleAxeItem.java | 4 +- .../api/item/tool/CompatibleHoeItem.java | 4 +- .../item/tool/CompatibleMiningToolItem.java | 2 +- .../api/item/tool/CompatiblePickaxeItem.java | 4 +- .../api/item/tool/CompatibleShovelItem.java | 4 +- .../api/item/tool/CompatibleSwordItem.java | 4 +- .../pitan76/mcpitanlib/api/nbt/NbtTag.java | 8 ++-- .../api/network/PacketByteUtil.java | 14 +++--- .../api/tile/CompatBlockEntity.java | 13 +++-- .../api/tile/CompatChestBlockEntity.java | 13 +++-- .../api/util/ArmorMaterialUtil.java | 2 + .../api/util/EquipMaterialUtil.java | 47 +++---------------- .../mcpitanlib/api/util/ItemStackUtil.java | 2 +- .../api/util/PersistentStateUtil.java | 2 +- .../mcpitanlib/mixin/ItemStackMixin.java | 9 ++-- .../main/resources/mcpitanlib.accesswidener | 2 + 22 files changed, 76 insertions(+), 88 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index a01275e6f..8e14b57e9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -84,8 +84,8 @@ public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Ran @Override @Deprecated - public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - return onRightClick(new BlockUseEvent(state, world, pos, player, hand, hit)); + protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { + return onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit)); } /** @@ -94,7 +94,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt * @return BlockUseEvent */ public ActionResult onRightClick(BlockUseEvent event) { - return super.onUse(event.state, event.world, event.pos, event.player.getPlayerEntity(), event.hand, event.hit); + return super.onUse(event.state, event.world, event.pos, event.player.getPlayerEntity(), event.hit); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 997bd6c3f..f037e520d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.Drawable; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.entity.player.PlayerInventory; @@ -192,7 +193,7 @@ public boolean keyPressed(KeyEventArgs args) { } public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { - super.renderBackgroundTexture(args.getDrawObjectDM().getContext()); + Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), 0, 0, this.width, this.height); } @Deprecated @@ -209,7 +210,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Deprecated @Override - public void renderBackgroundTexture(DrawContext context) { + public void renderDarkening(DrawContext context) { this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index f96edeaac..f58073e7f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -132,7 +132,7 @@ public boolean keyPressed(KeyEventArgs args) { } public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { - super.renderBackgroundTexture(args.getDrawObjectDM().getContext()); + Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), 0, 0, this.width, this.height); } @Deprecated @@ -149,7 +149,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Deprecated @Override - public void renderBackgroundTexture(DrawContext context) { + public void renderDarkening(DrawContext context) { this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java index 78f745eb5..e9fcd70ce 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java @@ -2,6 +2,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; +import net.minecraft.entity.data.DataTracker; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; @@ -13,6 +14,12 @@ public ExtendEntity(EntityType type, World world) { super(type, world); } + @Deprecated + @Override + public void initDataTracker(DataTracker.Builder builder) { + initDataTracker(); + } + public void initDataTracker() { } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java index ee9d20894..1f5083152 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostHitEvent.java @@ -34,8 +34,6 @@ public LivingEntity getTarget() { * @param slot the slot to damage */ public void damageStack(int amount, EquipmentSlot slot) { - stack.damage(amount, attacker, (entity) -> { - entity.sendEquipmentBreakStatus(slot); - }); + stack.damage(amount, attacker, slot); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java index 153954d77..9f7b9938c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java @@ -70,8 +70,6 @@ public boolean stateIsOf(Block block) { * @param slot the slot to damage */ public void damageStack(int amount, EquipmentSlot slot) { - stack.damage(amount, miner, (entity) -> { - entity.sendEquipmentBreakStatus(slot); - }); + stack.damage(amount, miner, slot); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index 519993d89..a34993a9e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -14,11 +14,11 @@ public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public CompatibleAxeItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index 870d9cb56..3270516dd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -14,11 +14,11 @@ public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public CompatibleHoeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index c028fc48b..0ea2f1f69 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -17,7 +17,7 @@ public class CompatibleMiningToolItem extends MiningToolItem implements ExtendItemProvider { @Deprecated protected CompatibleMiningToolItem(float attackDamage, float attackSpeed, ToolMaterial material, net.minecraft.registry.tag.TagKey effectiveBlocks, Settings settings) { - super(attackDamage, attackSpeed, material, effectiveBlocks, settings); + super(material, effectiveBlocks, settings); } public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, TagKey tagKey, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index a70c5f4c1..cf67711a9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -14,11 +14,11 @@ public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public CompatiblePickaxeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index cdfcbb7fd..01355cddf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -14,11 +14,11 @@ public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public CompatibleShovelItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index 605fcccae..1097e8746 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -14,11 +14,11 @@ public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public CompatibleSwordItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTag.java b/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTag.java index c82b24cf1..7d379f6e9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTag.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTag.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.api.nbt; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.NbtComponent; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.nbt.NbtType; @@ -36,7 +38,7 @@ public static NbtTag from(Object nbt) { * @return boolean */ public static boolean hasNbt(ItemStack stack) { - return stack.hasNbt(); + return !stack.getComponents().isEmpty(); } /** @@ -45,7 +47,7 @@ public static boolean hasNbt(ItemStack stack) { * @return NbtTag */ public static NbtTag getNbt(ItemStack stack) { - return from(stack.getNbt()); + return from(stack.get(DataComponentTypes.CUSTOM_DATA).copyNbt()); } /** @@ -54,7 +56,7 @@ public static NbtTag getNbt(ItemStack stack) { * @param nbt NbtTag */ public static void setNbt(ItemStack stack, NbtTag nbt) { - stack.setNbt(nbt); + stack.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(nbt)); } public boolean contains(String key) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java index dbe82fdc4..e1d651760 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/PacketByteUtil.java @@ -10,6 +10,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.api.util.TextUtil; import java.util.Map; import java.util.UUID; @@ -69,7 +70,7 @@ public static void writeVar(PacketByteBuf buf, Object obj) { } if (obj instanceof ItemStack) { ItemStack stack = (ItemStack) obj; - buf.writeItemStack(stack); + buf.encodeAsJson(ItemStack.CODEC, stack); } if (obj instanceof Identifier) { Identifier identifier = (Identifier) obj; @@ -85,7 +86,7 @@ public static void writeVar(PacketByteBuf buf, Object obj) { } if (obj instanceof Text) { Text text = (Text) obj; - buf.writeText(text); + buf.writeString(text.getString()); } if (obj instanceof BlockPos) { BlockPos pos = (BlockPos) obj; @@ -106,11 +107,12 @@ public static NbtCompound readNbt(PacketByteBuf buf) { } public static PacketByteBuf writeItemStack(PacketByteBuf buf, ItemStack stack) { - return buf.writeItemStack(stack); + buf.encodeAsJson(ItemStack.CODEC, stack); + return buf; } public static ItemStack readItemStack(PacketByteBuf buf) { - return buf.readItemStack(); + return buf.decodeAsJson(ItemStack.CODEC); } public static PacketByteBuf writeIdentifier(PacketByteBuf buf, Identifier identifier) { @@ -122,11 +124,11 @@ public static Identifier readIdentifier(PacketByteBuf buf) { } public static PacketByteBuf writeText(PacketByteBuf buf, Text text) { - return buf.writeText(text); + return buf.writeString(text.getString()); } public static Text readText(PacketByteBuf buf) { - return buf.readText(); + return TextUtil.literal(buf.readString()); } public static PacketByteBuf writeBlockPos(PacketByteBuf buf, BlockPos pos) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index 56d9b39ee..4de3354f4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -7,6 +7,7 @@ import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; @@ -37,22 +38,26 @@ public UpdatePacketType getUpdatePacketType() { } public void writeNbtOverride(NbtCompound nbt) { - super.writeNbt(nbt); + super.writeNbt(nbt, wrapperLookupCache); } public void readNbtOverride(NbtCompound nbt) { - super.readNbt(nbt); + super.readNbt(nbt, wrapperLookupCache); } + private RegistryWrapper.WrapperLookup wrapperLookupCache; + @Deprecated @Override - public void writeNbt(NbtCompound nbt) { + public void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + wrapperLookupCache = registryLookup; writeNbtOverride(nbt); } @Deprecated @Override - public void readNbt(NbtCompound nbt) { + public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + wrapperLookupCache = registryLookup; readNbtOverride(nbt); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java index 272c775a5..6e833dc85 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java @@ -7,6 +7,7 @@ import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; +import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; @@ -36,23 +37,27 @@ public UpdatePacketType getUpdatePacketType() { return UpdatePacketType.NONE; } + private RegistryWrapper.WrapperLookup wrapperLookupCache; + public void writeNbtOverride(NbtCompound nbt) { - super.writeNbt(nbt); + super.writeNbt(nbt, wrapperLookupCache); } public void readNbtOverride(NbtCompound nbt) { - super.readNbt(nbt); + super.readNbt(nbt, wrapperLookupCache); } @Deprecated @Override - public void writeNbt(NbtCompound nbt) { + public void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + wrapperLookupCache = registryLookup; writeNbtOverride(nbt); } @Deprecated @Override - public void readNbt(NbtCompound nbt) { + public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + wrapperLookupCache = registryLookup; readNbtOverride(nbt); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java index 665e13ee1..a1683492f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java @@ -14,6 +14,7 @@ public static CompatibleArmorMaterial create(String name, int durability, int pr return create(new Identifier(name), durability, protectionAmount, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); } + @Deprecated public static CompatibleArmorMaterial create(Identifier id, int[] durability, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { return new CompatibleArmorMaterial() { @Override @@ -90,6 +91,7 @@ public float getKnockbackResistance() { }; } + @Deprecated public static CompatibleArmorMaterial create(Identifier id, int durability, int protectionAmount, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { return new CompatibleArmorMaterial() { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java index 9afdc655a..a858c0f92 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java @@ -3,6 +3,7 @@ import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; @@ -57,47 +58,11 @@ public static int toInt(ArmorEquipmentType type) { } public static CompatibleArmorMaterial createArmorMaterial(int[] durability, int[] protection, int enchantability, SoundEvent equipSound, Ingredient repairIngredient, String name, float toughness, float knockbackResistance) { + return ArmorMaterialUtil.create(name, durability, protection, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); + } - return new CompatibleArmorMaterial() { - @Override - public int getDurability(ArmorEquipmentType type) { - return durability[toInt(type)]; - } - - @Override - public int getProtection(ArmorEquipmentType type) { - return protection[toInt(type)]; - } - - @Override - public int getEnchantability() { - return enchantability; - } - - @Override - public SoundEvent getEquipSound() { - return equipSound; - } - - @Override - public Ingredient getRepairIngredient() { - return repairIngredient; - } - - @Override - public String getName() { - return name; - } - - @Override - public float getToughness() { - return toughness; - } - - @Override - public float getKnockbackResistance() { - return knockbackResistance; - } - }; + @Deprecated + public static CompatibleArmorMaterial createArmorMaterial(int[] durability, int[] protection, int enchantability, SoundEvent equipSound, Ingredient repairIngredient, Identifier id, float toughness, float knockbackResistance) { + return ArmorMaterialUtil.create(id, durability, protection, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 3768d6bed..a99753282 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -19,6 +19,6 @@ public static boolean areItemsEqual(ItemStack left, ItemStack right) { public static boolean areNbtEqual(ItemStack left, ItemStack right) { // 1.20.5からはComponentを比較し、それ以前はNBTを比較する - return Objects.equals(left.getNbt(), right.getNbt()); + return Objects.equals(left.getComponents(), right.getComponents()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java index bf459c83b..69a7bc3b7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java @@ -13,7 +13,7 @@ public class PersistentStateUtil { public static T getOrCreate(PersistentStateManager manager, String id, Supplier supplier, Function function) { - PersistentState.Type type = new PersistentState.Type<>(supplier, function, DataFixTypes.LEVEL); + PersistentState.Type type = new PersistentState.Type<>(supplier, (nbtCompound, wrapperLookup) -> function.apply(nbtCompound), DataFixTypes.LEVEL); return manager.getOrCreate(type, id); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java index 6029dc222..e838175a6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java @@ -2,20 +2,21 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.math.random.Random; import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ItemStack.class) public abstract class ItemStackMixin { - @Inject(method = "damage(ILnet/minecraft/util/math/random/Random;Lnet/minecraft/server/network/ServerPlayerEntity;)Z", at = @At("HEAD"), cancellable = true) - public void mcpitanlib$damage(int amount, net.minecraft.util.math.random.Random random, ServerPlayerEntity player, CallbackInfoReturnable cir) { + @Inject(method = "damage(ILnet/minecraft/util/math/random/Random;Lnet/minecraft/server/network/ServerPlayerEntity;Ljava/lang/Runnable;)V", at = @At("HEAD"), cancellable = true) + public void mcpitanlib$damage(int amount, Random random, ServerPlayerEntity player, Runnable breakCallback, CallbackInfo ci) { ItemStackActionEvent.returnValue = null; ItemStackActionEvent.call((ItemStack) (Object) this); if (ItemStackActionEvent.returnValue != null) - cir.setReturnValue(ItemStackActionEvent.returnValue); + ci.cancel(); } } diff --git a/common/src/main/resources/mcpitanlib.accesswidener b/common/src/main/resources/mcpitanlib.accesswidener index e9dc186fa..e0993935d 100644 --- a/common/src/main/resources/mcpitanlib.accesswidener +++ b/common/src/main/resources/mcpitanlib.accesswidener @@ -14,6 +14,8 @@ accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minec accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/registry/RegistryKey; accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/registry/RegistryKey; +accessible method net/minecraft/block/AbstractBlock onStateReplaced (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V + accessible class net/minecraft/screen/ScreenHandlerType$Factory accessible method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V extendable method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V \ No newline at end of file From b349a315eda734ecc120a85ad0f427d9704c1a29 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 10 Mar 2024 15:49:36 +0900 Subject: [PATCH 290/622] add APIs 3 --- .../api/registry/CompatRegistry.java | 5 + .../mcpitanlib/api/util/CustomDataUtil.java | 132 +++++++++++++++ .../pitan76/mcpitanlib/api/util/NbtUtil.java | 155 ++++++++++++++++++ .../core/registry/MCPLRegistry1_21.java | 30 ++++ 4 files changed, 322 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index e0618a0cd..25183e672 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -3,6 +3,7 @@ import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.component.DataComponentType; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; @@ -136,6 +137,10 @@ public RegistryResult registerItemGroup(CreativeTabBuilder builder) { return registerItemGroup(builder.getIdentifier(), builder); } + public RegistryResult> registerDataComponentType(Identifier id, Supplier> supplier) { + return new RegistryResult<>(null); + } + public static void registerFuel(int time, ItemConvertible... item) { FuelRegistry.register(time, item); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java new file mode 100644 index 000000000..c168203e5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java @@ -0,0 +1,132 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.NbtComponent; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; + +import java.util.Set; + +/** + * カスタムデータのユーティリティクラス + */ +public class CustomDataUtil { + /** + * NBTを取得する。存在しない場合は新しいNBTを作成する。 + * @param stack ItemStack + * @return NBT + */ + public static NbtCompound getOrCreateNbt(ItemStack stack) { + if (!hasNbt(stack)) { + return NbtUtil.create(); + } + + return getNbt(stack); + } + + /** + * NBTを設定する。 + * @param stack ItemStack + * @param nbt NBT + */ + public static void setNbt(ItemStack stack, NbtCompound nbt) { + stack.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(nbt)); + } + + /** + * NBTが存在するかどうかを取得する。 + * @param stack ItemStack + * @return NBTが存在するかどうか + */ + public static boolean hasNbt(ItemStack stack) { + return stack.contains(DataComponentTypes.CUSTOM_DATA); + } + + /** + * NBTを取得する。 + * @param stack ItemStack + * @return NBT + */ + public static NbtCompound getNbt(ItemStack stack) { + return stack.get(DataComponentTypes.CUSTOM_DATA).copyNbt(); + } + + /** + * 値を設定する。 + * @param stack ItemStack + * @param key キー + * @param value 値 + */ + public static void put(ItemStack stack, String key, NbtCompound value) { + NbtCompound nbt = getOrCreateNbt(stack); + NbtUtil.put(nbt, key, value); + setNbt(stack, nbt); + } + + /** + * 値を取得する。 + * @param stack ItemStack + * @param key キー + * @return 値 + */ + public static NbtCompound get(ItemStack stack, String key) { + NbtCompound nbt = getNbt(stack); + return nbt.getCompound(key); + } + + /** + * 値を削除する。 + * @param stack ItemStack + * @param key キー + */ + public static void remove(ItemStack stack, String key) { + NbtCompound nbt = getNbt(stack); + nbt.remove(key); + setNbt(stack, nbt); + } + + /** + * 値が存在するかどうかを取得する。 + * @param stack ItemStack + * @param key キー + * @return 値が存在するかどうか + */ + public static boolean has(ItemStack stack, String key) { + NbtCompound nbt = getNbt(stack); + return nbt.contains(key); + } + + /** + * 指定した型の値を取得する + * @param stack ItemStack + * @param key キー + * @param clazz クラス + * @param 値 + */ + public static T get(ItemStack stack, String key, Class clazz) { + NbtCompound nbt = getNbt(stack); + return NbtUtil.get(nbt, key, clazz); + } + + /** + * 値を設定する。 + * @param stack ItemStack + * @param key キー + * @param value 値 + */ + public static void set(ItemStack stack, String key, T value) { + NbtCompound nbt = getOrCreateNbt(stack); + NbtUtil.set(nbt, key, value); + setNbt(stack, nbt); + } + + /** + * キーの一覧を取得する。 + * @param stack ItemStack + * @return キーの一覧 + */ + public static Set getKeys(ItemStack stack) { + NbtCompound nbt = getNbt(stack); + return NbtUtil.getKeys(nbt); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java new file mode 100644 index 000000000..d20b2dc16 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -0,0 +1,155 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtList; + +import java.util.Set; + +public class NbtUtil { + + /** + * 新しいNbtCompoundを作成する。 + * @return NbtCompound + */ + public static NbtCompound create() { + return new NbtCompound(); + } + + /** + * 値を設定する。 + * @param nbt NbtCompound + * @param key キー + * @param value 値 + */ + public static void put(NbtCompound nbt, String key, NbtCompound value) { + nbt.put(key, value); + } + + /** + * 値を取得する。 + * @param nbt NbtCompound + * @param key キー + * @return 値 + */ + public static NbtCompound get(NbtCompound nbt, String key) { + return nbt.getCompound(key); + } + + /** + * 値を削除する。 + * @param nbt NbtCompound + * @param key キー + */ + public static void remove(NbtCompound nbt, String key) { + nbt.remove(key); + } + + /** + * 値が存在するかどうかを取得する。 + * @param nbt NbtCompound + * @param key キー + * @return 値が存在するかどうか + */ + public static boolean has(NbtCompound nbt, String key) { + return nbt.contains(key); + } + + /** + * 指定した型の値を取得する + * @param nbt NbtCompound + * @param key キー + * @param clazz クラス + * @param 値 + */ + public static T get(NbtCompound nbt, String key, Class clazz) { + if (clazz == Integer.class) { + return (T) Integer.valueOf(nbt.getInt(key)); + } + if (clazz == String.class) { + return (T) nbt.getString(key); + } + if (clazz == Boolean.class) { + return (T) Boolean.valueOf(nbt.getBoolean(key)); + } + if (clazz == Float.class) { + return (T) Float.valueOf(nbt.getFloat(key)); + } + if (clazz == Double.class) { + return (T) Double.valueOf(nbt.getDouble(key)); + } + if (clazz == Long.class) { + return (T) Long.valueOf(nbt.getLong(key)); + } + if (clazz == NbtCompound.class) { + return (T) nbt.getCompound(key); + } + if (clazz == NbtList.class) { + return (T) nbt.getList(key, 9); + } + if (clazz == Byte.class) { + return (T) Byte.valueOf(nbt.getByte(key)); + } + if (clazz == Short.class) { + return (T) Short.valueOf(nbt.getShort(key)); + } + return null; + } + + /** + * 値を設定する。 + * @param nbt NbtCompound + * @param key キー + * @param value 値 + */ + public static void set(NbtCompound nbt, String key, T value) { + if (value instanceof Integer) { + nbt.putInt(key, (Integer) value); + return; + } + if (value instanceof String) { + nbt.putString(key, (String) value); + return; + } + if (value instanceof Boolean) { + nbt.putBoolean(key, (Boolean) value); + return; + } + if (value instanceof Float) { + nbt.putFloat(key, (Float) value); + return; + } + if (value instanceof Double) { + nbt.putDouble(key, (Double) value); + return; + } + if (value instanceof Long) { + nbt.putLong(key, (Long) value); + return; + } + if (value instanceof NbtCompound) { + nbt.put(key, (NbtCompound) value); + return; + } + if (value instanceof NbtList) { + nbt.put(key, (NbtList) value); + return; + } + if (value instanceof Byte) { + nbt.putByte(key, (Byte) value); + return; + } + if (value instanceof Short) { + nbt.putShort(key, (Short) value); + return; + } + } + + /** + * キーの一覧を取得する。 + * @param nbt NbtCompound + * @return キーの一覧 + */ + public static Set getKeys(NbtCompound nbt) { + return nbt.getKeys(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java new file mode 100644 index 000000000..c55a33c04 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java @@ -0,0 +1,30 @@ +package net.pitan76.mcpitanlib.core.registry; + +import dev.architectury.registry.registries.DeferredRegister; +import dev.architectury.registry.registries.RegistrySupplier; +import net.minecraft.component.DataComponentType; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; + +import java.util.function.Supplier; + +@Deprecated +public class MCPLRegistry1_21 { + + public final DeferredRegister> DATA_COMPONENT_TYPE; + + private final MCPLRegistry mcplr; + + public MCPLRegistry1_21(MCPLRegistry mcplr, String MOD_ID) { + this.mcplr = mcplr; + DATA_COMPONENT_TYPE = DeferredRegister.create(MOD_ID, RegistryKeys.DATA_COMPONENT_TYPE); + } + + public void register() { + DATA_COMPONENT_TYPE.register(); + } + + public RegistrySupplier> registryDataComponentType(Identifier id, Supplier> supplier) { + return DATA_COMPONENT_TYPE.register(id, supplier); + } +} From f60ea97e493c1c48ef37d52040b2affe6ea0e9dd Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 10 Mar 2024 15:49:44 +0900 Subject: [PATCH 291/622] fix 1205 --- .../mcpitanlib/api/registry/CompatRegistry.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index 25183e672..72df41883 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -26,6 +26,7 @@ import net.pitan76.mcpitanlib.core.registry.FuelRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_21; import java.util.function.Supplier; @@ -33,6 +34,7 @@ public class CompatRegistry { protected final MCPLRegistry mcplr; protected final MCPLRegistry1_20 mcplr1_20; + protected final MCPLRegistry1_21 mcplr1_21; protected final WorldGenRegistry worldGenRegistry; protected String MOD_ID; @@ -44,6 +46,7 @@ public class CompatRegistry { public CompatRegistry(String MOD_ID) { mcplr = new MCPLRegistry(MOD_ID); mcplr1_20 = new MCPLRegistry1_20(mcplr, MOD_ID); + mcplr1_21 = new MCPLRegistry1_21(mcplr, MOD_ID); worldGenRegistry = new WorldGenRegistry(MOD_ID); this.MOD_ID = MOD_ID; } @@ -138,7 +141,7 @@ public RegistryResult registerItemGroup(CreativeTabBuilder builder) { } public RegistryResult> registerDataComponentType(Identifier id, Supplier> supplier) { - return new RegistryResult<>(null); + return new RegistryResult<>(mcplr1_21.registryDataComponentType(id, supplier)); } public static void registerFuel(int time, ItemConvertible... item) { @@ -150,6 +153,7 @@ public void allRegister() { mcplr.allRegister1_16(); mcplr1_20.register(); + mcplr1_21.register(); // ItemGroup CreativeTabManager.allRegister(); @@ -164,4 +168,9 @@ public MCPLRegistry getMcplr() { public MCPLRegistry1_20 getMcplr1_20() { return mcplr1_20; } + + @Deprecated + public MCPLRegistry1_21 getMcplr1_21() { + return mcplr1_21; + } } From e200a9c0fe96c6353845cec334f15c0658cf7189 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 10 Mar 2024 16:29:37 +0900 Subject: [PATCH 292/622] ver2.2.0 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index fa268962b..7fe06662f 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.1.9 +mod_version=2.2.0 maven_group=net.pitan76 \ No newline at end of file From 0584fe292832018aa7d7d0453e7079a378f4f95d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:51:51 +0900 Subject: [PATCH 293/622] fix --- .../java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java index df0579715..09483127e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -60,11 +60,11 @@ public class AbstractBlockMixin { } @Inject(method = "onUse", at = @At("HEAD"), cancellable = true) - private void mcpitanlib$inject_onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable cir) { + private void mcpitanlib$inject_onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit, CallbackInfoReturnable cir) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); - ActionResult returnValue = provider.onRightClick(new BlockUseEvent(state, world, pos, player, hand, hit), options); + ActionResult returnValue = provider.onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit), options); if (options.cancel && returnValue != null) cir.setReturnValue(returnValue); } From 646685f1ff859898e46490e509172c01c46fb57b Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 11 Mar 2024 21:36:21 +0900 Subject: [PATCH 294/622] add APIs --- .../mcpitanlib/api/util/CustomDataUtil.java | 20 ++++++++++++++++++ .../mcpitanlib/api/util/ItemStackUtil.java | 21 ++++++++++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java index c168203e5..f3afa07ef 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java @@ -129,4 +129,24 @@ public static Set getKeys(ItemStack stack) { NbtCompound nbt = getNbt(stack); return NbtUtil.getKeys(nbt); } + + /** + * set(stack, key, value) のエイリアス + * @param stack ItemStack + * @param key キー + * @param value 値 + */ + public static void put(ItemStack stack, String key, T value) { + set(stack, key, value); + } + + /** + * has(stack, key) のエイリアス + * @param stack ItemStack + * @param key キー + * @return 値が存在するかどうか + */ + public static boolean contains(ItemStack stack, String key) { + return has(stack, key); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index a99753282..a40fa68fb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -17,8 +17,27 @@ public static boolean areItemsEqual(ItemStack left, ItemStack right) { return ItemStack.areItemsEqual(left, right); } + @Deprecated public static boolean areNbtEqual(ItemStack left, ItemStack right) { - // 1.20.5からはComponentを比較し、それ以前はNBTを比較する + return areNbtOrComponentEqual(left, right); + } + + /** + * NBT (1.20.4) か Component (1.20.5以降) が一致するかどうかを取得する。 + * @param left ItemStack + * @param right ItemStack + * @return NBTかComponentが一致するかどうか + */ + public static boolean areNbtOrComponentEqual(ItemStack left, ItemStack right) { return Objects.equals(left.getComponents(), right.getComponents()); } + + /** + * NBTかComponentが存在するかどうか + * @param stack ItemStack + * @return Whether NBT or Component exists + */ + public static boolean hasNbtOrComponent(ItemStack stack) { + return !stack.getComponents().isEmpty(); + } } From 93930a706246d37e64d14b816de955ff838b476e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 11 Mar 2024 21:36:39 +0900 Subject: [PATCH 295/622] v2.2.1 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 7fe06662f..6df04af43 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.0 +mod_version=2.2.1 maven_group=net.pitan76 \ No newline at end of file From 8e85f48d2e625ec696a429b81562e168f1d74672 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 12 Mar 2024 01:35:48 +0900 Subject: [PATCH 296/622] add APIs (v2.2.1) --- .../mcpitanlib/api/util/InventoryUtil.java | 17 +++++++++++++++- .../mcpitanlib/api/util/WorldUtil.java | 20 +++++++++---------- info.properties | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java index c356d1be7..1a1f41acb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java @@ -1,7 +1,10 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.inventory.Inventories; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; import net.minecraft.util.collection.DefaultedList; +import net.minecraft.world.World; public class InventoryUtil { public static boolean insertItem(ItemStack insertStack, DefaultedList inventory) { @@ -37,6 +40,18 @@ public static boolean canMergeItems(ItemStack first, ItemStack second) { if (first.getCount() + second.getCount() > first.getMaxCount()) { return false; } - return ItemStackUtil.areNbtEqual(first, second); + return ItemStackUtil.areNbtOrComponentEqual(first, second); + } + + public static NbtCompound writeNbt(World world, NbtCompound nbt, DefaultedList stacks) { + return writeNbt(world, nbt, true, stacks); + } + + public static NbtCompound writeNbt(World world, NbtCompound nbt, boolean setIfEmpty, DefaultedList stacks) { + return Inventories.writeNbt(nbt, stacks, setIfEmpty, world.getRegistryManager()); + } + + public static void readNbt(World world, NbtCompound nbt, DefaultedList stacks) { + Inventories.readNbt(nbt, stacks, world.getRegistryManager()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index c20535671..6290e0b0f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -191,27 +191,27 @@ public static void setBlockState(World world, BlockPos pos, Block block) { setBlockState(world, pos, block, 3); } - public static void breakBlock(World world, BlockPos pos, boolean drop) { - world.breakBlock(pos, drop); + public static boolean breakBlock(World world, BlockPos pos, boolean drop) { + return world.breakBlock(pos, drop); } - public static void breakBlock(World world, BlockPos pos) { - breakBlock(world, pos, true); + public static boolean breakBlock(World world, BlockPos pos) { + return breakBlock(world, pos, true); } - public static void breakBlock(World world, BlockPos pos, boolean drop, @Nullable Player player) { - world.breakBlock(pos, drop, player.getPlayerEntity()); + public static boolean breakBlock(World world, BlockPos pos, boolean drop, @Nullable Player player) { + return world.breakBlock(pos, drop, player.getPlayerEntity()); } - public static void breakBlock(World world, BlockPos pos, @Nullable Player player) { - breakBlock(world, pos, true, player); + public static boolean breakBlock(World world, BlockPos pos, @Nullable Player player) { + return breakBlock(world, pos, true, player); } public static void removeBlockEntity(World world, BlockPos pos) { world.removeBlockEntity(pos); } - public static void removeBlock(World world, BlockPos pos, boolean move) { - world.removeBlock(pos, move); + public static boolean removeBlock(World world, BlockPos pos, boolean move) { + return world.removeBlock(pos, move); } } diff --git a/info.properties b/info.properties index 6df04af43..bb7062c1d 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.1 +mod_version=2.2.2 maven_group=net.pitan76 \ No newline at end of file From abb47e5d49c1f404074fda63d2957e6673cd8bee Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 13 Mar 2024 01:03:15 +0900 Subject: [PATCH 297/622] add APIs (v2.2.3) --- .../container/factory/DisplayNameArgs.java | 9 +++ .../container/factory/ExtraDataArgs.java | 50 ++++++++++++++ .../ExtendedNamedScreenHandlerFactory.java | 1 + .../api/gui/ExtendedScreenHandlerFactory.java | 23 +++++++ .../api/tile/CompatBlockEntity.java | 2 + .../mcpitanlib/api/util/BlockStateUtil.java | 23 +++++++ .../mcpitanlib/api/util/PlatformUtil.java | 5 ++ .../extra/transfer/util/FluidStorageUtil.java | 69 +++++++++++++++++++ .../api/util/fabric/PlatformUtilImpl.java | 24 +++++++ .../api/util/forge/PlatformUtilImpl.java | 26 +++++++ info.properties | 2 +- .../api/util/neoforge/PlatformUtilImpl.java | 26 +++++++ 12 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/DisplayNameArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/util/fabric/PlatformUtilImpl.java create mode 100644 forge/src/main/java/net/pitan76/mcpitanlib/api/util/forge/PlatformUtilImpl.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/util/neoforge/PlatformUtilImpl.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/DisplayNameArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/DisplayNameArgs.java new file mode 100644 index 000000000..b82cfe48a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/DisplayNameArgs.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.api.event.container.factory; + +import net.pitan76.mcpitanlib.api.event.BaseEvent; + +public class DisplayNameArgs extends BaseEvent { + public DisplayNameArgs() { + super(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java new file mode 100644 index 000000000..f73f56479 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java @@ -0,0 +1,50 @@ +package net.pitan76.mcpitanlib.api.event.container.factory; + +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.network.ServerPlayerEntity; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.network.PacketByteUtil; + +public class ExtraDataArgs extends BaseEvent { + public PacketByteBuf buf; + public ServerPlayerEntity player; + + public ExtraDataArgs(PacketByteBuf buf, ServerPlayerEntity player) { + super(); + this.buf = buf; + this.player = player; + } + + public ExtraDataArgs() { + super(); + } + + public ExtraDataArgs(PacketByteBuf buf) { + super(); + this.buf = buf; + } + + public boolean hasPlayer() { + return player != null; + } + + public boolean hasBuf() { + return buf != null; + } + + public PacketByteBuf getBuf() { + return buf; + } + + public ServerPlayerEntity getPlayer() { + return player; + } + + /** + * @param obj The object to write + * @see PacketByteUtil#writeVar(PacketByteBuf, Object) + */ + public void writeVar(Object obj) { + PacketByteUtil.writeVar(getBuf(), obj); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedNamedScreenHandlerFactory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedNamedScreenHandlerFactory.java index 863fc52e9..e5324df34 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedNamedScreenHandlerFactory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedNamedScreenHandlerFactory.java @@ -9,6 +9,7 @@ import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; +@Deprecated public class ExtendedNamedScreenHandlerFactory implements ExtendedMenuProvider { private final Text name; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java new file mode 100644 index 000000000..1bb6de4a8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.gui; + +import dev.architectury.registry.menu.ExtendedMenuProvider; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; +import net.pitan76.mcpitanlib.api.event.container.factory.ExtraDataArgs; + +public interface ExtendedScreenHandlerFactory extends ExtendedMenuProvider { + @Override + default Text getDisplayName() { + return getDisplayName(new DisplayNameArgs()); + } + + @Override + default void saveExtraData(PacketByteBuf buf) { + writeExtraData(new ExtraDataArgs(buf)); + } + + Text getDisplayName(DisplayNameArgs args); + + void writeExtraData(ExtraDataArgs args); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index 4de3354f4..902707870 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -60,4 +60,6 @@ public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLooku wrapperLookupCache = registryLookup; readNbtOverride(nbt); } + + } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java new file mode 100644 index 000000000..ba9ec05fc --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.sound.BlockSoundGroup; + +public class BlockStateUtil { + public static Block getBlock(BlockState state) { + return state.getBlock(); + } + + public static boolean isAir(BlockState state) { + return state.isAir(); + } + + public static boolean isOpaque(BlockState state) { + return state.isOpaque(); + } + + public static BlockSoundGroup getSoundGroup(BlockState state) { + return state.getSoundGroup(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java index df68c5000..52032c12a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util; +import dev.architectury.injectables.annotations.ExpectPlatform; import dev.architectury.platform.Platform; import dev.architectury.utils.Env; import net.fabricmc.api.EnvType; @@ -24,18 +25,22 @@ public static boolean isNeoForge() { return Platform.isNeoForge(); } + @ExpectPlatform public static boolean isModLoaded(String id) { return Platform.isModLoaded(id); } + @ExpectPlatform public static boolean isClient() { return Platform.getEnvironment() == Env.CLIENT; } + @ExpectPlatform public static boolean isServer() { return Platform.getEnvironment() == Env.SERVER; } + @ExpectPlatform public static Path getConfigFolder() { return Platform.getConfigFolder(); } diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java new file mode 100644 index 000000000..863256263 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java @@ -0,0 +1,69 @@ +package net.pitan76.mcpitanlib.api.extra.transfer.util; + +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.fluid.base.SingleFluidStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.minecraft.fluid.FluidState; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.world.World; + +public class FluidStorageUtil { + public static SingleFluidStorage withFixedCapacity(long capacity, Runnable onChange) { + return SingleFluidStorage.withFixedCapacity(capacity, onChange); + } + + public static void readNbt(SingleFluidStorage storage, NbtCompound nbt, World world) { + storage.readNbt(nbt, world.getRegistryManager()); + } + + public static void writeNbt(SingleFluidStorage storage, NbtCompound nbt, World world) { + storage.writeNbt(nbt, world.getRegistryManager()); + } + + public static long getAmount(SingleFluidStorage storage) { + return storage.getAmount(); + } + + public static long getCapacity(SingleFluidStorage storage) { + return storage.getCapacity(); + } + + public static FluidVariant getResource(SingleFluidStorage storage) { + return storage.getResource(); + } + + public static boolean isResourceBlank(SingleFluidStorage storage) { + return storage.isResourceBlank(); + } + + public static long insert(SingleFluidStorage storage, FluidVariant insertedVariant, long maxAmount, Transaction transaction) { + return storage.insert(insertedVariant, maxAmount, transaction); + } + + public static long extract(SingleFluidStorage storage, FluidVariant extractedVariant, long maxAmount, Transaction transaction) { + return storage.extract(extractedVariant, maxAmount, transaction); + } + + public static void insert(SingleFluidStorage storage, FluidState fluidState, long maxAmount) { + try (Transaction transaction = Transaction.openOuter()) { + insert(storage, FluidVariant.of(fluidState.getFluid()), maxAmount, transaction); + transaction.commit(); + } + } + + public static void extract(SingleFluidStorage storage, FluidState fluidState, long maxAmount) { + try (Transaction transaction = Transaction.openOuter()) { + extract(storage, FluidVariant.of(fluidState.getFluid()), maxAmount, transaction); + transaction.commit(); + } + } + + public static boolean isEmpty(SingleFluidStorage storage) { + return getAmount(storage) == 0; + } + + public static boolean isFull(SingleFluidStorage storage) { + return getAmount(storage) >= getCapacity(storage); + } +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/util/fabric/PlatformUtilImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/util/fabric/PlatformUtilImpl.java new file mode 100644 index 000000000..5645a7e76 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/util/fabric/PlatformUtilImpl.java @@ -0,0 +1,24 @@ +package net.pitan76.mcpitanlib.api.util.fabric; + +import net.fabricmc.api.EnvType; +import net.fabricmc.loader.api.FabricLoader; + +import java.nio.file.Path; + +public class PlatformUtilImpl { + public static boolean isClient() { + return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT; + } + + public static boolean isServer() { + return FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER; + } + + public static Path getConfigFolder() { + return FabricLoader.getInstance().getConfigDir(); + } + + public static boolean isModLoaded(String id) { + return FabricLoader.getInstance().isModLoaded(id); + } +} diff --git a/forge/src/main/java/net/pitan76/mcpitanlib/api/util/forge/PlatformUtilImpl.java b/forge/src/main/java/net/pitan76/mcpitanlib/api/util/forge/PlatformUtilImpl.java new file mode 100644 index 000000000..80019e102 --- /dev/null +++ b/forge/src/main/java/net/pitan76/mcpitanlib/api/util/forge/PlatformUtilImpl.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.util.forge; + +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.ModList; +import net.minecraftforge.fml.loading.FMLEnvironment; +import net.minecraftforge.fml.loading.FMLPaths; + +import java.nio.file.Path; + +public class PlatformUtilImpl { + public static boolean isClient() { + return FMLEnvironment.dist == Dist.CLIENT; + } + + public static boolean isServer() { + return FMLEnvironment.dist == Dist.DEDICATED_SERVER; + } + + public static Path getConfigFolder() { + return FMLPaths.CONFIGDIR.get(); + } + + public static boolean isModLoaded(String id) { + return ModList.get().isLoaded(id); + } +} diff --git a/info.properties b/info.properties index bb7062c1d..41c3d60e9 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.2 +mod_version=2.2.3 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/util/neoforge/PlatformUtilImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/util/neoforge/PlatformUtilImpl.java new file mode 100644 index 000000000..d3836ed5e --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/util/neoforge/PlatformUtilImpl.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.util.neoforge; + +import net.neoforged.api.distmarker.Dist; +import net.neoforged.fml.ModList; +import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.fml.loading.FMLPaths; + +import java.nio.file.Path; + +public class PlatformUtilImpl { + public static boolean isClient() { + return FMLEnvironment.dist == Dist.CLIENT; + } + + public static boolean isServer() { + return FMLEnvironment.dist == Dist.DEDICATED_SERVER; + } + + public static Path getConfigFolder() { + return FMLPaths.CONFIGDIR.get(); + } + + public static boolean isModLoaded(String id) { + return ModList.get().isLoaded(id); + } +} From e657a2d861baef4483451d3ca8515cfae0f60f09 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 25 Mar 2024 15:23:12 +0900 Subject: [PATCH 298/622] fix util --- .../mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java index 863256263..b7df20b69 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.extra.transfer.util; -import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; import net.fabricmc.fabric.api.transfer.v1.fluid.base.SingleFluidStorage; import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; From 73b5b63bba643c0dccbe7120e9659d9cdcfb9741 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:25:17 +0900 Subject: [PATCH 299/622] if custom data is null, create nbt --- .../java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java index f3afa07ef..bd682d71d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java @@ -48,6 +48,9 @@ public static boolean hasNbt(ItemStack stack) { * @return NBT */ public static NbtCompound getNbt(ItemStack stack) { + if (stack.get(DataComponentTypes.CUSTOM_DATA) == null) + return NbtUtil.create(); + return stack.get(DataComponentTypes.CUSTOM_DATA).copyNbt(); } From 3f281369234f5210f2d4a2bcfb441375bffdaee0 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:27:43 +0900 Subject: [PATCH 300/622] change ver 2.2.4 if stack does not have nbt, return false --- .../java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java | 3 +++ info.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java index bd682d71d..1fa682f9f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java @@ -95,6 +95,9 @@ public static void remove(ItemStack stack, String key) { * @return 値が存在するかどうか */ public static boolean has(ItemStack stack, String key) { + if (!hasNbt(stack)) + return false; + NbtCompound nbt = getNbt(stack); return nbt.contains(key); } diff --git a/info.properties b/info.properties index 41c3d60e9..127a5c022 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.3 +mod_version=2.2.4 maven_group=net.pitan76 \ No newline at end of file From bea42165dc950fc1860918f1fefc1d7d7c51617c Mon Sep 17 00:00:00 2001 From: mymai1208 <62325307+mymai1208@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:14:55 +0900 Subject: [PATCH 301/622] add registerEntityModelLayer --- .../api/client/registry/CompatRegistryClient.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index a71c39e0e..b0c14dac5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.client.registry; +import dev.architectury.registry.client.level.entity.EntityModelLayerRegistry; import dev.architectury.registry.client.level.entity.EntityRendererRegistry; import dev.architectury.registry.client.particle.ParticleProviderRegistry; import dev.architectury.registry.client.rendering.BlockEntityRendererRegistry; @@ -14,6 +15,7 @@ import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; import net.minecraft.client.model.ModelPart; +import net.minecraft.client.model.TexturedModelData; import net.minecraft.client.particle.ParticleFactory; import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.render.RenderLayer; @@ -111,6 +113,10 @@ public static void registryClientSprite(Identifier atlasId, Sprite sprite) { // ～1.19.2 } + public static void registerEntityModelLayer(EntityModelLayer layer, Supplier modelData) { + EntityModelLayerRegistry.register(layer, modelData); + } + public static void registerBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { BlockEntityRendererRegistry.register(type, ctx -> provider.create(new BlockEntityRendererFactory.Context( ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer() From 76ffb489c1a2d5b7460de5d6aa4dbc6d6b875b08 Mon Sep 17 00:00:00 2001 From: mymai1208 <62325307+mymai1208@users.noreply.github.com> Date: Thu, 4 Apr 2024 11:48:14 +0900 Subject: [PATCH 302/622] fix --- .../client/registry/CompatRegistryClient.java | 5 ++-- .../render/EntityModelLayerContext.java | 27 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index b0c14dac5..776ecfd2d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -40,6 +40,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.math.random.Random; +import net.pitan76.mcpitanlib.api.client.render.EntityModelLayerContext; import java.util.List; import java.util.function.Supplier; @@ -113,8 +114,8 @@ public static void registryClientSprite(Identifier atlasId, Sprite sprite) { // ～1.19.2 } - public static void registerEntityModelLayer(EntityModelLayer layer, Supplier modelData) { - EntityModelLayerRegistry.register(layer, modelData); + public static void registerEntityModelLayer(EntityModelLayer layer, EntityModelLayerContext context) { + EntityModelLayerRegistry.register(layer, () -> TexturedModelData.of(context.getData(), context.getWidth(), context.getHeight())); } public static void registerBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java new file mode 100644 index 000000000..9c8880f56 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.client.render; + +import net.minecraft.client.model.ModelData; + +public class EntityModelLayerContext { + private final ModelData data; + private final int width; + private final int height; + + public EntityModelLayerContext(ModelData data, int width, int height) { + this.data = data; + this.width = width; + this.height = height; + } + + public int getHeight() { + return height; + } + + public int getWidth() { + return width; + } + + public ModelData getData() { + return data; + } +} From 873be4e6286cc24437b2985466aac0376cf767a6 Mon Sep 17 00:00:00 2001 From: mymai1208 <62325307+mymai1208@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:23:06 +0900 Subject: [PATCH 303/622] support EntityModelLayer --- .../mcpitanlib/api/client/registry/CompatRegistryClient.java | 4 ++++ .../mcpitanlib/api/client/render/EntityModelLayerContext.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index 776ecfd2d..ed7f5b860 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -83,6 +83,10 @@ public Sprite getSprite(Random random) { })); } + public static void registerEntityModelLayer(EntityModelLayer layer, EntityModelLayerContext context) { + EntityModelLayerRegistry.register(layer, () -> TexturedModelData.of(context.getData(), context.getWidth(), context.getHeight())); + } + public static void registerEntityRenderer(Supplier> type, EntityRendererFactory provider) { EntityRendererRegistry.register(type, provider); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java index 9c8880f56..d1d343924 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/EntityModelLayerContext.java @@ -24,4 +24,4 @@ public int getWidth() { public ModelData getData() { return data; } -} +} \ No newline at end of file From 2b50865247caea5c2e1097475d8ff119200a305b Mon Sep 17 00:00:00 2001 From: mymai1208 <62325307+mymai1208@users.noreply.github.com> Date: Thu, 4 Apr 2024 12:39:04 +0900 Subject: [PATCH 304/622] add EntityModelLayerRegister --- .../mcpitanlib/api/client/registry/CompatRegistryClient.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index ed7f5b860..a7445379c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -128,6 +128,10 @@ public static void registerBlockEntityRenderer(BlockEnti ))); } + public static void registerEntityModelLayer(EntityModelLayer layer, EntityModelLayerContext context) { + EntityModelLayerRegistry.register(layer, () -> TexturedModelData.of(context.getData(), context.getWidth(), context.getHeight())); + } + @FunctionalInterface public interface BlockEntityRendererFactory { BlockEntityRenderer create(Context ctx); From fa2f27c18ce6777862b1825ada2256c56477cf25 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 6 Apr 2024 16:48:07 +0900 Subject: [PATCH 305/622] fix --- .../api/client/registry/CompatRegistryClient.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index a7445379c..f36b62f82 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -118,20 +118,12 @@ public static void registryClientSprite(Identifier atlasId, Sprite sprite) { // ～1.19.2 } - public static void registerEntityModelLayer(EntityModelLayer layer, EntityModelLayerContext context) { - EntityModelLayerRegistry.register(layer, () -> TexturedModelData.of(context.getData(), context.getWidth(), context.getHeight())); - } - public static void registerBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { BlockEntityRendererRegistry.register(type, ctx -> provider.create(new BlockEntityRendererFactory.Context( ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer() ))); } - public static void registerEntityModelLayer(EntityModelLayer layer, EntityModelLayerContext context) { - EntityModelLayerRegistry.register(layer, () -> TexturedModelData.of(context.getData(), context.getWidth(), context.getHeight())); - } - @FunctionalInterface public interface BlockEntityRendererFactory { BlockEntityRenderer create(Context ctx); From 19000fb7f91cf04f1f598e91248f2784e8b3257e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 24 May 2024 15:22:03 +0900 Subject: [PATCH 306/622] update gradle --- build.gradle | 2 +- gradle.properties | 18 ++++++++++-------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index fbbbcfed2..1856680b9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false } architectury { diff --git a/gradle.properties b/gradle.properties index 413e3d1da..a0602f4d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,26 +1,28 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=24w10a +minecraft_version=1.20.6 +# Fabric API +fabric_version=0.99.0+1.20.6 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=12.0.16 +architectury_version=12.1.2 # https://fabricmc.net/develop/ -fabric_loader_version=0.15.7 -yarn_mappings=24w10a+build.3 -fabric_api_version=0.96.8+1.20.5 +fabric_loader_version=0.15.11 +yarn_mappings=1.20.6+build.2 +fabric_api_version=0.99.0+1.20.6 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.20.4-49.0.3 +forge_version=1.20.6-50.0.29 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.23.1 quilt_fabric_api_version=6.0.2 # https://projects.neoforged.net/neoforged/neoforge -neoforge_version=20.4.159-beta +neoforge_version=20.6.75-beta -cloth_config_version=13.0.121 +cloth_config_version=14.0.126 fabricEnabled=true forgeEnabled=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e411586a5..17655d0ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 9c015ccca46552c0a7c8c5c419f4f3088207f44e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 24 May 2024 15:22:49 +0900 Subject: [PATCH 307/622] port to 1.20.6 --- .../api/client/SimpleHandledScreen.java | 8 +++-- .../api/client/SimpleInventoryScreen.java | 5 +++ .../mcpitanlib/api/client/SimpleScreen.java | 7 +++- .../client/gui/widget/SimpleListWidget.java | 4 +-- .../api/entity/ExtendEntityType.java | 8 ++++- .../event/item/ItemAppendTooltipEvent.java | 16 +++++---- .../event/v0/event/RecipeManagerEvent.java | 14 ++++---- .../api/item/CompatibleItemSettings.java | 7 ++-- .../mcpitanlib/api/item/ExtendBlockItem.java | 8 ++--- .../mcpitanlib/api/item/ExtendItem.java | 8 ++--- .../api/item/tool/CompatibleAxeItem.java | 10 +++--- .../api/item/tool/CompatibleHoeItem.java | 10 +++--- .../item/tool/CompatibleMiningToolItem.java | 28 ++++++++-------- .../api/item/tool/CompatiblePickaxeItem.java | 10 +++--- .../api/item/tool/CompatibleShearsItem.java | 10 +++--- .../api/item/tool/CompatibleShovelItem.java | 10 +++--- .../api/item/tool/CompatibleSwordItem.java | 10 +++--- .../api/item/tool/CompatibleToolItem.java | 10 +++--- .../api/item/tool/CompatibleToolMaterial.java | 33 +++++++++++++++++++ .../api/network/ClientNetworking.java | 12 +++++-- .../api/network/ServerNetworking.java | 16 +++++++-- .../api/util/EquipMaterialUtil.java | 7 ++-- .../pitan76/mcpitanlib/mixin/ItemMixin.java | 6 ++-- .../mcpitanlib/mixin/RecipeManagerMixin.java | 11 ++++--- .../main/resources/mcpitanlib.accesswidener | 21 ++++++++++++ 25 files changed, 197 insertions(+), 92 deletions(-) create mode 100644 fabric/src/main/resources/mcpitanlib.accesswidener diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index f037e520d..0f16ebc78 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -27,7 +27,6 @@ public abstract class SimpleHandledScreen extends HandledScreen { public Text title; public MinecraftClient client; - public SimpleHandledScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); fixScreen(); @@ -193,7 +192,8 @@ public boolean keyPressed(KeyEventArgs args) { } public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { - Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), 0, 0, this.width, this.height); + if (getBackgroundTexture() != null) + Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), getBackgroundTexture(), x, y, 0, 0, this.width, this.height); } @Deprecated @@ -231,4 +231,8 @@ public void close() { public void removed() { removedOverride(); } + + public Identifier getBackgroundTexture() { + return null; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java index d642de247..2a6322b7d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java @@ -17,6 +17,11 @@ public SimpleInventoryScreen(ScreenHandler handler, PlayerInventory inventory, T public abstract Identifier getTexture(); + @Override + public Identifier getBackgroundTexture() { + return getTexture(); + } + @Override public void drawBackgroundOverride(DrawBackgroundArgs args) { RenderUtil.setShaderToPositionTexProgram(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index f58073e7f..b3babddf1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -132,7 +132,8 @@ public boolean keyPressed(KeyEventArgs args) { } public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { - Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), 0, 0, this.width, this.height); + if (getBackgroundTexture() != null) + Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), getBackgroundTexture(), 0, 0, 0, 0, this.width, this.height); } @Deprecated @@ -170,4 +171,8 @@ public void close() { public void removed() { removedOverride(); } + + public Identifier getBackgroundTexture() { + return null; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java index 02335aaca..d93a910dd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/SimpleListWidget.java @@ -45,8 +45,8 @@ public int getHeight() { } @Override - protected int getScrollbarPositionX() { - return super.getScrollbarPositionX() + 32; + protected int getScrollbarX() { + return super.getScrollbarX() + 32; } @Nullable diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java index 6d9d7cb86..57bc7e021 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java @@ -12,8 +12,14 @@ public class ExtendEntityType extends EntityType { private final Boolean alwaysUpdateVelocity; + @Deprecated + public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { + super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); + this.alwaysUpdateVelocity = alwaysUpdateVelocity; + } + public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { - super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); + super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, 5, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); this.alwaysUpdateVelocity = alwaysUpdateVelocity; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java index 29dfbb2f7..fc5f69003 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.event.item; -import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.item.TooltipType; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.world.World; @@ -13,12 +14,15 @@ public class ItemAppendTooltipEvent extends BaseEvent { public ItemStack stack; public World world; public List tooltip; - public TooltipContext context; - public ItemAppendTooltipEvent(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { + public TooltipType type; + public Item.TooltipContext context; + + public ItemAppendTooltipEvent(ItemStack stack, @Nullable World world, List tooltip, TooltipType type, Item.TooltipContext context) { this.stack = stack; this.world = world; this.tooltip = tooltip; + this.type = type; this.context = context; } @@ -34,7 +38,7 @@ public List getTooltip() { return tooltip; } - public TooltipContext getContext() { + public Item.TooltipContext getContext() { return context; } @@ -51,10 +55,10 @@ public boolean removeTooltip(Text text) { } public boolean isCreative() { - return context.isAdvanced(); + return type.isCreative(); } public boolean isAdvanced() { - return context.isAdvanced(); + return type.isAdvanced(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index f6d0c7f02..9ecb6d85b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -3,7 +3,6 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; import net.minecraft.recipe.RecipeEntry; -import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; @@ -17,24 +16,27 @@ public class RecipeManagerEvent { public Profiler profiler; @Deprecated - public Map, ImmutableMap.Builder>> map; + public ImmutableMap.Builder> builder; - public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, Map, ImmutableMap.Builder>> map2) { + public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, ImmutableMap.Builder> builder) { this.jsonMap = map; this.resourceManager = resourceManager; this.profiler = profiler; - this.map = map2; + this.builder = builder; } public Map getJsonMap() { return jsonMap; } + /* @Deprecated public Map, ImmutableMap.Builder>> getMap() { return map; } + */ + public Profiler getProfiler() { return profiler; } @@ -44,10 +46,10 @@ public ResourceManager getResourceManager() { } public void putCompatibleRecipeEntry(Identifier id, CompatibleRecipeEntry entry) { - map.get(entry.getType()).put(entry.getId(), entry.getRecipeEntry()); + putCompatibleRecipeEntry(entry); } public void putCompatibleRecipeEntry(CompatibleRecipeEntry entry) { - map.get(entry.getType()).put(entry.getId(), entry.getRecipeEntry()); + builder.put(entry.getId(), entry.getRecipeEntry()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index 5f0e37214..75cfd65ad 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.item; import dev.architectury.registry.registries.RegistrySupplier; -import net.minecraft.item.FoodComponent; +import net.minecraft.component.type.FoodComponent; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; @@ -53,7 +53,10 @@ public CompatibleItemSettings maxDamage(int maxDamage) { } public CompatibleItemSettings maxDamageIfAbsent(int maxDamage) { - settings.maxDamageIfAbsent(maxDamage); + try { + settings.maxDamage(maxDamage); + } catch (Exception ignored) {} + return this; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java index 842e964ab..ca61ea953 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.block.Block; -import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.item.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; @@ -64,8 +64,8 @@ public boolean hasRecipeRemainder() { @Deprecated @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - appendTooltip(new ItemAppendTooltipEvent(stack, world, tooltip, context)); + public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { + appendTooltip(new ItemAppendTooltipEvent(stack, null, tooltip, type, context)); } @Deprecated @@ -125,7 +125,7 @@ public boolean hasRecipeRemainder(Dummy dummy) { * @param event ItemAppendTooltipEvent */ public void appendTooltip(ItemAppendTooltipEvent event) { - super.appendTooltip(event.stack, event.world, event.tooltip, event.context); + super.appendTooltip(event.stack, event.context, event.tooltip, event.type); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 280e85660..0f332806f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.block.BlockState; -import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.item.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -62,8 +62,8 @@ public boolean hasRecipeRemainder() { @Deprecated @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - appendTooltip(new ItemAppendTooltipEvent(stack, world, tooltip, context)); + public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { + appendTooltip(new ItemAppendTooltipEvent(stack, null, tooltip, type, context)); } @Deprecated @@ -135,7 +135,7 @@ public boolean hasRecipeRemainder(Dummy dummy) { * @param event ItemAppendTooltipEvent */ public void appendTooltip(ItemAppendTooltipEvent event) { - super.appendTooltip(event.stack, event.world, event.tooltip, event.context); + super.appendTooltip(event.stack, event.context, event.tooltip, event.type); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index a34993a9e..962751554 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -22,23 +22,23 @@ public CompatibleAxeItem(float attackDamage, float attackSpeed, ToolMaterial mat } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); } @Deprecated @Override - public boolean isSuitableFor(BlockState state) { + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; } @Deprecated @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index 3270516dd..d234c5873 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -22,23 +22,23 @@ public CompatibleHoeItem(int attackDamage, float attackSpeed, ToolMaterial mater } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); } @Deprecated @Override - public boolean isSuitableFor(BlockState state) { + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; } @Deprecated @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index 0ea2f1f69..caffdc130 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -25,11 +25,23 @@ public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamag } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); + } + + @Deprecated + @Override + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { + return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; + } + + @Deprecated + @Override + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } /** @@ -50,18 +62,6 @@ public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } - @Deprecated - @Override - public boolean isSuitableFor(BlockState state) { - return overrideIsSuitableFor(state); - } - - @Deprecated - @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); - } - @Deprecated @Override public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attacker) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index cf67711a9..04eb92ba0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -22,23 +22,23 @@ public CompatiblePickaxeItem(int attackDamage, float attackSpeed, ToolMaterial m } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); } @Deprecated @Override - public boolean isSuitableFor(BlockState state) { + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; } @Deprecated @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java index fb1811e29..04296c563 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java @@ -21,23 +21,23 @@ public CompatibleShearsItem(CompatibleItemSettings settings) { } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); } @Deprecated @Override - public boolean isSuitableFor(BlockState state) { + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; } @Deprecated @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index 01355cddf..728fe5922 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -22,23 +22,23 @@ public CompatibleShovelItem(float attackDamage, float attackSpeed, ToolMaterial } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); } @Deprecated @Override - public boolean isSuitableFor(BlockState state) { + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; } @Deprecated @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index 1097e8746..4b9f70234 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -22,23 +22,23 @@ public CompatibleSwordItem(int attackDamage, float attackSpeed, ToolMaterial mat } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); } @Deprecated @Override - public boolean isSuitableFor(BlockState state) { + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; } @Deprecated @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java index 41e3c7f87..949cfd572 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java @@ -23,23 +23,23 @@ public CompatibleToolItem(CompatibleToolMaterial material, CompatibleItemSetting } public boolean overrideIsSuitableFor(BlockState state) { - return super.isSuitableFor(state); + return super.isCorrectForDrops(getDefaultStack(), state); } @Deprecated @Override - public boolean isSuitableFor(BlockState state) { + public boolean isCorrectForDrops(ItemStack stack, BlockState state) { return overrideIsSuitableFor(state); } public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return super.getMiningSpeedMultiplier(stack, state); + return 1.0F; } @Deprecated @Override - public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state); + public float getMiningSpeed(ItemStack stack, BlockState state) { + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java index bbd737fd7..dabf05b57 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java @@ -1,7 +1,11 @@ package net.pitan76.mcpitanlib.api.item.tool; +import net.minecraft.block.Block; import net.minecraft.item.ToolMaterial; +import net.minecraft.item.ToolMaterials; import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.TagKey; public interface CompatibleToolMaterial extends ToolMaterial { @@ -17,11 +21,40 @@ public interface CompatibleToolMaterial extends ToolMaterial { int getCompatEnchantability(); + /* @Deprecated @Override default int getMiningLevel() { return getCompatMiningLevel(); } + */ + + + @Override + default TagKey getInverseTag() { + + return level2inverseTag(getCompatMiningLevel()); + } + + public static TagKey level2inverseTag(int level) { + switch (level) { + case 1: + return BlockTags.INCORRECT_FOR_WOODEN_TOOL; + case 2: + return BlockTags.INCORRECT_FOR_STONE_TOOL; + case 3: + return BlockTags.INCORRECT_FOR_IRON_TOOL; + case 4: + return BlockTags.INCORRECT_FOR_GOLD_TOOL; + case 5: + return BlockTags.INCORRECT_FOR_DIAMOND_TOOL; + case 6: + return BlockTags.INCORRECT_FOR_NETHERITE_TOOL; + + default: + return BlockTags.INCORRECT_FOR_WOODEN_TOOL; + } + } @Deprecated @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index d24de60c8..b285e8c64 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -1,20 +1,28 @@ package net.pitan76.mcpitanlib.api.network; +import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; +import io.netty.buffer.ByteBufUtil; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.codec.PacketCodecs; +import net.minecraft.network.packet.CustomPayload; import net.minecraft.util.Identifier; +import static dev.architectury.impl.NetworkAggregator.C2S_TYPE; import static dev.architectury.networking.NetworkManager.Side.S2C; public class ClientNetworking { public static void send(Identifier identifier, PacketByteBuf buf) { - NetworkManager.sendToServer(identifier, buf); + CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(C2S_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + NetworkManager.sendToServer(payload); } public static void registerReceiver(Identifier identifier, ClientNetworkHandler handler) { - NetworkManager.registerReceiver(S2C, identifier, ((buf, context) -> handler.receive(MinecraftClient.getInstance(), MinecraftClient.getInstance().player, buf))); + CustomPayload.Id type = CustomPayload.id(identifier.toString()); + // Todo: ごみ + NetworkManager.registerReceiver(S2C, type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), ((buf, context) -> handler.receive(MinecraftClient.getInstance(), MinecraftClient.getInstance().player, PacketByteUtil.create()))); } @FunctionalInterface diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index 69577d801..3c54d5382 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -1,20 +1,28 @@ package net.pitan76.mcpitanlib.api.network; +import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; +import io.netty.buffer.ByteBufUtil; import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.packet.CustomPayload; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; +import static dev.architectury.impl.NetworkAggregator.C2S_TYPE; +import static dev.architectury.impl.NetworkAggregator.S2C_TYPE; import static dev.architectury.networking.NetworkManager.Side.C2S; +import static dev.architectury.networking.NetworkManager.Side.S2C; public class ServerNetworking { public static void send(ServerPlayerEntity player, Identifier identifier, PacketByteBuf buf) { - NetworkManager.sendToPlayer(player, identifier, buf); + CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + NetworkManager.sendToPlayer(player, payload); } public static void send(Iterable players, Identifier identifier, PacketByteBuf buf) { - NetworkManager.sendToPlayers(players, identifier, buf); + CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + NetworkManager.sendToPlayers(players, payload); } @@ -23,7 +31,9 @@ public static void sendAll(MinecraftServer server, Identifier identifier, Packet } public static void registerReceiver(Identifier identifier, ServerNetworkHandler handler) { - NetworkManager.registerReceiver(C2S, identifier, ((buf, context) -> handler.receive(context.getPlayer().getServer(), (ServerPlayerEntity) context.getPlayer(), buf))); + CustomPayload.Id type = CustomPayload.id(identifier.toString()); + // Todo: ごみ + NetworkManager.registerReceiver(S2C, type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), ((buf, context) -> handler.receive(context.getPlayer().getServer(), (ServerPlayerEntity) context.getPlayer(), PacketByteUtil.create()))); } @FunctionalInterface diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java index a858c0f92..e335ef228 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java @@ -1,11 +1,14 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.block.Block; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.tag.TagKey; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; +import net.pitan76.mcpitanlib.api.item.tool.CompatibleToolMaterial; public class EquipMaterialUtil { public static ToolMaterial createToolMaterial(int durability, float miningSpeedMultiplier, float attackDamage, int miningLevel, int enchantability, Ingredient repairIngredient) { @@ -26,8 +29,8 @@ public float getAttackDamage() { } @Override - public int getMiningLevel() { - return miningLevel; + public TagKey getInverseTag() { + return CompatibleToolMaterial.level2inverseTag(miningLevel); } @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 7ca2872b2..c548d0017 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.mixin; import net.minecraft.block.BlockState; -import net.minecraft.client.item.TooltipContext; +import net.minecraft.client.item.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -83,11 +83,11 @@ public class ItemMixin { } @Inject(method = "appendTooltip", at = @At("HEAD"), cancellable = true) - private void mcpitanlib$appendTooltip(ItemStack stack, World world, List tooltip, TooltipContext context, CallbackInfo ci) { + private void mcpitanlib$appendTooltip(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipType type, CallbackInfo ci) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); - provider.appendTooltip(new ItemAppendTooltipEvent(stack, world, tooltip, context), options); + provider.appendTooltip(new ItemAppendTooltipEvent(stack, null, tooltip, type, context), options); if (options.cancel) ci.cancel(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 0fa71f718..995fa874b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -2,9 +2,9 @@ import com.google.common.collect.ImmutableMap; import com.google.gson.JsonElement; +import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; -import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; @@ -20,12 +20,13 @@ @Mixin(RecipeManager.class) public class RecipeManagerMixin { + // かんたんなこともわかんねえの？ @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", - at = @At(value = "INVOKE", target = "Ljava/util/Map;entrySet()Ljava/util/Set;", ordinal = 1), - locals = LocalCapture.CAPTURE_FAILHARD) - private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, Map, ImmutableMap.Builder>> map2) { + at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap;builder()Lcom/google/common/collect/ImmutableMap$Builder;", ordinal = 1), + locals = LocalCapture.CAPTURE_FAILHARD, remap = false) + private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, ImmutableMap.Builder> builder2) { if (RecipeManagerRegistry.managers.isEmpty()) return; - RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, map2))); + RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, builder2))); } } diff --git a/fabric/src/main/resources/mcpitanlib.accesswidener b/fabric/src/main/resources/mcpitanlib.accesswidener new file mode 100644 index 000000000..e0993935d --- /dev/null +++ b/fabric/src/main/resources/mcpitanlib.accesswidener @@ -0,0 +1,21 @@ +accessWidener v2 named +accessible field net/minecraft/item/ItemGroups BUILDING_BLOCKS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups COLORED_BLOCKS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups NATURAL Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups FUNCTIONAL Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups REDSTONE Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups HOTBAR Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups SEARCH Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups TOOLS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups COMBAT Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups FOOD_AND_DRINK Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups INGREDIENTS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/registry/RegistryKey; +accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/registry/RegistryKey; + +accessible method net/minecraft/block/AbstractBlock onStateReplaced (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V + +accessible class net/minecraft/screen/ScreenHandlerType$Factory +accessible method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V +extendable method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V \ No newline at end of file From 8a2dfafd358a2a3ea6f2fcf6548e9a5d1fce4229 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 24 May 2024 17:20:31 +0900 Subject: [PATCH 308/622] port to 1.20.6 --- .../event/v0/event/RecipeManagerEvent.java | 26 ++++++++++++------- .../mcpitanlib/mixin/RecipeManagerMixin.java | 15 +++++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index 9ecb6d85b..4fae9bcdb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -1,8 +1,9 @@ package net.pitan76.mcpitanlib.api.event.v0.event; -import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Multimap; import com.google.gson.JsonElement; import net.minecraft.recipe.RecipeEntry; +import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; @@ -16,26 +17,32 @@ public class RecipeManagerEvent { public Profiler profiler; @Deprecated - public ImmutableMap.Builder> builder; + public Map> recipesById; - public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, ImmutableMap.Builder> builder) { + @Deprecated + public Multimap, RecipeEntry> recipesByType; + + public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, Map> recipesById, Multimap, RecipeEntry> recipesByType) { this.jsonMap = map; this.resourceManager = resourceManager; this.profiler = profiler; - this.builder = builder; + this.recipesById = recipesById; + this.recipesByType = recipesByType; } public Map getJsonMap() { return jsonMap; } - /* @Deprecated - public Map, ImmutableMap.Builder>> getMap() { - return map; + public Map> getRecipesById() { + return recipesById; } - */ + @Deprecated + public Multimap, RecipeEntry> getRecipesByType() { + return recipesByType; + } public Profiler getProfiler() { return profiler; @@ -50,6 +57,7 @@ public void putCompatibleRecipeEntry(Identifier id, CompatibleRecipeEntry entry) } public void putCompatibleRecipeEntry(CompatibleRecipeEntry entry) { - builder.put(entry.getId(), entry.getRecipeEntry()); + recipesById.put(entry.getId(), entry.getRecipeEntry()); + recipesByType.put(entry.getType(), entry.getRecipeEntry()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 995fa874b..cd2983203 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -1,16 +1,19 @@ package net.pitan76.mcpitanlib.mixin; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Multimap; import com.google.gson.JsonElement; import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; +import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; import net.pitan76.mcpitanlib.api.event.v0.event.RecipeManagerEvent; import net.pitan76.mcpitanlib.api.event.v1.RecipeManagerRegistry; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -20,13 +23,15 @@ @Mixin(RecipeManager.class) public class RecipeManagerMixin { - // かんたんなこともわかんねえの？ + @Shadow private Map> recipesById; + + @Shadow private Multimap, RecipeEntry> recipesByType; + @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", - at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap;builder()Lcom/google/common/collect/ImmutableMap$Builder;", ordinal = 1), - locals = LocalCapture.CAPTURE_FAILHARD, remap = false) - private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, ImmutableMap.Builder> builder2) { + at = @At(value = "TAIL")) + private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci) { if (RecipeManagerRegistry.managers.isEmpty()) return; - RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, builder2))); + RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, recipesById, recipesByType))); } } From 304708ddb51385675a3b6ad733c759d79c85985f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 27 May 2024 20:04:45 +0900 Subject: [PATCH 309/622] temp fix network api --- .../api/network/ClientNetworking.java | 20 ++++++++++++----- .../api/network/ServerNetworking.java | 22 +++++++++++++------ 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index b285e8c64..eb61c730a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -2,16 +2,18 @@ import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; +import dev.architectury.networking.simple.BaseS2CMessage; +import dev.architectury.networking.simple.MessageDecoder; +import dev.architectury.networking.simple.SimpleNetworkManager; import io.netty.buffer.ByteBufUtil; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.network.PacketByteBuf; -import net.minecraft.network.codec.PacketCodecs; +import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.packet.CustomPayload; import net.minecraft.util.Identifier; import static dev.architectury.impl.NetworkAggregator.C2S_TYPE; -import static dev.architectury.networking.NetworkManager.Side.S2C; public class ClientNetworking { public static void send(Identifier identifier, PacketByteBuf buf) { @@ -20,9 +22,17 @@ public static void send(Identifier identifier, PacketByteBuf buf) { } public static void registerReceiver(Identifier identifier, ClientNetworkHandler handler) { - CustomPayload.Id type = CustomPayload.id(identifier.toString()); - // Todo: ごみ - NetworkManager.registerReceiver(S2C, type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), ((buf, context) -> handler.receive(MinecraftClient.getInstance(), MinecraftClient.getInstance().player, PacketByteUtil.create()))); + SimpleNetworkManager.create(identifier.getNamespace()).registerS2C(identifier.getPath(), new MessageDecoder<>() { + @Override + public BaseS2CMessage decode(RegistryByteBuf buf) { + return null; + } + + @Override + public NetworkManager.NetworkReceiver createReceiver() { + return ((buf, context) -> handler.receive(MinecraftClient.getInstance(), MinecraftClient.getInstance().player, buf)); + } + }); } @FunctionalInterface diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index 3c54d5382..e0a895ca4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -2,17 +2,18 @@ import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; +import dev.architectury.networking.simple.BaseC2SMessage; +import dev.architectury.networking.simple.MessageDecoder; +import dev.architectury.networking.simple.SimpleNetworkManager; import io.netty.buffer.ByteBufUtil; import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.packet.CustomPayload; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; -import static dev.architectury.impl.NetworkAggregator.C2S_TYPE; import static dev.architectury.impl.NetworkAggregator.S2C_TYPE; -import static dev.architectury.networking.NetworkManager.Side.C2S; -import static dev.architectury.networking.NetworkManager.Side.S2C; public class ServerNetworking { public static void send(ServerPlayerEntity player, Identifier identifier, PacketByteBuf buf) { @@ -25,15 +26,22 @@ public static void send(Iterable players, Identifier identif NetworkManager.sendToPlayers(players, payload); } - public static void sendAll(MinecraftServer server, Identifier identifier, PacketByteBuf buf) { send(server.getPlayerManager().getPlayerList(), identifier, buf); } public static void registerReceiver(Identifier identifier, ServerNetworkHandler handler) { - CustomPayload.Id type = CustomPayload.id(identifier.toString()); - // Todo: ごみ - NetworkManager.registerReceiver(S2C, type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), ((buf, context) -> handler.receive(context.getPlayer().getServer(), (ServerPlayerEntity) context.getPlayer(), PacketByteUtil.create()))); + SimpleNetworkManager.create(identifier.getNamespace()).registerC2S(identifier.getPath(), new MessageDecoder<>() { + @Override + public BaseC2SMessage decode(RegistryByteBuf buf) { + return null; + } + + @Override + public NetworkManager.NetworkReceiver createReceiver() { + return ((buf, context) -> handler.receive(context.getPlayer().getServer(), (ServerPlayerEntity) context.getPlayer(), buf)); + } + }); } @FunctionalInterface From affb7d46dbcc2a220e989944ae62086e4557948d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:34:49 +0900 Subject: [PATCH 310/622] gradle --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index a0602f4d0..e0bb2ba28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,12 @@ minecraft_version=1.20.6 fabric_version=0.99.0+1.20.6 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=12.1.2 +architectury_version=12.1.3 # https://fabricmc.net/develop/ fabric_loader_version=0.15.11 -yarn_mappings=1.20.6+build.2 -fabric_api_version=0.99.0+1.20.6 +yarn_mappings=1.20.6+build.3 +fabric_api_version=0.100.4+1.20.6 # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.20.6-50.0.29 From 597fbac72ece20a2aedfc501593f256281c2925b Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:52:23 +0900 Subject: [PATCH 311/622] gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e0bb2ba28..f5f2ed1bc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ yarn_mappings=1.20.6+build.3 fabric_api_version=0.100.4+1.20.6 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.20.6-50.0.29 +forge_version=1.20.6-50.1.7 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.23.1 From b3b8507c47745a3eb4d0e4680e681f96f3aa534c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 28 Jun 2024 09:52:51 +0900 Subject: [PATCH 312/622] add BlockState API 2.2.5 --- .../pitan76/mcpitanlib/api/util/BlockStateUtil.java | 9 +++++++++ .../pitan76/mcpitanlib/api/util/StateManagerUtil.java | 10 ++++++++++ info.properties | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index ba9ec05fc..0d3a302b7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -3,6 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.state.StateManager; public class BlockStateUtil { public static Block getBlock(BlockState state) { @@ -20,4 +21,12 @@ public static boolean isOpaque(BlockState state) { public static BlockSoundGroup getSoundGroup(BlockState state) { return state.getSoundGroup(); } + + public static BlockState getDefaultState(Block block) { + return block.getDefaultState(); + } + + public static StateManager getStateManager(Block block) { + return block.getStateManager(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java new file mode 100644 index 000000000..9591bbdb9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.state.State; +import net.minecraft.state.StateManager; + +public class StateManagerUtil { + public static > S getDefaultState(StateManager manager) { + return manager.getDefaultState(); + } +} diff --git a/info.properties b/info.properties index 127a5c022..a391e77c6 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.4 +mod_version=2.2.5 maven_group=net.pitan76 \ No newline at end of file From 4b6ac8cf66102ec741b56f1236e52dbfb53eb1d5 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 28 Jun 2024 22:02:48 +0900 Subject: [PATCH 313/622] Id api --- .../pitan76/mcpitanlib/api/block/ExtendBlock.java | 8 ++++++++ .../pitan76/mcpitanlib/api/util/IdentifierUtil.java | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 8e14b57e9..3efc37570 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -226,4 +226,12 @@ public void appendProperties(StateManager.Builder builder) { public void appendProperties(AppendPropertiesArgs args) { super.appendProperties(args.builder); } + + /** + * Compatible for getDefaultState() + * @return default block state + */ + public BlockState getNewDefaultState() { + return super.getDefaultState(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java new file mode 100644 index 000000000..2e90b103d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.util.Identifier; + +public class IdentifierUtil { + public static Identifier id(String id) { + return new Identifier(id); + } + + public static Identifier id(String namespace, String path) { + return Identifier.of(namespace, path); + } +} From e38c7d335f92c1792291e6525f1cf99faf4d00cc Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 15:53:29 +0900 Subject: [PATCH 314/622] Port to 1.21 --- .../net/pitan76/mcpitanlib/MCPitanLib.java | 3 ++- .../pitan76/mcpitanlib/api/entity/Player.java | 2 +- .../event/item/ItemAppendTooltipEvent.java | 2 +- .../api/item/CreativeTabBuilder.java | 3 ++- .../mcpitanlib/api/item/ExtendBlockItem.java | 2 +- .../mcpitanlib/api/item/ExtendItem.java | 2 +- .../api/registry/CompatRegistry.java | 4 ++-- .../api/registry/result/RegistryResult.java | 2 +- .../api/util/ArmorMaterialUtil.java | 4 ++-- .../mcpitanlib/api/util/IdentifierUtil.java | 2 +- .../mcpitanlib/api/util/IngredientUtil.java | 2 +- .../mcpitanlib/api/util/RecipeUtil.java | 7 ++++--- .../mcpitanlib/api/util/v2/BlockUtilV2.java | 7 ++++--- .../mcpitanlib/api/util/v2/ItemUtilV2.java | 7 ++++--- .../core/registry/MCPLRegistry1_21.java | 6 +++--- .../pitan76/mcpitanlib/mixin/ItemMixin.java | 2 +- .../mcpitanlib/mixin/ItemStackMixin.java | 8 +++++-- .../pitan76/mcpitanlib/test/ExampleMod.java | 3 ++- .../mcpitanlib/test/ExampleScreen.java | 3 ++- .../main/resources/mcpitanlib.accesswidener | 21 ------------------- gradle.properties | 18 ++++++++-------- 21 files changed, 50 insertions(+), 60 deletions(-) delete mode 100644 fabric/src/main/resources/mcpitanlib.accesswidener diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index 9ee0a0c38..678bccd3f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -4,6 +4,7 @@ import net.pitan76.easyapi.config.Config; import net.pitan76.easyapi.config.JsonConfig; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.PlatformUtil; import net.pitan76.mcpitanlib.debug.DebugTool; @@ -86,7 +87,7 @@ public static void configInit() { * @return Identifier */ public static Identifier id(String path) { - return new Identifier(MOD_ID, path); + return IdentifierUtil.id(MOD_ID, path); } public static boolean isItemBlackListed(Identifier id) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 64657bf49..12cda83b4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -277,7 +277,7 @@ public void incrementStat(StatType type, T object) { } public void teleport(double x, double y, double z) { - getEntity().teleport(x, y, z); + getEntity().teleport(x, y, z, false); } public ItemStack getMainHandStack() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java index fc5f69003..7169ce2f1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.api.event.item; -import net.minecraft.client.item.TooltipType; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java index 86ee7914b..5fa923264 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.TextUtil; import java.util.function.Supplier; @@ -82,7 +83,7 @@ public ItemGroup build() { if (noRenderedName) builder.noRenderedName(); if (noScrollbar) builder.noScrollbar(); if (special) builder.special(); - if (texture != null) builder.texture(texture); + if (texture != null) builder.texture(IdentifierUtil.id(texture)); })); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java index ca61ea953..ed1b89361 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.block.Block; -import net.minecraft.client.item.TooltipType; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 0f332806f..d8af9cddc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.block.BlockState; -import net.minecraft.client.item.TooltipType; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index 72df41883..59f5383f4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -3,7 +3,7 @@ import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.component.DataComponentType; +import net.minecraft.component.ComponentType; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; @@ -140,7 +140,7 @@ public RegistryResult registerItemGroup(CreativeTabBuilder builder) { return registerItemGroup(builder.getIdentifier(), builder); } - public RegistryResult> registerDataComponentType(Identifier id, Supplier> supplier) { + public RegistryResult> registerDataComponentType(Identifier id, Supplier> supplier) { return new RegistryResult<>(mcplr1_21.registryDataComponentType(id, supplier)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java index 52fc504e7..3bcf95488 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/RegistryResult.java @@ -8,7 +8,7 @@ * @param The type of the registry * * 
{@code
- * RegistryResult ITEM = registry.registerItem(new Identifier("mcpitanlib", "example"), ExampleItem::new);
+ * RegistryResult ITEM = registry.registerItem(IdentifierUtil.id("mcpitanlib", "example"), ExampleItem::new);
  * ITEM.getOrNull(); => The item (Item.class) or null
  * ITEM.get(); => The item (Item.class)
  * }
diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java index a1683492f..17dda5fe0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ArmorMaterialUtil.java @@ -8,10 +8,10 @@ public class ArmorMaterialUtil { public static CompatibleArmorMaterial create(String name, int[] durability, int[] protectionAmounts, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { - return create(new Identifier(name), durability, protectionAmounts, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); + return create(IdentifierUtil.id(name), durability, protectionAmounts, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); } public static CompatibleArmorMaterial create(String name, int durability, int protectionAmount, int enchantability, SoundEvent equipSound, float toughness, float knockbackResistance, Ingredient repairIngredient) { - return create(new Identifier(name), durability, protectionAmount, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); + return create(IdentifierUtil.id(name), durability, protectionAmount, enchantability, equipSound, toughness, knockbackResistance, repairIngredient); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java index 2e90b103d..b0b979bd0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java @@ -4,7 +4,7 @@ public class IdentifierUtil { public static Identifier id(String id) { - return new Identifier(id); + return Identifier.of(id); } public static Identifier id(String namespace, String path) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index 2ad252b78..8bfc84286 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -11,6 +11,6 @@ public static Ingredient fromTagByIdentifier(Identifier id) { } public static Ingredient fromTagByString(String id) { - return fromTagByIdentifier(new Identifier(id)); + return fromTagByIdentifier(IdentifierUtil.id(id)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java index 9f12aca68..5cb9476b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.*; import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.recipe.input.RecipeInput; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; @@ -21,11 +22,11 @@ public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, return createShapelessRecipe(id, group, CompatibilityCraftingRecipeCategory.MISC, output, input); } - public static ItemStack craft(Recipe recipe, C inventory, World world) { + public static ItemStack craft(Recipe recipe, C inventory, World world) { return recipe.craft(inventory, world.getRegistryManager()); } - public static ItemStack getOutput(Recipe recipe, World world) { + public static ItemStack getOutput(Recipe recipe, World world) { return recipe.getResult(world.getRegistryManager()); } @@ -48,7 +49,7 @@ public static RecipeType getType(Recipe recipe) { } public static Identifier getId(Recipe recipe) { - return new Identifier(recipe.getClass().hashCode() + ""); + return IdentifierUtil.id(recipe.getClass().hashCode() + ""); } public enum CompatibilityCraftingRecipeCategory { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java index 2b3c9fa6a..754b03937 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java @@ -4,6 +4,7 @@ import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.BlockUtil; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import java.util.ArrayList; import java.util.List; @@ -78,7 +79,7 @@ public static List getBlocks(Identifier identifier, List blocks) { * @return List of blocks in the tag. */ public static List getBlocks(String id) { - return getBlocks(new Identifier(id)); + return getBlocks(IdentifierUtil.id(id)); } /** @@ -89,7 +90,7 @@ public static List getBlocks(String id) { */ public static List getBlocks(String id, List blocks) { - return getBlocks(new Identifier(id), blocks); + return getBlocks(IdentifierUtil.id(id), blocks); } /** @@ -109,6 +110,6 @@ public static boolean isBlockInTag(Block block, Identifier identifier) { * @return If the block is in the tag. */ public static boolean isBlockInTag(Block block, String id) { - return isBlockInTag(block, new Identifier(id)); + return isBlockInTag(block, IdentifierUtil.id(id)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java index d65ee69fc..636e449c7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/ItemUtilV2.java @@ -3,6 +3,7 @@ import net.minecraft.item.Item; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.ItemUtil; import java.util.ArrayList; @@ -58,7 +59,7 @@ public static List getItems(Identifier identifier, List items) { * @return List of items in the tag. */ public static List getItems(String id) { - return getItems(new Identifier(id)); + return getItems(IdentifierUtil.id(id)); } /** @@ -68,7 +69,7 @@ public static List getItems(String id) { * @return List of items in the tag. */ public static List getItems(String id, List items) { - return getItems(new Identifier(id), items); + return getItems(IdentifierUtil.id(id), items); } /** @@ -88,6 +89,6 @@ public static boolean isItemInTag(Item item, Identifier identifier) { * @return True if the item is in the tag. */ public static boolean isItemInTag(Item item, String id) { - return isItemInTag(item, new Identifier(id)); + return isItemInTag(item, IdentifierUtil.id(id)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java index c55a33c04..fe6cd62be 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java @@ -2,7 +2,7 @@ import dev.architectury.registry.registries.DeferredRegister; import dev.architectury.registry.registries.RegistrySupplier; -import net.minecraft.component.DataComponentType; +import net.minecraft.component.ComponentType; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; @@ -11,7 +11,7 @@ @Deprecated public class MCPLRegistry1_21 { - public final DeferredRegister> DATA_COMPONENT_TYPE; + public final DeferredRegister> DATA_COMPONENT_TYPE; private final MCPLRegistry mcplr; @@ -24,7 +24,7 @@ public void register() { DATA_COMPONENT_TYPE.register(); } - public RegistrySupplier> registryDataComponentType(Identifier id, Supplier> supplier) { + public RegistrySupplier> registryDataComponentType(Identifier id, Supplier> supplier) { return DATA_COMPONENT_TYPE.register(id, supplier); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index c548d0017..1509960ff 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.mixin; import net.minecraft.block.BlockState; -import net.minecraft.client.item.TooltipType; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java index e838175a6..0dc9cc111 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java @@ -1,7 +1,9 @@ package net.pitan76.mcpitanlib.mixin; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.random.Random; import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; import org.spongepowered.asm.mixin.Mixin; @@ -9,11 +11,13 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import java.util.function.Consumer; + @Mixin(ItemStack.class) public abstract class ItemStackMixin { - @Inject(method = "damage(ILnet/minecraft/util/math/random/Random;Lnet/minecraft/server/network/ServerPlayerEntity;Ljava/lang/Runnable;)V", at = @At("HEAD"), cancellable = true) - public void mcpitanlib$damage(int amount, Random random, ServerPlayerEntity player, Runnable breakCallback, CallbackInfo ci) { + @Inject(method = "damage(ILnet/minecraft/server/world/ServerWorld;Lnet/minecraft/server/network/ServerPlayerEntity;Ljava/util/function/Consumer;)V", at = @At("HEAD"), cancellable = true) + public void mcpitanlib$damage(int amount, ServerWorld world, ServerPlayerEntity player, Consumer breakCallback, CallbackInfo ci) { ItemStackActionEvent.returnValue = null; ItemStackActionEvent.call((ItemStack) (Object) this); if (ItemStackActionEvent.returnValue != null) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 1d6d72109..59c126e95 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -14,6 +14,7 @@ import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.ItemUtil; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -29,7 +30,7 @@ public static void log(Level level, String message){ } public static Identifier id(String id) { - return new Identifier(MOD_ID, id); + return IdentifierUtil.id(MOD_ID, id); } // en: Create a CompatRegistry instance. , ja: CompatRegistryインスタンスを作成します。 diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java index 45e7a0295..7a778efc2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java @@ -9,10 +9,11 @@ import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; public class ExampleScreen extends SimpleHandledScreen { - public static Identifier GUI = new Identifier("textures/gui/container/blast_furnace.png"); + public static Identifier GUI = IdentifierUtil.id("textures/gui/container/blast_furnace.png"); public ExampleScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); diff --git a/fabric/src/main/resources/mcpitanlib.accesswidener b/fabric/src/main/resources/mcpitanlib.accesswidener deleted file mode 100644 index e0993935d..000000000 --- a/fabric/src/main/resources/mcpitanlib.accesswidener +++ /dev/null @@ -1,21 +0,0 @@ -accessWidener v2 named -accessible field net/minecraft/item/ItemGroups BUILDING_BLOCKS Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups COLORED_BLOCKS Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups NATURAL Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups FUNCTIONAL Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups REDSTONE Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups HOTBAR Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups SEARCH Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups TOOLS Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups COMBAT Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups FOOD_AND_DRINK Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups INGREDIENTS Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/registry/RegistryKey; -accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/registry/RegistryKey; - -accessible method net/minecraft/block/AbstractBlock onStateReplaced (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V - -accessible class net/minecraft/screen/ScreenHandlerType$Factory -accessible method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V -extendable method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f5f2ed1bc..7fe49f01d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,28 +1,28 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.20.6 -# Fabric API -fabric_version=0.99.0+1.20.6 +minecraft_version=1.21 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=12.1.3 +architectury_version=13.0.2 # https://fabricmc.net/develop/ fabric_loader_version=0.15.11 -yarn_mappings=1.20.6+build.3 -fabric_api_version=0.100.4+1.20.6 +yarn_mappings=1.21+build.5 +fabric_api_version=0.100.4+1.21 + +# Fabric API # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.20.6-50.1.7 +forge_version=1.21-51.0.18 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.23.1 quilt_fabric_api_version=6.0.2 # https://projects.neoforged.net/neoforged/neoforge -neoforge_version=20.6.75-beta +neoforge_version=21.0.42-beta -cloth_config_version=14.0.126 +cloth_config_version=15.0.127 fabricEnabled=true forgeEnabled=false From 5129e8cf5070dbb025c92c6018c1f05fc8c719d3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 15:53:58 +0900 Subject: [PATCH 315/622] add Id API --- .../pitan76/mcpitanlib/api/util/IdentifierUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java index b0b979bd0..2078a0db6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java @@ -10,4 +10,16 @@ public static Identifier id(String id) { public static Identifier id(String namespace, String path) { return Identifier.of(namespace, path); } + + public static String toString(Identifier identifier) { + return identifier.toString(); + } + + public static String getNamespace(Identifier identifier) { + return identifier.getNamespace(); + } + + public static String getPath(Identifier identifier) { + return identifier.getPath(); + } } From 03840d95d6063bb54e57cf749dd9233605528dc4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 18:14:20 +0900 Subject: [PATCH 316/622] fix 121 --- .../mcpitanlib/api/item/CompatItems.java | 18 ++++++++++++++++++ .../mcpitanlib/api/item/ExtendItem.java | 6 ++++++ .../api/item/tool/CompatibleAxeItem.java | 5 +++++ .../api/item/tool/CompatibleHoeItem.java | 5 +++++ .../item/tool/CompatibleMiningToolItem.java | 5 +++++ .../api/item/tool/CompatiblePickaxeItem.java | 5 +++++ .../api/item/tool/CompatibleShearsItem.java | 5 +++++ .../api/item/tool/CompatibleShovelItem.java | 5 +++++ .../api/item/tool/CompatibleSwordItem.java | 5 +++++ .../mcpitanlib/api/util/ItemStackUtil.java | 12 ++++++++++++ .../mcpitanlib/api/util/RecipeUtil.java | 18 ++++++++++++++++-- .../api/world/CompatiblePersistentState.java | 9 +++++++++ 12 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java new file mode 100644 index 000000000..7b6e8684c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java @@ -0,0 +1,18 @@ +package net.pitan76.mcpitanlib.api.item; + +import net.minecraft.item.Item; +import net.minecraft.item.Items; + +public class CompatItems { + public Item SHORT_GRASS = Items.SHORT_GRASS; + public Item TALL_GRASS = Items.TALL_GRASS; + public Item TURTLE_SCUTE = Items.TURTLE_SCUTE; + + // Compatibility + public Item GRASS = SHORT_GRASS; + public Item SCUTE = TURTLE_SCUTE; + + public static boolean isExist(Item item) { + return item != null && item != Items.AIR; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index d8af9cddc..73fbe8c6c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -10,6 +10,7 @@ import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.Rarity; import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -163,4 +164,9 @@ public boolean postHit(PostHitEvent event) { public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } + + // -1.20.6 + public Rarity getRarity(ItemStack stack) { + return Rarity.COMMON; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index 962751554..b316466b2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -70,4 +70,9 @@ public boolean postHit(PostHitEvent event) { public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } + + // -1.20.6 + public boolean isDamageable() { + return true; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index d234c5873..90fd5f2f6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -70,4 +70,9 @@ public boolean postHit(PostHitEvent event) { public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } + + // -1.20.6 + public boolean isDamageable() { + return true; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index caffdc130..aed664e88 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -73,4 +73,9 @@ public boolean postHit(ItemStack stack, LivingEntity target, LivingEntity attack public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos pos, LivingEntity miner) { return postMine(new PostMineEvent(stack, world, state, pos, miner)); } + + // -1.20.6 + public boolean isDamageable() { + return true; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index 04eb92ba0..5edca83cf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -70,4 +70,9 @@ public boolean postHit(PostHitEvent event) { public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } + + // -1.20.6 + public boolean isDamageable() { + return true; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java index 04296c563..38e5936c1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java @@ -69,4 +69,9 @@ public boolean postHit(PostHitEvent event) { public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } + + // -1.20.6 + public boolean isDamageable() { + return true; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index 728fe5922..b9a0e20ab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -70,4 +70,9 @@ public boolean postHit(PostHitEvent event) { public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } + + // -1.20.6 + public boolean isDamageable() { + return true; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index 4b9f70234..7200481be 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -70,4 +70,9 @@ public boolean postHit(PostHitEvent event) { public boolean postMine(PostMineEvent event) { return super.postMine(event.stack, event.world, event.state, event.pos, event.miner); } + + // -1.20.6 + public boolean isDamageable() { + return true; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index a40fa68fb..be31f3aca 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -1,6 +1,8 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.world.World; import java.util.Objects; @@ -40,4 +42,14 @@ public static boolean areNbtOrComponentEqual(ItemStack left, ItemStack right) { public static boolean hasNbtOrComponent(ItemStack stack) { return !stack.getComponents().isEmpty(); } + + /** + * NBTからItemStackを取得する + * @param world World + * @param nbt NbtCompound + * @return ItemStack + */ + public static ItemStack fromNbt(World world, NbtCompound nbt) { + return ItemStack.fromNbt(world.getRegistryManager(), nbt).orElse(ItemStack.EMPTY); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java index 5cb9476b9..23682f1ed 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java @@ -22,11 +22,25 @@ public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, return createShapelessRecipe(id, group, CompatibilityCraftingRecipeCategory.MISC, output, input); } - public static ItemStack craft(Recipe recipe, C inventory, World world) { + @Deprecated + public static ItemStack craft_2(Recipe recipe, C inventory, World world) { return recipe.craft(inventory, world.getRegistryManager()); } - public static ItemStack getOutput(Recipe recipe, World world) { + @Deprecated + public static ItemStack getOutput_2(Recipe recipe, World world) { + return recipe.getResult(world.getRegistryManager()); + } + + public static ItemStack craft(Recipe recipe, Inventory inventory, World world) { + if (inventory instanceof RecipeInput) { + Recipe inputRecipe = (Recipe) recipe; + return inputRecipe.craft((RecipeInput) inventory, world.getRegistryManager()); + } + return ItemStack.EMPTY; + } + + public static ItemStack getOutput(Recipe recipe, World world) { return recipe.getResult(world.getRegistryManager()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java index c8206f828..c77faaf3d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.world; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; import net.minecraft.world.PersistentState; public abstract class CompatiblePersistentState extends PersistentState { @@ -15,4 +16,12 @@ public CompatiblePersistentState() { // 1.16 public abstract void readNbt(NbtCompound tag); + + @Deprecated + @Override + public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + return writeNbt(nbt); + } + + public abstract NbtCompound writeNbt(NbtCompound tag); } From e7e89026b67076f8b723f1037c1fdd7914ad3786 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 20:30:43 +0900 Subject: [PATCH 317/622] fix APIs --- .../api/item/tool/CompatibleAxeItem.java | 5 ++- .../api/item/tool/CompatibleHoeItem.java | 7 ++-- .../item/tool/CompatibleMiningToolItem.java | 7 ++-- .../api/item/tool/CompatiblePickaxeItem.java | 7 ++-- .../api/item/tool/CompatibleShearsItem.java | 7 ++-- .../api/item/tool/CompatibleShovelItem.java | 9 +++-- .../api/item/tool/CompatibleSwordItem.java | 7 ++-- .../mcpitanlib/api/util/CustomDataUtil.java | 9 +++++ .../mcpitanlib/api/util/ItemStackUtil.java | 37 +++++++++++++++++++ .../api/world/CompatiblePersistentState.java | 4 +- 10 files changed, 77 insertions(+), 22 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index b316466b2..5e5b6294d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -11,6 +11,7 @@ import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { @@ -72,7 +73,7 @@ public boolean postMine(PostMineEvent event) { } // -1.20.6 - public boolean isDamageable() { - return true; + public boolean isDamageableOnDefault() { + return ItemStackUtil.getMaxDamage(this) > 0; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index 90fd5f2f6..c99f35b27 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -11,6 +11,7 @@ import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { @@ -72,7 +73,7 @@ public boolean postMine(PostMineEvent event) { } // -1.20.6 - public boolean isDamageable() { - return true; + public boolean isDamageableOnDefault() { + return ItemStackUtil.getMaxDamage(this) > 0; } -} +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index aed664e88..eccb70459 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -13,6 +13,7 @@ import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatibleMiningToolItem extends MiningToolItem implements ExtendItemProvider { @Deprecated @@ -75,7 +76,7 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos } // -1.20.6 - public boolean isDamageable() { - return true; + public boolean isDamageableOnDefault() { + return ItemStackUtil.getMaxDamage(this) > 0; } -} +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index 5edca83cf..c48ba1d5d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -11,6 +11,7 @@ import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { @@ -72,7 +73,7 @@ public boolean postMine(PostMineEvent event) { } // -1.20.6 - public boolean isDamageable() { - return true; + public boolean isDamageableOnDefault() { + return ItemStackUtil.getMaxDamage(this) > 0; } -} +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java index 38e5936c1..e1cd419c5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java @@ -10,6 +10,7 @@ import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatibleShearsItem extends ShearsItem implements ExtendItemProvider { public CompatibleShearsItem(Settings settings) { @@ -71,7 +72,7 @@ public boolean postMine(PostMineEvent event) { } // -1.20.6 - public boolean isDamageable() { - return true; + public boolean isDamageableOnDefault() { + return ItemStackUtil.getMaxDamage(this) > 0; } -} +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index b9a0e20ab..346cd7132 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -11,6 +11,7 @@ import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { @@ -55,6 +56,7 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos /** * post hit event + * * @param event PostHitEvent * @return boolean */ @@ -64,6 +66,7 @@ public boolean postHit(PostHitEvent event) { /** * post mine event + * * @param event PostMineEvent * @return boolean */ @@ -72,7 +75,7 @@ public boolean postMine(PostMineEvent event) { } // -1.20.6 - public boolean isDamageable() { - return true; + public boolean isDamageableOnDefault() { + return ItemStackUtil.getMaxDamage(this) > 0; } -} +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index 7200481be..a53f76387 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -11,6 +11,7 @@ import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { @@ -72,7 +73,7 @@ public boolean postMine(PostMineEvent event) { } // -1.20.6 - public boolean isDamageable() { - return true; + public boolean isDamageableOnDefault() { + return ItemStackUtil.getMaxDamage(this) > 0; } -} +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java index 1fa682f9f..6ce404b72 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java @@ -155,4 +155,13 @@ public static void put(ItemStack stack, String key, T value) { public static boolean contains(ItemStack stack, String key) { return has(stack, key); } + + /** + * 1.20.3以前下位互換のための修正用 + * @param stack ItemStack + * @param keys 移植するキー + */ + public static void fix_oldNbt(ItemStack stack, String[] keys) { + + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index be31f3aca..e0dc33f5b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.world.World; @@ -52,4 +53,40 @@ public static boolean hasNbtOrComponent(ItemStack stack) { public static ItemStack fromNbt(World world, NbtCompound nbt) { return ItemStack.fromNbt(world.getRegistryManager(), nbt).orElse(ItemStack.EMPTY); } + + public static ItemStack getDefaultStack(Item item) { + return item.getDefaultStack(); + } + + public static int getMaxDamage(ItemStack stack) { + return stack.getMaxDamage(); + } + + public static int getMaxDamage(Item item) { + return getMaxDamage(getDefaultStack(item)); + } + + public static int getDamage(ItemStack stack) { + return stack.getDamage(); + } + + public static void setDamage(ItemStack stack, int damage) { + stack.setDamage(damage); + } + + public static int getCount(ItemStack stack) { + return stack.getCount(); + } + + public static void setCount(ItemStack stack, int count) { + stack.setCount(count); + } + + public static void decrementCount(ItemStack stack, int count) { + stack.decrement(count); + } + + public static void incrementCount(ItemStack stack, int count) { + stack.increment(count); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java index c77faaf3d..cbb01c422 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java @@ -20,8 +20,8 @@ public CompatiblePersistentState() { @Deprecated @Override public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { - return writeNbt(nbt); + return writeNbtOverride(nbt); } - public abstract NbtCompound writeNbt(NbtCompound tag); + public abstract NbtCompound writeNbtOverride(NbtCompound tag); } From 49c89a599d49cc70a8651ae556ce62780b466f90 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 20:31:04 +0900 Subject: [PATCH 318/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index a391e77c6..ecddbd6e6 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.5 +mod_version=2.2.6 maven_group=net.pitan76 \ No newline at end of file From 3d0ddd9e316a220aaaebd5869fb573293803973f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 21:01:05 +0900 Subject: [PATCH 319/622] fix --- .../java/net/pitan76/mcpitanlib/test/ExampleModClient.java | 4 ++-- .../net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java index 1b6f5709b..5c900af84 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.test; -import net.pitan76.mcpitanlib.api.client.registry.ArchRegistryClient; +import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; public class ExampleModClient { public static void init() { - ArchRegistryClient.registerScreen(ExampleMod.EXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); + CompatRegistryClient.registerScreen(ExampleMod.EXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); } } diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java index f16705691..286680873 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.fabric.mixin; -import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.input.RecipeInput; import net.minecraft.util.collection.DefaultedList; import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import org.spongepowered.asm.mixin.Mixin; @@ -11,9 +11,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Recipe.class) -public interface RecipeMixin { +public interface RecipeMixin { @Inject(method = "getRemainder", at = @At("RETURN")) - default void injectGetRemainder(C inventory, CallbackInfoReturnable> cir) { + default void injectGetRemainder(C input, CallbackInfoReturnable> cir) { DefaultedList defaultedList = cir.getReturnValue(); int i = 0; From 2063f1d05ff7e00ffa7001c7645a0132328072c1 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 21:15:12 +0900 Subject: [PATCH 320/622] tooltip api --- .../api/client/event/ItemTooltipRegistry.java | 10 ++++ .../event/listener/ItemTooltipContext.java | 58 +++++++++++++++++++ .../event/listener/ItemTooltipListener.java | 17 ++++++ 3 files changed, 85 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/ItemTooltipRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipContext.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipListener.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/ItemTooltipRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/ItemTooltipRegistry.java new file mode 100644 index 000000000..8166f7406 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/ItemTooltipRegistry.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.client.event; + +import dev.architectury.event.events.client.ClientTooltipEvent; +import net.pitan76.mcpitanlib.api.client.event.listener.ItemTooltipListener; + +public class ItemTooltipRegistry { + public static void registerItemTooltip(ItemTooltipListener listener) { + ClientTooltipEvent.ITEM.register(listener::onTooltip); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipContext.java new file mode 100644 index 000000000..296fd2778 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipContext.java @@ -0,0 +1,58 @@ +package net.pitan76.mcpitanlib.api.client.event.listener; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.tooltip.TooltipType; +import net.minecraft.text.Text; + +import java.util.List; + +public class ItemTooltipContext { + + public ItemStack stack; + public List texts; + public Item.TooltipContext tooltipContext; + + @Deprecated + public TooltipType type; + + public ItemTooltipContext(ItemStack stack, List texts, Item.TooltipContext tooltipContext, TooltipType type) { + this.stack = stack; + this.texts = texts; + this.tooltipContext = tooltipContext; + this.type = type; + } + + public ItemStack getStack() { + return stack; + } + + public List getTexts() { + return texts; + } + + public Item.TooltipContext getTooltipContext() { + return tooltipContext; + } + + @Deprecated + public TooltipType getType() { + return type; + } + + public void addTooltip(Text text) { + texts.add(text); + } + + public void addTooltip(List texts) { + this.texts.addAll(texts); + } + + public boolean isAdvanced() { + return type.isAdvanced(); + } + + public boolean isCreative() { + return type.isCreative(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipListener.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipListener.java new file mode 100644 index 000000000..d86227934 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/ItemTooltipListener.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.client.event.listener; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.tooltip.TooltipType; +import net.minecraft.text.Text; + +import java.util.List; + +@FunctionalInterface +public interface ItemTooltipListener { + void onTooltip(ItemTooltipContext context); + + default void onTooltip(ItemStack stack, List texts, Item.TooltipContext tooltipContext, TooltipType type) { + onTooltip(new ItemTooltipContext(stack, texts, tooltipContext, type)); + } +} \ No newline at end of file From e9e7b6c60c7bbf915425214c9959bc3d08234c28 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 29 Jun 2024 21:15:26 +0900 Subject: [PATCH 321/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index ecddbd6e6..ceb095932 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.6 +mod_version=2.2.7 maven_group=net.pitan76 \ No newline at end of file From 7482fad4b81924898842b3ce188542c2f4d6fab8 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:30:06 +0900 Subject: [PATCH 322/622] fix CompatItems info --- .../net/pitan76/mcpitanlib/api/item/CompatItems.java | 10 +++++----- info.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java index 7b6e8684c..e243dd1c0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java @@ -4,13 +4,13 @@ import net.minecraft.item.Items; public class CompatItems { - public Item SHORT_GRASS = Items.SHORT_GRASS; - public Item TALL_GRASS = Items.TALL_GRASS; - public Item TURTLE_SCUTE = Items.TURTLE_SCUTE; + public static Item SHORT_GRASS = Items.SHORT_GRASS; + public static Item TALL_GRASS = Items.TALL_GRASS; + public static Item TURTLE_SCUTE = Items.TURTLE_SCUTE; // Compatibility - public Item GRASS = SHORT_GRASS; - public Item SCUTE = TURTLE_SCUTE; + public static Item GRASS = SHORT_GRASS; + public static Item SCUTE = TURTLE_SCUTE; public static boolean isExist(Item item) { return item != null && item != Items.AIR; diff --git a/info.properties b/info.properties index ceb095932..b41efbce2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.7 +mod_version=2.2.8 maven_group=net.pitan76 \ No newline at end of file From f6d0a9c3ed05d50a897820a708d74af4e35a9467 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:30:14 +0900 Subject: [PATCH 323/622] RecipeManager --- .../api/event/v0/event/RecipeManagerEvent.java | 12 +++++++----- .../pitan76/mcpitanlib/mixin/RecipeManagerMixin.java | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index 4fae9bcdb..3c7a7741d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.api.event.v0.event; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.google.gson.JsonElement; import net.minecraft.recipe.RecipeEntry; @@ -17,12 +19,12 @@ public class RecipeManagerEvent { public Profiler profiler; @Deprecated - public Map> recipesById; + public ImmutableMap.Builder> recipesById; @Deprecated - public Multimap, RecipeEntry> recipesByType; + public ImmutableMultimap.Builder, RecipeEntry> recipesByType; - public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, Map> recipesById, Multimap, RecipeEntry> recipesByType) { + public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, ImmutableMap.Builder> recipesById, ImmutableMultimap.Builder, RecipeEntry> recipesByType) { this.jsonMap = map; this.resourceManager = resourceManager; this.profiler = profiler; @@ -35,12 +37,12 @@ public Map getJsonMap() { } @Deprecated - public Map> getRecipesById() { + public ImmutableMap.Builder> getRecipesById() { return recipesById; } @Deprecated - public Multimap, RecipeEntry> getRecipesByType() { + public ImmutableMultimap.Builder, RecipeEntry> getRecipesByType() { return recipesByType; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index cd2983203..854ddbe68 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -1,9 +1,9 @@ package net.pitan76.mcpitanlib.mixin; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.google.gson.JsonElement; -import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; import net.minecraft.recipe.RecipeType; @@ -27,11 +27,11 @@ public class RecipeManagerMixin { @Shadow private Multimap, RecipeEntry> recipesByType; - @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", + @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "TAIL")) - private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci) { + private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, ImmutableMultimap.Builder, RecipeEntry> builder, ImmutableMap.Builder> builder2, CallbackInfo ci) { if (RecipeManagerRegistry.managers.isEmpty()) return; - RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, recipesById, recipesByType))); + RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, builder2, builder))); } } From 1f601ec50ee284cd9cf03b303af375304084576c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sun, 30 Jun 2024 00:30:06 +0900 Subject: [PATCH 324/622] add setNewDefaultState() --- .../net/pitan76/mcpitanlib/api/block/ExtendBlock.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 3efc37570..dff64b598 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -234,4 +234,12 @@ public void appendProperties(AppendPropertiesArgs args) { public BlockState getNewDefaultState() { return super.getDefaultState(); } + + /** + * Compatible for setDefaultState() + * @param state BlockState + */ + public void setNewDefaultState(BlockState state) { + super.setDefaultState(state); + } } From bfe5cde11442e4a45bdb01b33e5f1068969fa596 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 30 Jun 2024 17:41:04 +0900 Subject: [PATCH 325/622] fix mixin --- .../java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 854ddbe68..8c08e435c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -29,7 +29,7 @@ public class RecipeManagerMixin { @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "TAIL")) - private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, ImmutableMultimap.Builder, RecipeEntry> builder, ImmutableMap.Builder> builder2, CallbackInfo ci) { + private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, ImmutableMultimap.Builder, RecipeEntry> builder, ImmutableMap.Builder> builder2) { if (RecipeManagerRegistry.managers.isEmpty()) return; RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, builder2, builder))); } From 49759246d377fb85f6cff95993361763a717965e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 30 Jun 2024 17:41:09 +0900 Subject: [PATCH 326/622] fix mappings --- build.gradle | 2 +- mappings/121-1fix.tiny | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 mappings/121-1fix.tiny diff --git a/build.gradle b/build.gradle index 1856680b9..a2d5c4192 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ subprojects { //mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2" mappings loom.layered() { it.mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2") - it.mappings file("../mappings/yarnpatch.tiny") + it.mappings file("../mappings/121-1fix.tiny") } // https://mvnrepository.com/artifact/org.yaml/snakeyaml diff --git a/mappings/121-1fix.tiny b/mappings/121-1fix.tiny new file mode 100644 index 000000000..08cb84244 --- /dev/null +++ b/mappings/121-1fix.tiny @@ -0,0 +1,5 @@ +tiny 2 0 intermediary named +c net/minecraft/class_1496 + m ()Lnet/minecraft/class_1263; method_56680 getInventoryYarn +c net/minecraft/class_329 + m (Lnet/minecraft/class_332;Lnet/minecraft/class_9779;)V method_1759 renderHotbarYarn From 60f5a10b1ccc4b95db27520808e76c603bd3dfab Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 30 Jun 2024 17:41:23 +0900 Subject: [PATCH 327/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index b41efbce2..536de8892 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.8 +mod_version=2.2.9 maven_group=net.pitan76 \ No newline at end of file From d2148e1f1462a5636e97184a8a3c0a5094235ea2 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 30 Jun 2024 17:44:20 +0900 Subject: [PATCH 328/622] fix --- .../java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 8c08e435c..cce607053 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -23,9 +23,6 @@ @Mixin(RecipeManager.class) public class RecipeManagerMixin { - @Shadow private Map> recipesById; - - @Shadow private Multimap, RecipeEntry> recipesByType; @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "TAIL")) From cdc628a7c0b75099ac0529467eb620aa815419c6 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 30 Jun 2024 17:53:20 +0900 Subject: [PATCH 329/622] gradle --- build.gradle | 2 +- common/build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a2d5c4192..a9e13ce7a 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ allprojects { tasks.withType(JavaCompile).configureEach { options.encoding = "UTF-8" - options.release = 17 + options.release = 21 } java { diff --git a/common/build.gradle b/common/build.gradle index 94ddda702..15123e38f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -7,7 +7,7 @@ dependencies { } architectury { - common("fabric") + common("fabric", "neoforge") } loom { diff --git a/gradle.properties b/gradle.properties index 7fe49f01d..a3228f805 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,4 @@ cloth_config_version=15.0.127 fabricEnabled=true forgeEnabled=false quiltEnabled=false -neoforgeEnabled=false \ No newline at end of file +neoforgeEnabled=true \ No newline at end of file From 7385d919ca719e94766ad4dea39368b18726eb70 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:37:42 +0900 Subject: [PATCH 330/622] fix game ver --- fabric/src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 4b306ac98..be727ab43 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -35,7 +35,7 @@ ], "accessWidener": "mcpitanlib.accesswidener", "depends": { - "minecraft": ">1.20.2", + "minecraft": ">1.20.6", "fabricloader": "*", "architectury": "*" } From df044b3f16517ba515f2b9fc50b0366224fac3f2 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 2 Jul 2024 16:30:59 +0900 Subject: [PATCH 331/622] embed CompatDatapacks --- build.gradle | 1 + fabric/build.gradle | 2 ++ forge/build.gradle | 2 ++ gradle.properties | 3 +++ neoforge/build.gradle | 2 ++ 5 files changed, 10 insertions(+) diff --git a/build.gradle b/build.gradle index a9e13ce7a..eb6938f6f 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,7 @@ subprojects { } repositories { + maven { url "https://maven.pitan76.net/" } maven { url "https://maven.neoforged.net/releases/" } } diff --git a/fabric/build.gradle b/fabric/build.gradle index c15d40963..beeb291cc 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -35,6 +35,8 @@ dependencies { exclude(group: "net.fabricmc.fabric-api") } include("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") + + include("net.pitan76:compatdatapacks76-fabric:${rootProject.compatdatapacks76_version}") } processResources { diff --git a/forge/build.gradle b/forge/build.gradle index f08ff1335..5cbfa9d10 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -39,6 +39,8 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") compileOnly("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") + + compileOnly("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") } processResources { diff --git a/gradle.properties b/gradle.properties index a3228f805..11e425d01 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,6 +24,9 @@ neoforge_version=21.0.42-beta cloth_config_version=15.0.127 +# https://maven.pitan76.net/net/pitan76/compatdatapacks76/ +compatdatapacks76_version=1.0.4 + fabricEnabled=true forgeEnabled=false quiltEnabled=false diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 70bb1f042..ebd56d486 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -42,6 +42,8 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") + + compileOnly("net.pitan76:compatdatapacks76-neoforge:${rootProject.compatdatapacks76_version}") } processResources { From 341692397784bb6a690976d1eab908cb6b124b63 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 2 Jul 2024 20:49:28 +0900 Subject: [PATCH 332/622] gradle --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 536de8892..1ecfa1097 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.2.9 +mod_version=2.3.0 maven_group=net.pitan76 \ No newline at end of file From cb3047a3393db23a3dcd3a58f84df950b3870c13 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:28:30 +0900 Subject: [PATCH 333/622] update compatdatapacks --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 11e425d01..cd9c9ac0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ neoforge_version=21.0.42-beta cloth_config_version=15.0.127 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.4 +compatdatapacks76_version=1.0.5.210 fabricEnabled=true forgeEnabled=false From 37fb727d087f2fdea051056381bb0f44fe873937 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:31:57 +0900 Subject: [PATCH 334/622] use latest forge, yarn --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index cd9c9ac0e..39b644162 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,13 +7,13 @@ architectury_version=13.0.2 # https://fabricmc.net/develop/ fabric_loader_version=0.15.11 -yarn_mappings=1.21+build.5 +yarn_mappings=1.21+build.7 fabric_api_version=0.100.4+1.21 # Fabric API # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.21-51.0.18 +forge_version=1.21-51.0.21 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.23.1 @@ -28,6 +28,6 @@ cloth_config_version=15.0.127 compatdatapacks76_version=1.0.5.210 fabricEnabled=true -forgeEnabled=false +forgeEnabled=true quiltEnabled=false neoforgeEnabled=true \ No newline at end of file From 046ba6f31bda3d5a4fd1d91172ebd72ca604b1ee Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:32:13 +0900 Subject: [PATCH 335/622] update gradle 8.8 and loom 1.7 --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index eb6938f6f..75c0aa13c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false } architectury { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0ef..0d1842103 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From ecca05d88aa930157eef6d570e9f0e9e68f50bf9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:37:26 +0900 Subject: [PATCH 336/622] update compatdatapacks76 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 39b644162..76818e31b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ neoforge_version=21.0.42-beta cloth_config_version=15.0.127 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.5.210 +compatdatapacks76_version=1.0.6.210 fabricEnabled=true forgeEnabled=true From 786a7e41229e3de47dbefb82af3febebea1c5995 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:42:37 +0900 Subject: [PATCH 337/622] add maven --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 75c0aa13c..cc76c02f1 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ subprojects { repositories { maven { url "https://maven.pitan76.net/" } maven { url "https://maven.neoforged.net/releases/" } + maven { url "https://maven.shedaniel.me/" } } dependencies { From c24b6f093105013a408848f5aaeb657d2d5edca9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:30:07 +0900 Subject: [PATCH 338/622] disabled forge --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 76818e31b..1497cccde 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,6 +28,6 @@ cloth_config_version=15.0.127 compatdatapacks76_version=1.0.6.210 fabricEnabled=true -forgeEnabled=true +forgeEnabled=false quiltEnabled=false neoforgeEnabled=true \ No newline at end of file From 9da52a3f65551f207c5bc211728cfc8adc139746 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 5 Jul 2024 22:20:03 +0900 Subject: [PATCH 339/622] neoforge --- neoforge/build.gradle | 2 +- .../src/main/resources/META-INF/mods.toml | 64 ------------------- .../resources/META-INF/neoforge.mods.toml | 35 ++++++++++ 3 files changed, 36 insertions(+), 65 deletions(-) delete mode 100644 neoforge/src/main/resources/META-INF/mods.toml create mode 100644 neoforge/src/main/resources/META-INF/neoforge.mods.toml diff --git a/neoforge/build.gradle b/neoforge/build.gradle index ebd56d486..0a63f1efc 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -49,7 +49,7 @@ dependencies { processResources { inputs.property "version", project.version - filesMatching("META-INF/mods.toml") { + filesMatching("META-INF/neoforge.mods.toml") { expand "version": project.version } diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 16a09d57c..000000000 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,64 +0,0 @@ -# This is an example mods.toml file. It contains the data relating to the loading mods. -# There are several mandatory fields (#mandatory), and many more that are optional (#optional). -# The overall format is standard TOML format, v0.5.0. -# Note that there are a couple of TOML lists in this file. -# Find more information on toml format here: https://github.com/toml-lang/toml -# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml -modLoader = "javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion = "[40,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. -# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. -# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license = "MIT" -# A URL to refer people to when problems occur with this mod -issueTrackerURL = "https://github.com/Pitan76/MCPitanLib/issue" -# A list of mods - how many allowed here is determined by the individual mod loader -[[mods]] #mandatory -# The modid of the mod -modId = "mcpitanlib" #mandatory -# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -# ${version} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata -# see the associated build.gradle script for how to populate this completely automatically during a build -version = "${version}" #mandatory -# A display name for the mod -displayName = "MCPitanLib" #mandatory -# A URL to query for updates for this mod. See the JSON update specification -#updateJSONURL="http://myurl.me/" #optional -# A URL for the "homepage" for this mod, displayed in the mod UI -displayURL = "https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch" -# A file name (in the root of the mod JAR) containing a logo for display -logoFile = "icon.png" #optional -# A text field displayed in the mod UI -#credits="Thanks for this example mod goes to Java" #optional -# A text field displayed in the mod UI -authors = "Pitan" #optional -# The description text for the mod (multi line!) (#mandatory) -description = ''' -Pitan's Minecraft Mod Library -''' -# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies.mcpitanlib]] #optional -# the modid of the dependency -modId = "forge" #mandatory -# Does this dependency have to exist - if not, ordering below must be specified -mandatory = true #mandatory -# The version range of the dependency -versionRange = "[40,)" #mandatory -# An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory -ordering = "NONE" -# Side this dependency is applied on - BOTH, CLIENT or SERVER -side = "BOTH" -# Here's another dependency -[[dependencies.mcpitanlib]] -modId = "minecraft" -mandatory = true -# This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange = "[1.20,)" -ordering = "NONE" -side = "BOTH" - -[[mixins]] -config = "mcpitanlib-common.mixins.json" - -[[mixins]] -config = "mcpitanlib.mixins.json" \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 000000000..655066ba3 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,35 @@ +modLoader = "javafml" +loaderVersion = "[1,)" +license = "MIT" +issueTrackerURL = "https://github.com/Pitan76/MCPitanLib/issue" + +[[mods]] +modId = "mcpitanlib" +version = "${version}" +displayName = "MCPitanLib" +displayURL = "https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch" +logoFile = "icon.png" +authors = "Pitan" +description = ''' +Pitan's Minecraft Mod Library +''' + +[[dependencies.mcpitanlib]] +modId = "neoforge" +type = "required" +versionRange = "[20,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.mcpitanlib]] +modId = "minecraft" +type = "required" +versionRange = "[1.20,)" +ordering = "NONE" +side = "BOTH" + +[[mixins]] +config = "mcpitanlib-common.mixins.json" + +[[mixins]] +config = "mcpitanlib.mixins.json" \ No newline at end of file From a3147c9017b2ba9486a48cec35642f19d41d0e81 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 5 Jul 2024 22:35:18 +0900 Subject: [PATCH 340/622] shadowcommon --- forge/build.gradle | 1 + neoforge/build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/forge/build.gradle b/forge/build.gradle index 5cbfa9d10..1e819155f 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -40,6 +40,7 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") compileOnly("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") + shadowCommon("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") compileOnly("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 0a63f1efc..dc3c0efc1 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -43,6 +43,7 @@ dependencies { modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") + shadowCommon("net.pitan76:compatdatapacks76-neoforge:${rootProject.compatdatapacks76_version}") compileOnly("net.pitan76:compatdatapacks76-neoforge:${rootProject.compatdatapacks76_version}") } From f667e2701a3fac714240f71455024a51bfd6a6a9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 7 Jul 2024 12:50:22 +0900 Subject: [PATCH 341/622] NbtRWArgs(nbt, registryLookup) --- .../mcpitanlib/api/event/nbt/NbtRWArgs.java | 28 ++++++++++++++ .../mcpitanlib/api/event/nbt/ReadNbtArgs.java | 16 ++++++++ .../api/event/nbt/WriteNbtArgs.java | 16 ++++++++ .../api/tile/CompatBlockEntity.java | 33 ++++++++++++++++- .../api/tile/CompatChestBlockEntity.java | 37 ++++++++++++++++++- .../mcpitanlib/api/util/InventoryUtil.java | 27 ++++++++++++++ .../mcpitanlib/api/util/ItemStackUtil.java | 10 +++++ .../api/world/CompatiblePersistentState.java | 13 +++++-- .../extra/transfer/util/FluidStorageUtil.java | 17 +++++++++ info.properties | 2 +- 10 files changed, 192 insertions(+), 7 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java new file mode 100644 index 000000000..f6b00513d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.api.event.nbt; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; + +public class NbtRWArgs { + public NbtCompound nbt; + private final RegistryWrapper.WrapperLookup wrapperLookup; + + @Deprecated + public NbtRWArgs(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup) { + this.nbt = nbt; + this.wrapperLookup = wrapperLookup; + } + + public NbtRWArgs(NbtCompound nbt) { + this(nbt, null); + } + + public NbtCompound getNbt() { + return nbt; + } + + @Deprecated + public RegistryWrapper.WrapperLookup getWrapperLookup() { + return wrapperLookup; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java new file mode 100644 index 000000000..857887850 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.event.nbt; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; + +public class ReadNbtArgs extends NbtRWArgs { + + @Deprecated + public ReadNbtArgs(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup) { + super(nbt, wrapperLookup); + } + + public ReadNbtArgs(NbtCompound nbt) { + super(nbt); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java new file mode 100644 index 000000000..71bc990b6 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.event.nbt; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; + +public class WriteNbtArgs extends NbtRWArgs { + + @Deprecated + public WriteNbtArgs(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup) { + super(nbt, wrapperLookup); + } + + public WriteNbtArgs(NbtCompound nbt) { + super(nbt); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index 902707870..79c92439d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -10,6 +10,8 @@ import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; import org.jetbrains.annotations.Nullable; @@ -37,29 +39,58 @@ public UpdatePacketType getUpdatePacketType() { return UpdatePacketType.NONE; } + public void writeNbt(WriteNbtArgs args) { + + } + + public void readNbt(ReadNbtArgs args) { + + } + + + // deprecated + + /** + * @deprecated Use {@link #writeNbt(WriteNbtArgs)} instead + */ + @Deprecated public void writeNbtOverride(NbtCompound nbt) { super.writeNbt(nbt, wrapperLookupCache); } + /** + * @deprecated Use {@link #readNbt(ReadNbtArgs)} instead + */ + @Deprecated public void readNbtOverride(NbtCompound nbt) { super.readNbt(nbt, wrapperLookupCache); } + @Deprecated private RegistryWrapper.WrapperLookup wrapperLookupCache; + // ---- + @Deprecated @Override public void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + // deprecated wrapperLookupCache = registryLookup; writeNbtOverride(nbt); + // ---- + + writeNbt(new WriteNbtArgs(nbt, registryLookup)); } @Deprecated @Override public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + // deprecated wrapperLookupCache = registryLookup; readNbtOverride(nbt); - } + // ---- + readNbt(new ReadNbtArgs(nbt, registryLookup)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java index 6e833dc85..70bde7cea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatChestBlockEntity.java @@ -10,6 +10,8 @@ import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; import org.jetbrains.annotations.Nullable; @@ -37,27 +39,58 @@ public UpdatePacketType getUpdatePacketType() { return UpdatePacketType.NONE; } - private RegistryWrapper.WrapperLookup wrapperLookupCache; + public void writeNbt(WriteNbtArgs args) { + + } + public void readNbt(ReadNbtArgs args) { + + } + + + // deprecated + + /** + * @deprecated Use {@link #writeNbt(WriteNbtArgs)} instead + */ + @Deprecated public void writeNbtOverride(NbtCompound nbt) { super.writeNbt(nbt, wrapperLookupCache); } + /** + * @deprecated Use {@link #readNbt(ReadNbtArgs)} instead + */ + @Deprecated public void readNbtOverride(NbtCompound nbt) { super.readNbt(nbt, wrapperLookupCache); } + @Deprecated + private RegistryWrapper.WrapperLookup wrapperLookupCache; + + // ---- + @Deprecated @Override public void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + // deprecated wrapperLookupCache = registryLookup; writeNbtOverride(nbt); + // ---- + + writeNbt(new WriteNbtArgs(nbt, registryLookup)); } @Deprecated @Override public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { + // deprecated wrapperLookupCache = registryLookup; readNbtOverride(nbt); + // ---- + + readNbt(new ReadNbtArgs(nbt, registryLookup)); } -} + +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java index 1a1f41acb..8bad97d8b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java @@ -5,6 +5,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; public class InventoryUtil { public static boolean insertItem(ItemStack insertStack, DefaultedList inventory) { @@ -43,15 +44,41 @@ public static boolean canMergeItems(ItemStack first, ItemStack second) { return ItemStackUtil.areNbtOrComponentEqual(first, second); } + public static NbtCompound writeNbt(NbtRWArgs args, DefaultedList stacks, boolean setIfEmpty) { + return Inventories.writeNbt(args.nbt, stacks, setIfEmpty, args.getWrapperLookup()); + } + + public static NbtCompound writeNbt(NbtRWArgs args, DefaultedList stacks) { + return writeNbt(args, stacks, true); + } + + public static void readNbt(NbtRWArgs args, DefaultedList stacks) { + Inventories.readNbt(args.nbt, stacks, args.getWrapperLookup()); + } + + // deprecated + /** + * @deprecated Use {@link #writeNbt(NbtRWArgs, DefaultedList)} instead + */ + @Deprecated public static NbtCompound writeNbt(World world, NbtCompound nbt, DefaultedList stacks) { return writeNbt(world, nbt, true, stacks); } + /** + * @deprecated Use {@link #writeNbt(NbtRWArgs, DefaultedList, boolean)} instead + */ + @Deprecated public static NbtCompound writeNbt(World world, NbtCompound nbt, boolean setIfEmpty, DefaultedList stacks) { return Inventories.writeNbt(nbt, stacks, setIfEmpty, world.getRegistryManager()); } + /** + * @deprecated Use {@link #readNbt(NbtRWArgs, DefaultedList)} instead + */ + @Deprecated public static void readNbt(World world, NbtCompound nbt, DefaultedList stacks) { Inventories.readNbt(nbt, stacks, world.getRegistryManager()); } + // ---- } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index e0dc33f5b..72ef1ffab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; import java.util.Objects; @@ -54,6 +55,15 @@ public static ItemStack fromNbt(World world, NbtCompound nbt) { return ItemStack.fromNbt(world.getRegistryManager(), nbt).orElse(ItemStack.EMPTY); } + /** + * NBTからItemStackを取得する + * @param args NbtRWArgs + * @return ItemStack + */ + public static ItemStack fromNbt(NbtRWArgs args) { + return ItemStack.fromNbt(args.getWrapperLookup(), args.getNbt()).orElse(ItemStack.EMPTY); + } + public static ItemStack getDefaultStack(Item item) { return item.getDefaultStack(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java index cbb01c422..eb3f639f6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java @@ -3,6 +3,8 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper; import net.minecraft.world.PersistentState; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; public abstract class CompatiblePersistentState extends PersistentState { // 1.16 @@ -15,13 +17,18 @@ public CompatiblePersistentState() { } // 1.16 - public abstract void readNbt(NbtCompound tag); + @Deprecated + public void readNbt(NbtCompound tag) { + readNbt(new ReadNbtArgs(tag)); + } + + public abstract void readNbt(ReadNbtArgs args); @Deprecated @Override public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) { - return writeNbtOverride(nbt); + return writeNbt(new WriteNbtArgs(nbt, registryLookup)); } - public abstract NbtCompound writeNbtOverride(NbtCompound tag); + public abstract NbtCompound writeNbt(WriteNbtArgs args); } diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java index b7df20b69..97684ec2e 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java @@ -6,16 +6,33 @@ import net.minecraft.fluid.FluidState; import net.minecraft.nbt.NbtCompound; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; public class FluidStorageUtil { public static SingleFluidStorage withFixedCapacity(long capacity, Runnable onChange) { return SingleFluidStorage.withFixedCapacity(capacity, onChange); } + public static void readNbt(SingleFluidStorage storage, NbtRWArgs args) { + storage.readNbt(args.getNbt(), args.getWrapperLookup()); + } + + public static void writeNbt(SingleFluidStorage storage, NbtRWArgs args) { + storage.writeNbt(args.getNbt(), args.getWrapperLookup()); + } + + /** + * @deprecated Use {@link #readNbt(SingleFluidStorage, NbtRWArgs)} instead + */ + @Deprecated public static void readNbt(SingleFluidStorage storage, NbtCompound nbt, World world) { storage.readNbt(nbt, world.getRegistryManager()); } + /** + * @deprecated Use {@link #writeNbt(SingleFluidStorage, NbtRWArgs)} instead + */ + @Deprecated public static void writeNbt(SingleFluidStorage storage, NbtCompound nbt, World world) { storage.writeNbt(nbt, world.getRegistryManager()); } diff --git a/info.properties b/info.properties index 1ecfa1097..d74fbe8f4 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.0 +mod_version=2.3.1 maven_group=net.pitan76 \ No newline at end of file From 770163f6ceb5bb9c86da2a7045e34903cba76af2 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:29:10 +0900 Subject: [PATCH 342/622] fix InventoryUtil API --- .../pitan76/mcpitanlib/api/util/InventoryUtil.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java index 8bad97d8b..b2fb0eb7e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java @@ -44,8 +44,16 @@ public static boolean canMergeItems(ItemStack first, ItemStack second) { return ItemStackUtil.areNbtOrComponentEqual(first, second); } + public static NbtCompound writeNbt(NbtRWArgs args, NbtCompound nbt, DefaultedList stacks, boolean setIfEmpty) { + return Inventories.writeNbt(nbt, stacks, setIfEmpty, args.getWrapperLookup()); + } + + public static void readNbt(NbtRWArgs args, NbtCompound nbt, DefaultedList stacks) { + Inventories.readNbt(nbt, stacks, args.getWrapperLookup()); + } + public static NbtCompound writeNbt(NbtRWArgs args, DefaultedList stacks, boolean setIfEmpty) { - return Inventories.writeNbt(args.nbt, stacks, setIfEmpty, args.getWrapperLookup()); + return writeNbt(args, args.getNbt(), stacks, setIfEmpty); } public static NbtCompound writeNbt(NbtRWArgs args, DefaultedList stacks) { @@ -53,7 +61,7 @@ public static NbtCompound writeNbt(NbtRWArgs args, DefaultedList stac } public static void readNbt(NbtRWArgs args, DefaultedList stacks) { - Inventories.readNbt(args.nbt, stacks, args.getWrapperLookup()); + readNbt(args, args.getNbt(), stacks); } // deprecated From 6ff7908578fb24a3486c3ec00a26024a0dfed69a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 8 Jul 2024 10:29:33 +0900 Subject: [PATCH 343/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index d74fbe8f4..497319321 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.1 +mod_version=2.3.2 maven_group=net.pitan76 \ No newline at end of file From 780a08706bb98bd8fa5b06b0b09581196b975f10 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:17:31 +0900 Subject: [PATCH 344/622] fix network --- .../net/pitan76/mcpitanlib/api/network/ClientNetworking.java | 2 ++ .../net/pitan76/mcpitanlib/api/network/ServerNetworking.java | 4 ++++ info.properties | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index eb61c730a..86de66c29 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -17,6 +17,8 @@ public class ClientNetworking { public static void send(Identifier identifier, PacketByteBuf buf) { + if (!C2S_TYPE.containsKey(identifier)) + C2S_TYPE.put(identifier, new CustomPayload.Id<>(identifier)); CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(C2S_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToServer(payload); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index e0a895ca4..fd6790fd1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -17,11 +17,15 @@ public class ServerNetworking { public static void send(ServerPlayerEntity player, Identifier identifier, PacketByteBuf buf) { + if (!S2C_TYPE.containsKey(identifier)) + S2C_TYPE.put(identifier, new CustomPayload.Id<>(identifier)); CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToPlayer(player, payload); } public static void send(Iterable players, Identifier identifier, PacketByteBuf buf) { + if (!S2C_TYPE.containsKey(identifier)) + S2C_TYPE.put(identifier, new CustomPayload.Id<>(identifier)); CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToPlayers(players, payload); } diff --git a/info.properties b/info.properties index 497319321..dbe054df5 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.2 +mod_version=2.3.2-fix.1 maven_group=net.pitan76 \ No newline at end of file From a4e4d39a87b431ff1752900995e8c8e8aa9d672c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:28:01 +0900 Subject: [PATCH 345/622] add damage() in ItemStackUtil --- .../pitan76/mcpitanlib/api/util/ItemStackUtil.java | 11 +++++++++++ info.properties | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 72ef1ffab..71df1d4ee 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -1,8 +1,11 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; @@ -99,4 +102,12 @@ public static void decrementCount(ItemStack stack, int count) { public static void incrementCount(ItemStack stack, int count) { stack.increment(count); } + + public static void damage(ItemStack stack, int amount, ServerPlayerEntity entity, Runnable breakCallback) { + stack.damage(amount, entity.getRandom(), entity, breakCallback); + } + + public static void damage(ItemStack stack, int amount, LivingEntity entity, EquipmentSlot slot) { + stack.damage(amount, entity, slot); + } } diff --git a/info.properties b/info.properties index dbe054df5..de940b857 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.2-fix.1 +mod_version=2.3.3 maven_group=net.pitan76 \ No newline at end of file From 330df953d8356dae6d1dce6150e4d6147efe6ce4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 13 Jul 2024 15:51:46 +0900 Subject: [PATCH 346/622] add damage() in ItemStackUtil --- .../java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 71df1d4ee..4737b2b2d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -104,7 +104,7 @@ public static void incrementCount(ItemStack stack, int count) { } public static void damage(ItemStack stack, int amount, ServerPlayerEntity entity, Runnable breakCallback) { - stack.damage(amount, entity.getRandom(), entity, breakCallback); + stack.damage(amount, entity.getServerWorld(), entity, (item) -> breakCallback.run()); } public static void damage(ItemStack stack, int amount, LivingEntity entity, EquipmentSlot slot) { From b416a609e4a88eff6240a5d66494831890a3b9f0 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:56:49 +0900 Subject: [PATCH 347/622] add damage() in ItemStackUtil2 --- .../java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 4737b2b2d..7278290df 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -110,4 +110,8 @@ public static void damage(ItemStack stack, int amount, ServerPlayerEntity entity public static void damage(ItemStack stack, int amount, LivingEntity entity, EquipmentSlot slot) { stack.damage(amount, entity, slot); } + + public static void damage(ItemStack stack, int amount, ServerPlayerEntity entity) { + stack.damage(amount, entity.getServerWorld(), entity, (item) -> entity.sendEquipmentBreakStatus(item, EquipmentSlot.MAINHAND)); + } } From 36b7491a641e61113ad358dfcc41496f18db4eaa Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:58:00 +0900 Subject: [PATCH 348/622] update compatdatapack --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1497cccde..3902c1318 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ neoforge_version=21.0.42-beta cloth_config_version=15.0.127 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.6.210 +compatdatapacks76_version=1.0.7.210 fabricEnabled=true forgeEnabled=false From 28e58bb12321ed7cf485f2b3433425659c4cb228 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:58:17 +0900 Subject: [PATCH 349/622] gradle --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index de940b857..a762baa1c 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.3 +mod_version=2.3.3-fix.1 maven_group=net.pitan76 \ No newline at end of file From 21fc715ad9a4fd4c32ecc0bd51ee7579f6f9ce20 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 20 Aug 2024 16:01:52 +0900 Subject: [PATCH 350/622] remove arch-api from forge --- forge/build.gradle | 6 +++--- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge/build.gradle b/forge/build.gradle index 1e819155f..c354c06f7 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -29,7 +29,7 @@ configurations { dependencies { forge "net.minecraftforge:forge:${rootProject.forge_version}" // Remove the next line if you don't want to depend on the API - modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" + //modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } @@ -37,8 +37,8 @@ dependencies { shadowCommon 'org.yaml:snakeyaml:2.0' compileOnly 'org.yaml:snakeyaml:2.0' - modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") - compileOnly("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") + //modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") + //compileOnly("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") shadowCommon("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") compileOnly("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") diff --git a/gradle.properties b/gradle.properties index 3902c1318..6a6973102 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,6 +28,6 @@ cloth_config_version=15.0.127 compatdatapacks76_version=1.0.7.210 fabricEnabled=true -forgeEnabled=false +forgeEnabled=true quiltEnabled=false neoforgeEnabled=true \ No newline at end of file From fa5f121d8ebbd200dff382f5be26358415d8df58 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:26:17 +0900 Subject: [PATCH 351/622] fix --- .../java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index cce607053..9a79a2f02 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimap; import com.google.gson.JsonElement; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeManager; @@ -13,7 +12,6 @@ import net.pitan76.mcpitanlib.api.event.v0.event.RecipeManagerEvent; import net.pitan76.mcpitanlib.api.event.v1.RecipeManagerRegistry; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; From 2945194d4ceb623411b6f166deb63bad3a191034 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:26:46 +0900 Subject: [PATCH 352/622] gradle --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index a762baa1c..75831314b 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.3-fix.1 +mod_version=2.3.4 maven_group=net.pitan76 \ No newline at end of file From 0e92e1078449a5b564c6f2e127f1dfb17119672f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:27:15 +0900 Subject: [PATCH 353/622] compatdatapacks --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6a6973102..5e4f826ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ neoforge_version=21.0.42-beta cloth_config_version=15.0.127 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.7.210 +compatdatapacks76_version=1.0.8.210 fabricEnabled=true forgeEnabled=true From 0182bcaec1e35f73830fe386d72a54eea2d1ba53 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 30 Aug 2024 12:56:16 +0900 Subject: [PATCH 354/622] add APIs --- .../mcpitanlib/api/block/ExtendBlock.java | 33 ++++ .../api/block/ExtendBlockProvider.java | 50 ++++++ .../api/block/ExtendPillarBlock.java | 13 ++ .../client/registry/CompatRegistryClient.java | 4 + .../api/enchantment/CompatEnchantment.java | 68 ++++++++ .../mcpitanlib/api/entity/CompatEntity.java | 78 +++++++++ .../api/entity/CompatThrownItemEntity.java | 149 ++++++++++++++++++ .../pitan76/mcpitanlib/api/entity/Player.java | 5 + .../api/event/block/BlockUseEvent.java | 4 + .../api/event/block/OutlineShapeEvent.java | 5 + .../api/event/block/PlacementStateArgs.java | 106 +++++++++++++ .../api/event/entity/CollisionEvent.java | 25 +++ .../api/event/entity/EntityHitEvent.java | 26 +++ .../api/event/entity/InitDataTrackerArgs.java | 20 +++ .../api/event/item/ItemUseEvent.java | 4 + .../mcpitanlib/api/util/BlockStateUtil.java | 5 + .../mcpitanlib/api/util/CompatIdentifier.java | 122 ++++++++++++++ .../mcpitanlib/api/util/EnchantmentUtil.java | 49 ++++++ .../mcpitanlib/api/util/EntityUtil.java | 8 + .../pitan76/mcpitanlib/api/util/Logger.java | 47 ++++++ .../mcpitanlib/api/util/LoggerUtil.java | 38 +++++ .../api/util/ParticleEffectUtil.java | 13 ++ .../mcpitanlib/api/util/VoxelShapeUtil.java | 35 ++++ .../mcpitanlib/api/util/WorldUtil.java | 5 + .../api/util/entity/ThrownItemEntityUtil.java | 14 ++ .../effect/ItemStackParticleEffectUtil.java | 22 +++ .../mcpitanlib/mixin/AbstractBlockMixin.java | 16 +- .../pitan76/mcpitanlib/mixin/BlockMixin.java | 60 ++++++- 28 files changed, 1021 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/EntityHitEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/LoggerUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/ParticleEffectUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/effect/ItemStackParticleEffectUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index dff64b598..0bcf39ba6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -5,7 +5,10 @@ import net.minecraft.block.ShapeContext; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.item.tooltip.TooltipType; import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; @@ -24,6 +27,7 @@ import net.minecraft.world.WorldView; import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.util.TextUtil; import org.jetbrains.annotations.Nullable; @@ -242,4 +246,33 @@ public BlockState getNewDefaultState() { public void setNewDefaultState(BlockState state) { super.setDefaultState(state); } + + @Deprecated + @Override + public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) { + return this.getPlacementState(new PlacementStateArgs(ctx, this)); + } + + /** + * get placement state + * @param args PlacementStateArgs + * @return BlockState + */ + public @Nullable BlockState getPlacementState(PlacementStateArgs args) { + return super.getPlacementState(args.ctx); + } + + @Deprecated + @Override + public void appendTooltip(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipType type) { + appendTooltip(new ItemAppendTooltipEvent(stack, null, tooltip, type, context)); + } + + /** + * append tooltip to item + * @param event ItemAppendTooltipEvent + */ + public void appendTooltip(ItemAppendTooltipEvent event) { + super.appendTooltip(event.stack, event.context, event.tooltip, event.type); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java index aa475c456..6ea77f2b0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java @@ -1,13 +1,18 @@ package net.pitan76.mcpitanlib.api.block; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.util.TextUtil; +import java.util.List; + public interface ExtendBlockProvider { /** @@ -100,6 +105,51 @@ default void onStateReplaced(StateReplacedEvent event, Options options) { options.cancel = false; } + /** + * get pick stack + * @param event PickStackEvent + * @param options Options + * @return ItemStack + */ + default ItemStack getPickStack(PickStackEvent event, Options options) { + options.cancel = false; + return null; + } + + /** + * get placement state + * @param args PlacementStateArgs + * @param options Options + */ + default BlockState getPlacementState(PlacementStateArgs args, Options options) { + options.cancel = false; + return null; + } + + /** + * append properties + * @param args AppendPropertiesArgs + * @param options Options + */ + default void appendProperties(AppendPropertiesArgs args, Options options) { + options.cancel = false; + } + + /** + * get dropped stacks + * @param args DroppedStacksArgs + * @param options Options + * @return List + */ + default List getDroppedStacks(DroppedStacksArgs args, Options options) { + options.cancel = false; + return null; + } + + default void appendTooltip(ItemAppendTooltipEvent event, Options options) { + options.cancel = false; + } + public static class Options { public boolean cancel = true; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java new file mode 100644 index 000000000..e6449fa99 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.block.PillarBlock; + +public class ExtendPillarBlock extends PillarBlock implements ExtendBlockProvider { + public ExtendPillarBlock(Settings settings) { + super(settings); + } + + public ExtendPillarBlock(CompatibleBlockSettings settings) { + this(settings.build()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index f36b62f82..522eb233f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -183,4 +183,8 @@ public static void registerRenderTypeBlock(RenderLayer layer, Block block) { public static void registerRenderTypeFluid(RenderLayer layer, Fluid fluid) { RenderTypeRegistry.register(layer, fluid); } + + public static void registerCutoutBlock(Block block) { + registerRenderTypeBlock(RenderLayer.getCutout(), block); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java new file mode 100644 index 000000000..949dbe1b5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java @@ -0,0 +1,68 @@ +package net.pitan76.mcpitanlib.api.enchantment; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.BuiltinRegistries; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.Identifier; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.EnchantmentUtil; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; + +public class CompatEnchantment { + private final RegistryKey registryKey; + + @Deprecated + public CompatEnchantment(RegistryKey registryKey) { + this.registryKey = registryKey; + } + + public CompatEnchantment of(Identifier identifier) { + return EnchantmentUtil.getEnchantment(identifier); + } + + public Identifier getId() { + return registryKey.getRegistry(); + } + + @Deprecated + public RegistryKey getRegistryKey() { + return registryKey; + } + + public String toString() { + return getId().toString(); + } + + public boolean equals(Object obj) { + if (obj instanceof CompatEnchantment) { + return ((CompatEnchantment) obj).getId().equals(getId()); + } + return false; + } + + protected RegistryEntry getEntry(@Nullable World world) { + Optional> optionalEntry; + if (world == null) { + optionalEntry = BuiltinRegistries.createWrapperLookup().createRegistryLookup() + .getOptionalEntry(RegistryKeys.ENCHANTMENT, registryKey); + } else { + optionalEntry = world.getRegistryManager().get(RegistryKeys.ENCHANTMENT).getEntry(registryKey); + } + + return optionalEntry.orElseThrow(); + } + + public Enchantment getEnchantment(@Nullable World world) { + return getEntry(world).value(); + } + + public int getLevel(ItemStack stack, @Nullable World world) { + return EnchantmentHelper.getLevel(getEntry(world), stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java new file mode 100644 index 000000000..796da806b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java @@ -0,0 +1,78 @@ +package net.pitan76.mcpitanlib.api.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.data.DataTracker; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.network.listener.ClientPlayPacketListener; +import net.minecraft.network.packet.Packet; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; + +public class CompatEntity extends Entity { + public CompatEntity(EntityType type, World world) { + super(type, world); + } + + @Deprecated + @Override + public void initDataTracker(DataTracker.Builder builder) { + initDataTracker(new InitDataTrackerArgs(builder)); + } + + public void initDataTracker(InitDataTrackerArgs args) { + + } + + public void readCustomDataFromNbt(ReadNbtArgs nbt) { + + } + + public void writeCustomDataToNbt(WriteNbtArgs nbt) { + + } + + @Deprecated + @Override + public void readCustomDataFromNbt(NbtCompound nbt) { + readCustomDataFromNbt(new ReadNbtArgs(nbt)); + } + + @Deprecated + @Override + public void writeCustomDataToNbt(NbtCompound nbt) { + writeCustomDataToNbt(new WriteNbtArgs(nbt)); + } + + public Packet createSpawnPacket() { + return null; + } + + public void writeNbt(WriteNbtArgs args) { + super.writeNbt(args.getNbt()); + } + + public void readNbt(ReadNbtArgs args) { + super.readNbt(args.getNbt()); + } + + @Deprecated + @Override + public NbtCompound writeNbt(NbtCompound nbt) { + writeNbt(new WriteNbtArgs(nbt)); + return nbt; + } + + @Deprecated + @Override + public void readNbt(NbtCompound nbt) { + readNbt(new ReadNbtArgs(nbt)); + } + + @Override + public World getWorld() { + return super.getWorld(); + } +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java new file mode 100644 index 000000000..a7f71a891 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java @@ -0,0 +1,149 @@ +package net.pitan76.mcpitanlib.api.entity; + +import net.minecraft.entity.EntityType; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.data.DataTracker; +import net.minecraft.entity.projectile.thrown.ThrownItemEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.entity.CollisionEvent; +import net.pitan76.mcpitanlib.api.event.entity.EntityHitEvent; +import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; + +public abstract class CompatThrownItemEntity extends ThrownItemEntity { + + public CompatThrownItemEntity(EntityType entityType, World world) { + super(entityType, world); + } + + public CompatThrownItemEntity(EntityType entityType, double d, double e, double f, World world) { + super(entityType, d, e, f, world); + } + + public CompatThrownItemEntity(EntityType entityType, LivingEntity livingEntity, World world) { + super(entityType, livingEntity, world); + } + + public abstract Item getDefaultItemOverride(); + + @Deprecated + @Override + protected Item getDefaultItem() { + return getDefaultItemOverride(); + } + + public ItemStack callGetItem() { + return super.getStack(); + } + + @Deprecated + @Override + public ItemStack getStack() { + return callGetItem(); + } + + public void callSetItem(ItemStack stack) { + super.setItem(stack); + } + + @Deprecated + @Override + public void setItem(ItemStack stack) { + callSetItem(stack); + } + + public void callHandleStatus(byte status) { + super.handleStatus(status); + } + + @Deprecated + @Override + public void handleStatus(byte status) { + callHandleStatus(status); + } + + public void onEntityHit(EntityHitEvent event) { + super.onEntityHit(event.entityHitResult); + } + + @Deprecated + @Override + protected void onEntityHit(EntityHitResult entityHitResult) { + onEntityHit(new EntityHitEvent(entityHitResult)); + } + + public void onCollision(CollisionEvent event) { + super.onCollision(event.hitResult); + } + + @Deprecated + @Override + protected void onCollision(HitResult hitResult) { + onCollision(new CollisionEvent(hitResult)); + } + + // ------------------ ExtendEntity ------------------ + + @Deprecated + @Override + public void initDataTracker(DataTracker.Builder builder) { + initDataTracker(new InitDataTrackerArgs(builder)); + } + + public void initDataTracker(InitDataTrackerArgs args) { + super.initDataTracker(args.getBuilder()); + } + + public void readCustomDataFromNbt(ReadNbtArgs nbt) { + super.readCustomDataFromNbt(nbt.getNbt()); + } + + public void writeCustomDataToNbt(WriteNbtArgs nbt) { + super.writeCustomDataToNbt(nbt.getNbt()); + } + + @Deprecated + @Override + public void readCustomDataFromNbt(NbtCompound nbt) { + readCustomDataFromNbt(new ReadNbtArgs(nbt)); + } + + @Deprecated + @Override + public void writeCustomDataToNbt(NbtCompound nbt) { + writeCustomDataToNbt(new WriteNbtArgs(nbt)); + } + + public void writeNbt(WriteNbtArgs args) { + super.writeNbt(args.getNbt()); + } + + public void readNbt(ReadNbtArgs args) { + super.readNbt(args.getNbt()); + } + + @Deprecated + @Override + public NbtCompound writeNbt(NbtCompound nbt) { + writeNbt(new WriteNbtArgs(nbt)); + return nbt; + } + + @Deprecated + @Override + public void readNbt(NbtCompound nbt) { + readNbt(new ReadNbtArgs(nbt)); + } + + @Override + public World getWorld() { + return super.getWorld(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 12cda83b4..668796869 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -21,6 +21,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; @@ -287,4 +288,8 @@ public ItemStack getMainHandStack() { public ItemStack getOffHandStack() { return getStackInHand(Hand.OFF_HAND); } + + public Direction getHorizontalFacing() { + return getEntity().getHorizontalFacing(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java index 27ac0f670..62c6b3e4a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java @@ -95,4 +95,8 @@ public boolean hasBlockEntity() { public BlockEntity getBlockEntity() { return WorldUtil.getBlockEntity(world, pos); } + + public boolean isSneaking() { + return player.isSneaking(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java index 8489bdacd..c4586bfb7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java @@ -2,6 +2,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; +import net.minecraft.state.property.Property; import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.pitan76.mcpitanlib.api.event.BaseEvent; @@ -34,4 +35,8 @@ public BlockView getWorld() { public ShapeContext getContext() { return context; } + + public > T getProperty(Property property) { + return state.get(property); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java new file mode 100644 index 000000000..6c59a99cc --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java @@ -0,0 +1,106 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.property.Property; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; +import net.pitan76.mcpitanlib.api.util.BlockStateUtil; +import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; +import org.jetbrains.annotations.Nullable; + +public class PlacementStateArgs extends BaseEvent { + public ItemPlacementContext ctx; + + @Nullable + public Block block; + + public PlacementStateArgs(ItemPlacementContext ctx) { + this.ctx = ctx; + } + + public PlacementStateArgs(ItemPlacementContext ctx, @Nullable Block block) { + this.ctx = ctx; + this.block = block; + } + + public boolean canPlace() { + return ctx.canPlace(); + } + + public BlockPos getPos() { + return ctx.getBlockPos(); + } + + public Player getPlayer() { + return new Player(ctx.getPlayer()); + } + + public Direction[] getPlacementDirections() { + return ctx.getPlacementDirections(); + } + + public Hand getHand() { + return ctx.getHand(); + } + + public Direction getSide() { + return ctx.getSide(); + } + + public Direction getHorizontalPlayerFacing() { + return ctx.getHorizontalPlayerFacing(); + } + + public float getPlayerYaw() { + return ctx.getPlayerYaw(); + } + + public World getWorld() { + return ctx.getWorld(); + } + + public boolean isClient() { + return getWorld().isClient(); + } + + public Vec3d getHitPos() { + return ctx.getHitPos(); + } + + public boolean canReplaceExisting() { + return ctx.canReplaceExisting(); + } + + @Deprecated + public ItemUsageContextMixin getIUCAccessor() { + return (ItemUsageContextMixin) ctx; + } + + public BlockHitResult getHitResult() { + return getIUCAccessor().getHit(); + } + + public ItemUseOnBlockEvent toItemUseOnBlockEvent() { + return new ItemUseOnBlockEvent(getWorld(), getPlayer().getPlayerEntity(), getHand(), ctx.getStack(), getHitResult()); + } + + public ItemPlacementContext getCtx() { + return ctx; + } + + public , V extends T> BlockState withBlockState(Property property, V value) { + if (block == null) + return null; + + return BlockStateUtil.with(BlockStateUtil.getDefaultState(block), property, value); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java new file mode 100644 index 000000000..2bc5aa0d8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java @@ -0,0 +1,25 @@ +package net.pitan76.mcpitanlib.api.event.entity; + +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.Vec3d; + +public class CollisionEvent { + + public HitResult hitResult; + + public CollisionEvent(HitResult hitResult) { + this.hitResult = hitResult; + } + + public HitResult getHitResult() { + return hitResult; + } + + public HitResult.Type getType() { + return hitResult.getType(); + } + + public Vec3d getPos() { + return hitResult.getPos(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/EntityHitEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/EntityHitEvent.java new file mode 100644 index 000000000..048b496ed --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/EntityHitEvent.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.event.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.util.hit.HitResult; + +public class EntityHitEvent { + + public EntityHitResult entityHitResult; + + public EntityHitEvent(EntityHitResult result) { + this.entityHitResult = result; + } + + public EntityHitResult getEntityHitResult() { + return entityHitResult; + } + + public Entity getEntity() { + return entityHitResult.getEntity(); + } + + public HitResult.Type getType() { + return entityHitResult.getType(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java new file mode 100644 index 000000000..5adabbd80 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java @@ -0,0 +1,20 @@ +package net.pitan76.mcpitanlib.api.event.entity; + +import net.minecraft.entity.data.DataTracker; +import net.minecraft.entity.data.TrackedData; + +public class InitDataTrackerArgs { + public DataTracker.Builder builder; + + public InitDataTrackerArgs(DataTracker.Builder builder) { + this.builder = builder; + } + + public DataTracker.Builder getBuilder() { + return builder; + } + + public DataTracker.Builder add(TrackedData data, T value) { + return builder.add(data, value); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index 7405fede5..230611a56 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -56,4 +56,8 @@ public TypedActionResult pass() { public TypedActionResult consume() { return TypedActionResult.consume(stack); } + + public boolean isSneaking() { + return user.isSneaking(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index 0d3a302b7..53209c900 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; +import net.minecraft.state.property.Property; public class BlockStateUtil { public static Block getBlock(BlockState state) { @@ -29,4 +30,8 @@ public static BlockState getDefaultState(Block block) { public static StateManager getStateManager(Block block) { return block.getStateManager(); } + + public static , V extends T> BlockState with(BlockState state, Property property, V value) { + return state.with(property, value); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java new file mode 100644 index 000000000..5a21546e9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java @@ -0,0 +1,122 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.util.Identifier; + +/** + * This is the Identifier class unique to MCPitanLib. + * It is different from Minecraft's Identifier class. + */ +public class CompatIdentifier { + private final String namespace; + private final String path; + + /** + * Creates a new Identifier with the given namespace and path. + * @param namespace The namespace of the Identifier. + * @param path The path of the Identifier. + */ + public CompatIdentifier(String namespace, String path) { + this.namespace = namespace; + this.path = path; + } + + /** + * Creates a new Identifier with the given id. + * @param id The id of the Identifier. + */ + public CompatIdentifier(String id) { + if (!id.contains(":")) { + this.namespace = "minecraft"; + this.path = id; + return; + } + String[] split = id.split(":"); + this.namespace = split[0]; + this.path = split[1]; + } + + /** + * Creates a new Identifier with the given id. + * @param id The id of the Identifier. + * @return The Identifier. + */ + public static CompatIdentifier of(String id) { + return new CompatIdentifier(id); + } + + /** + * Creates a new Identifier with the given namespace and path. + * @param namespace The namespace of the Identifier. + * @param path The path of the Identifier. + * @return The Identifier. + */ + public static CompatIdentifier of(String namespace, String path) { + return new CompatIdentifier(namespace, path); + } + + /** + * Returns the string representation of the Identifier. + * @return The string representation of the Identifier. + */ + public String toString() { + return this.namespace + ":" + this.path; + } + + /** + * Returns the namespace of the Identifier. + * @return The namespace of the Identifier. + */ + public String getNamespace() { + return this.namespace; + } + + /** + * Returns the path of the Identifier. + * @return The path of the Identifier. + */ + public String getPath() { + return this.path; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } else if (obj != null && this.getClass() == obj.getClass()) { + CompatIdentifier identifier = (CompatIdentifier)obj; + return this.namespace.equals(identifier.namespace) && this.path.equals(identifier.path); + } else { + return false; + } + } + + public boolean equals(CompatIdentifier identifier) { + return this.namespace.equals(identifier.namespace) && this.path.equals(identifier.path); + } + + public boolean equals(String id) { + return this.toString().equals(id); + } + + public static boolean equals(CompatIdentifier id1, CompatIdentifier id2) { + return id1.namespace.equals(id2.namespace) && id1.path.equals(id2.path); + } + + // ---- + + /** + * Converts this MCPitanLib Identifier to a Minecraft Identifier. + * @return The Minecraft Identifier. + */ + public Identifier toMinecraft() { + return IdentifierUtil.id(this.toString()); + } + + /** + * Converts a Minecraft Identifier to an MCPitanLib Identifier. + * @param id The Minecraft Identifier. + * @return The Identifier. + */ + public static CompatIdentifier fromMinecraft(Identifier id) { + return of(id.toString()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java new file mode 100644 index 000000000..bf9afb248 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java @@ -0,0 +1,49 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.enchantment.CompatEnchantment; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public class EnchantmentUtil { + public static CompatEnchantment getEnchantment(Identifier identifier) { + RegistryKey registryKey = RegistryKey.of(RegistryKeys.ENCHANTMENT, identifier); + return new CompatEnchantment(registryKey); + } + + public static Identifier getId(CompatEnchantment enchantment) { + return enchantment.getId(); + } + + public static int getLevel(CompatEnchantment enchantment, ItemStack stack, @Nullable World world) { + return enchantment.getLevel(stack, world); + } + + // CompatIdentifier + public static CompatEnchantment getEnchantment(CompatIdentifier identifier) { + return getEnchantment(identifier.toMinecraft()); + } + + public static CompatIdentifier getCompatId(CompatEnchantment enchantment) { + return CompatIdentifier.fromMinecraft(enchantment.getId()); + } + + public static List getEnchantments(ItemStack stack) { + List enchantments = new ArrayList<>(); + + EnchantmentHelper.getEnchantments(stack).getEnchantments().forEach((enchantment) -> { + if (enchantment.getKey().isPresent()) + enchantments.add(new CompatEnchantment(enchantment.getKey().get())); + }); + + return enchantments; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 1be594da5..647f74c2d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -30,4 +30,12 @@ public static boolean damageWithMobAttack(Entity target, float damageAmount, Ent public static boolean damageWithPlayerAttack(Entity target, float damageAmount, Entity source, Player attacker) { return target.damage(DamageSourceUtil.playerAttack(attacker, source), damageAmount); } + + public static void discard(Entity entity) { + entity.discard(); + } + + public static void kill(Entity entity) { + entity.kill(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java new file mode 100644 index 000000000..4c3c8df7b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java @@ -0,0 +1,47 @@ +package net.pitan76.mcpitanlib.api.util; + +public class Logger { + private final org.apache.logging.log4j.Logger logger; + + public Logger(String modid) { + this.logger = LoggerUtil.getLogger(modid); + } + + public org.apache.logging.log4j.Logger getLogger() { + return logger; + } + + public void info(String message) { + LoggerUtil.info(logger, message); + } + + public void warn(String message) { + LoggerUtil.warn(logger, message); + } + + public void error(String message) { + LoggerUtil.error(logger, message); + } + + public void debug(String message) { + LoggerUtil.debug(logger, message); + } + + public void trace(String message) { + LoggerUtil.trace(logger, message); + } + + // ---- + + public void error(Exception e) { + error(e.getMessage()); + } + + public void initializeMessage() { + info("Initializing..."); + } + + public void initializedMessage() { + info("Initialized"); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/LoggerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/LoggerUtil.java new file mode 100644 index 000000000..666a367b5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/LoggerUtil.java @@ -0,0 +1,38 @@ +package net.pitan76.mcpitanlib.api.util; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class LoggerUtil { + public static Logger getLogger(String name) { + return LogManager.getLogger(name); + } + + public static Logger getLogger(Class clazz) { + return LogManager.getLogger(clazz); + } + + public static Logger getLogger() { + return LogManager.getLogger(); + } + + public static void info(Logger logger, String message) { + logger.info(message); + } + + public static void warn(Logger logger, String message) { + logger.warn(message); + } + + public static void error(Logger logger, String message) { + logger.error(message); + } + + public static void debug(Logger logger, String message) { + logger.debug(message); + } + + public static void trace(Logger logger, String message) { + logger.trace(message); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ParticleEffectUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ParticleEffectUtil.java new file mode 100644 index 000000000..bcfa9d246 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ParticleEffectUtil.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.particle.ParticleEffect; +import net.minecraft.particle.ParticleType; +import net.pitan76.mcpitanlib.api.util.particle.effect.ItemStackParticleEffectUtil; + +public class ParticleEffectUtil { + public static ItemStackParticleEffectUtil itemStack = new ItemStackParticleEffectUtil(); + + public static ParticleType getType(ParticleEffect effect) { + return effect.getType(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java new file mode 100644 index 000000000..8c2343406 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; + +public class VoxelShapeUtil { + public static VoxelShape union(VoxelShape shape,VoxelShape... shapes) { + return VoxelShapes.union(shape, shapes); + } + + public static VoxelShape cuboid(double x1, double y1, double z1, double x2, double y2, double z2) { + return VoxelShapes.cuboid(x1, y1, z1, x2, y2, z2); + } + + public static VoxelShape cuboid(double x, double y, double z, double size) { + return VoxelShapes.cuboid(x, y, z, x + size, y + size, z + size); + } + + public static VoxelShape cuboid(double size) { + return VoxelShapes.cuboid(0, 0, 0, size, size, size); + } + + public static VoxelShape centeredCuboid(double x, double y, double z, double size) { + return VoxelShapes.cuboid(x - size / 2, y - size / 2, z - size / 2, x + size / 2, y + size / 2, z + size / 2); + } + + public static VoxelShape empty() { + return VoxelShapes.empty(); + } + + public static VoxelShape fullCube() { + return VoxelShapes.fullCube(); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 6290e0b0f..021084f60 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -10,6 +10,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.item.ItemStack; +import net.minecraft.particle.ParticleEffect; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.server.MinecraftServer; @@ -214,4 +215,8 @@ public static void removeBlockEntity(World world, BlockPos pos) { public static boolean removeBlock(World world, BlockPos pos, boolean move) { return world.removeBlock(pos, move); } + + public static void addParticle(World world, ParticleEffect parameters, double x, double y, double z, double velocityX, double velocityY, double velocityZ) { + world.addParticle(parameters, x, y, z, velocityX, velocityY, velocityZ); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java new file mode 100644 index 000000000..c883b01fe --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.projectile.thrown.ThrownItemEntity; +import net.minecraft.item.ItemStack; + +public class ThrownItemEntityUtil { + public static ItemStack getItem(ThrownItemEntity entity) { + return entity.getStack(); + } + + public static void setItem(ThrownItemEntity entity, ItemStack stack) { + entity.setItem(stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/effect/ItemStackParticleEffectUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/effect/ItemStackParticleEffectUtil.java new file mode 100644 index 000000000..9eab41f4d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/effect/ItemStackParticleEffectUtil.java @@ -0,0 +1,22 @@ +package net.pitan76.mcpitanlib.api.util.particle.effect; + +import net.minecraft.item.ItemStack; +import net.minecraft.particle.ItemStackParticleEffect; +import net.minecraft.particle.ParticleType; +import net.minecraft.particle.ParticleTypes; + +// Use: ParticleEffectUtil +public class ItemStackParticleEffectUtil { + + public ItemStackParticleEffectUtil() { + // Empty constructor + } + + public ItemStackParticleEffect create(ParticleType type, ItemStack stack) { + return new ItemStackParticleEffect(type, stack); + } + + public ItemStackParticleEffect createTypedItem(ItemStack stack) { + return new ItemStackParticleEffect(ParticleTypes.ITEM, stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java index 09483127e..d369db3a3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -4,11 +4,12 @@ import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; @@ -24,6 +25,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import java.util.List; + @Mixin(AbstractBlock.class) public class AbstractBlockMixin { @Inject(method = "getCollisionShape", at = @At("HEAD"), cancellable = true) @@ -92,4 +95,15 @@ public class AbstractBlockMixin { ci.cancel(); } } + + @Inject(method = "getDroppedStacks", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_getDroppedStacks(BlockState state, LootContextParameterSet.Builder builder, CallbackInfoReturnable> cir) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + List returnValue = provider.getDroppedStacks(new DroppedStacksArgs(state, builder), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java index 752dd16b4..5aa0bcbcc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockMixin.java @@ -4,14 +4,20 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; +import net.minecraft.item.tooltip.TooltipType; +import net.minecraft.state.StateManager; +import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.WorldView; import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider; import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider.Options; -import net.pitan76.mcpitanlib.api.event.block.BlockBreakEvent; -import net.pitan76.mcpitanlib.api.event.block.BlockPlacedEvent; +import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.event.v1.listener.BlockBreakTask; import net.pitan76.mcpitanlib.api.event.v1.listener.BlockPlacedTask; import net.pitan76.mcpitanlib.api.event.v2.BlockEventRegistry; @@ -21,6 +27,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import java.util.List; + @Mixin(Block.class) public class BlockMixin { @@ -72,4 +80,52 @@ public class BlockMixin { cir.setReturnValue(returnValue.getState()); } } + + @Inject(method = "getPickStack", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getPickStack(WorldView world, BlockPos pos, BlockState state, CallbackInfoReturnable cir) { + // ExtendBlockProviderを実装している場合 + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + ItemStack returnValue = provider.getPickStack(new PickStackEvent(world, pos, state), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "appendProperties", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$appendProperties(StateManager.Builder builder, CallbackInfo ci) { + // ExtendBlockProviderを実装している場合 + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + provider.appendProperties(new AppendPropertiesArgs(builder), options); + if (options.cancel) + ci.cancel(); + } + } + + @Inject(method = "getPlacementState", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getPlacementState(ItemPlacementContext ctx, CallbackInfoReturnable cir) { + // ExtendBlockProviderを実装している場合 + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + BlockState returnValue = provider.getPlacementState(new PlacementStateArgs(ctx), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "appendTooltip", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$appendTooltip(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipType type, CallbackInfo ci) { + // ExtendBlockProviderを実装している場合 + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + provider.appendTooltip(new ItemAppendTooltipEvent(stack, null, tooltip, type, context), options); + if (options.cancel) + ci.cancel(); + } + } } From 245511f151bee2903b458caeed40bf93b36a72c3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 30 Aug 2024 13:00:18 +0900 Subject: [PATCH 355/622] gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 5e4f826ac..1ab523aa1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,6 +28,6 @@ cloth_config_version=15.0.127 compatdatapacks76_version=1.0.8.210 fabricEnabled=true -forgeEnabled=true +forgeEnabled=false quiltEnabled=false neoforgeEnabled=true \ No newline at end of file From 87b0b93fb97ddac69ba1a86ef9515ea6637ad195 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 30 Aug 2024 20:33:21 +0900 Subject: [PATCH 356/622] add APIs --- .../registry/EntityRendererRegistry.java | 13 ++ .../api/item/CreativeTabBuilder.java | 5 + .../api/registry/v2/CompatRegistryV2.java | 112 ++++++++++++++++++ .../api/util/entity/ArrowEntityUtil.java | 26 ++++ .../util/entity/SmallFireballEntityUtil.java | 29 +++++ .../api/util/entity/SnowballEntityUtil.java | 23 ++++ .../util/entity/SpectralArrowEntityUtil.java | 26 ++++ .../mcpitanlib/api/util/math/Vec3dUtil.java | 69 +++++++++++ .../mcpitanlib/api/util/math/Vec3iUtil.java | 33 ++++++ info.properties | 2 +- 10 files changed, 337 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/EntityRendererRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ArrowEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SmallFireballEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SpectralArrowEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3iUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/EntityRendererRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/EntityRendererRegistry.java new file mode 100644 index 000000000..7fa99982f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/EntityRendererRegistry.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.client.registry; + +import net.minecraft.client.render.entity.EntityRenderer; +import net.minecraft.client.render.entity.FlyingItemEntityRenderer; +import net.minecraft.entity.EntityType; + +import java.util.function.Supplier; + +public class EntityRendererRegistry { + public static void registerEntityRendererAsFlyingItem(Supplier> entityType) { + CompatRegistryClient.registerEntityRenderer(entityType, (ctx -> (EntityRenderer) new FlyingItemEntityRenderer<>(ctx))); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java index 5fa923264..ed6bc01bd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.TextUtil; @@ -30,6 +31,10 @@ public static CreativeTabBuilder create(Identifier identifier) { return new CreativeTabBuilder(identifier); } + public static CreativeTabBuilder create(CompatIdentifier identifier) { + return create(identifier.toMinecraft()); + } + public CreativeTabBuilder setDisplayName(Text text) { this.displayName = text; return this; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java new file mode 100644 index 000000000..7650904ea --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -0,0 +1,112 @@ +package net.pitan76.mcpitanlib.api.registry.v2; + +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.particle.ParticleType; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.sound.SoundEvent; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; +import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.registry.CompatRegistry; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.function.Supplier; + +public class CompatRegistryV2 { + + public final CompatRegistry cr1; + + @Deprecated + public CompatRegistryV2(CompatRegistry compatRegistry) { + this.cr1 = compatRegistry; + } + + /** + * Create a new CompatRegistry + * @param MOD_ID The mod id + * @return The new CompatRegistry + */ + public static CompatRegistry create(String MOD_ID) { + return CompatRegistry.create(MOD_ID); + } + + /** + * Register an item + * @param id The item id + * @param supplier The item supplier + * @return The registry result + */ + public RegistryResult registerItem(CompatIdentifier id, Supplier supplier) { + return cr1.registerItem(id.toMinecraft(), supplier); + } + + public Supplier registerExtendItem(CompatIdentifier id, Supplier supplier) { + RegistryResult result = registerItem(id, supplier::get); + return () -> (ExtendItem) result.get(); + } + + /** + * Register a block + * @param id The block id + * @param supplier The block supplier + * @return The registry result + */ + public RegistryResult registerBlock(CompatIdentifier id, Supplier supplier) { + return cr1.registerBlock(id.toMinecraft(), supplier); + } + + public Supplier registerExtendBlock(CompatIdentifier id, Supplier supplier) { + RegistryResult result = registerBlock(id, supplier::get); + return () -> (ExtendBlock) result.get(); + } + + public RegistryResult> registerScreenHandlerType(CompatIdentifier id, Supplier> supplier) { + return cr1.registerScreenHandlerType(id.toMinecraft(), supplier); + } + + public RegistryResult> registerBlockEntityType(CompatIdentifier id, Supplier> supplier) { + return cr1.registerBlockEntityType(id.toMinecraft(), supplier); + } + + public RegistryResult> registerEntity(CompatIdentifier id, Supplier> supplier) { + return cr1.registerEntity(id.toMinecraft(), supplier); + } + + public RegistryResult registerSoundEvent(CompatIdentifier id) { + return cr1.registerSoundEvent(id.toMinecraft()); + } + + public RegistryResult registerSoundEvent(CompatIdentifier id, float distanceToTravel) { + return cr1.registerSoundEvent(id.toMinecraft(), distanceToTravel); + } + + public RegistryResult registerFluid(CompatIdentifier id, Supplier supplier) { + return cr1.registerFluid(id.toMinecraft(), supplier); + } + + public RegistryResult> registerParticleType(CompatIdentifier id, Supplier> supplier) { + return cr1.registerParticleType(id.toMinecraft(), supplier); + } + + public RegistryResult registerItemGroup(CompatIdentifier id, Supplier supplier) { + return cr1.registerItemGroup(id.toMinecraft(), supplier); + } + + public RegistryResult registerItemGroup(CompatIdentifier id, CreativeTabBuilder builder) { + return cr1.registerItemGroup(id.toMinecraft(), builder); + } + + public RegistryResult registerItemGroup(CreativeTabBuilder builder) { + return cr1.registerItemGroup(builder.getIdentifier(), builder); + } + + public void allRegister() { + cr1.allRegister(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ArrowEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ArrowEntityUtil.java new file mode 100644 index 000000000..e12d3910f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ArrowEntityUtil.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.projectile.ArrowEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import org.jetbrains.annotations.Nullable; + +public class ArrowEntityUtil { + public static ArrowEntity create(World world, double x, double y, double z, ItemStack stack, @Nullable ItemStack shotFrom) { + return new ArrowEntity(world, x, y, z, stack, shotFrom); + } + + public static ArrowEntity create(World world, double x, double y, double z, ItemStack stack) { + return create(world, x, y, z, stack, null); + } + + public static ArrowEntity create(World world, double x, double y, double z) { + return create(world, x, y, z, ItemStackUtil.getDefaultStack(Items.ARROW)); + } + + public static void setVelocity(ArrowEntity arrow, double x, double y, double z, float velocity, float divergence) { + arrow.setVelocity(x, y, z, velocity, divergence); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SmallFireballEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SmallFireballEntityUtil.java new file mode 100644 index 000000000..38f484a37 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SmallFireballEntityUtil.java @@ -0,0 +1,29 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.projectile.SmallFireballEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.math.Vec3dUtil; + +public class SmallFireballEntityUtil { + public static SmallFireballEntity create(World world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) { + return new SmallFireballEntity(world, x, y, z, Vec3dUtil.create(velocityX, velocityY, velocityZ)); + } + + public static SmallFireballEntity create(World world, double x, double y, double z, Vec3d velocity) { + return new SmallFireballEntity(world, x, y, z, velocity); + } + + public static void setVelocity(SmallFireballEntity entity, double x, double y, double z, float velocity, float divergence) { + entity.setVelocity(x, y, z, velocity, divergence); + } + + public static void setItem(SmallFireballEntity entity, ItemStack stack) { + entity.setItem(stack); + } + + public static ItemStack getItem(SmallFireballEntity entity) { + return entity.getStack(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java new file mode 100644 index 000000000..b41984039 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.projectile.thrown.SnowballEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class SnowballEntityUtil { + public static SnowballEntity create(World world, double x, double y, double z) { + return new SnowballEntity(world, x, y, z); + } + + public static void setVelocity(SnowballEntity entity, double x, double y, double z, float velocity, float divergence) { + entity.setVelocity(x, y, z, velocity, divergence); + } + + public static void setItem(SnowballEntity entity, ItemStack stack) { + entity.setItem(stack); + } + + public static ItemStack getItem(SnowballEntity entity) { + return entity.getStack(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SpectralArrowEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SpectralArrowEntityUtil.java new file mode 100644 index 000000000..2f83e9548 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SpectralArrowEntityUtil.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.projectile.SpectralArrowEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import org.jetbrains.annotations.Nullable; + +public class SpectralArrowEntityUtil { + public static SpectralArrowEntity create(World world, double x, double y, double z, ItemStack stack, @Nullable ItemStack shotFrom) { + return new SpectralArrowEntity(world, x, y, z, stack, shotFrom); + } + + public static SpectralArrowEntity create(World world, double x, double y, double z, ItemStack stack) { + return create(world, x, y, z, stack, null); + } + + public static SpectralArrowEntity create(World world, double x, double y, double z) { + return create(world, x, y, z, ItemStackUtil.getDefaultStack(Items.ARROW)); + } + + public static void setVelocity(SpectralArrowEntity arrow, double x, double y, double z, float velocity, float divergence) { + arrow.setVelocity(x, y, z, velocity, divergence); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java new file mode 100644 index 000000000..c93066c33 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java @@ -0,0 +1,69 @@ +package net.pitan76.mcpitanlib.api.util.math; + +import net.minecraft.util.math.Vec3d; + +public class Vec3dUtil { + public static Vec3d create(double x, double y, double z) { + return new Vec3d(x, y, z); + } + + public static Vec3d add(Vec3d a, Vec3d b) { + return a.add(b); + } + + public static Vec3d subtract(Vec3d a, Vec3d b) { + return a.subtract(b); + } + + public static Vec3d multiply(Vec3d a, double b) { + return a.multiply(b); + } + + public static Vec3d divide(Vec3d a, double b) { + return a.multiply(1.0D / b); + } + + public static double dot(Vec3d a, Vec3d b) { + return a.dotProduct(b); + } + + public static Vec3d cross(Vec3d a, Vec3d b) { + return a.crossProduct(b); + } + + public static Vec3d normalize(Vec3d a) { + return a.normalize(); + } + + public static Vec3d rotateX(Vec3d a, float angle) { + return a.rotateX(angle); + } + + public static Vec3d rotateY(Vec3d a, float angle) { + return a.rotateY(angle); + } + + public static Vec3d rotateZ(Vec3d a, float angle) { + return a.rotateZ(angle); + } + + public static Vec3d add(Vec3d a, double x, double y, double z) { + return a.add(x, y, z); + } + + public static Vec3d subtract(Vec3d a, double x, double y, double z) { + return a.subtract(x, y, z); + } + + public static Vec3d multiply(Vec3d a, double x, double y, double z) { + return a.multiply(x, y, z); + } + + public static double distanceTo(Vec3d a, Vec3d b) { + return a.distanceTo(b); + } + + + + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3iUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3iUtil.java new file mode 100644 index 000000000..4def019b0 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3iUtil.java @@ -0,0 +1,33 @@ +package net.pitan76.mcpitanlib.api.util.math; + +import net.minecraft.util.math.Vec3i; + +public class Vec3iUtil { + public static Vec3i create(int x, int y, int z) { + return new Vec3i(x, y, z); + } + + public static Vec3i add(Vec3i a, Vec3i b) { + return a.add(b); + } + + public static Vec3i subtract(Vec3i a, Vec3i b) { + return a.subtract(b); + } + + public static Vec3i multiply(Vec3i a, int b) { + return a.multiply(b); + } + + public static Vec3i cross(Vec3i a, Vec3i b) { + return a.crossProduct(b); + } + + public static Vec3i add(Vec3i a, int x, int y, int z) { + return a.add(x, y, z); + } + + public static Vec3i subtract(Vec3i a, int x, int y, int z) { + return a.add(-x, -y, -z); + } +} diff --git a/info.properties b/info.properties index 75831314b..e4530718c 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.4 +mod_version=2.3.5 maven_group=net.pitan76 \ No newline at end of file From 316cdabcb5709561711b5febbbe3df64ba76c098 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 31 Aug 2024 18:33:31 +0900 Subject: [PATCH 357/622] fix network --- .../api/network/ClientNetworking.java | 48 ++++++++++------- .../api/network/ServerNetworking.java | 51 ++++++++++++------- 2 files changed, 63 insertions(+), 36 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index 86de66c29..02e247c03 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -2,43 +2,57 @@ import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; -import dev.architectury.networking.simple.BaseS2CMessage; -import dev.architectury.networking.simple.MessageDecoder; -import dev.architectury.networking.simple.SimpleNetworkManager; +import dev.architectury.networking.transformers.PacketTransformer; +import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufUtil; +import io.netty.buffer.Unpooled; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.network.PacketByteBuf; import net.minecraft.network.RegistryByteBuf; +import net.minecraft.network.codec.PacketCodec; import net.minecraft.network.packet.CustomPayload; import net.minecraft.util.Identifier; -import static dev.architectury.impl.NetworkAggregator.C2S_TYPE; +import java.util.List; +import java.util.Objects; + +import static dev.architectury.impl.NetworkAggregator.*; public class ClientNetworking { public static void send(Identifier identifier, PacketByteBuf buf) { - if (!C2S_TYPE.containsKey(identifier)) - C2S_TYPE.put(identifier, new CustomPayload.Id<>(identifier)); + if (!C2S_TYPE.containsKey(identifier)) { + CustomPayload.Id type = new CustomPayload.Id<>(identifier); + C2S_TYPE.put(identifier, type); + registerC2SType(type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), List.of()); + } CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(C2S_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToServer(payload); } public static void registerReceiver(Identifier identifier, ClientNetworkHandler handler) { - SimpleNetworkManager.create(identifier.getNamespace()).registerS2C(identifier.getPath(), new MessageDecoder<>() { - @Override - public BaseS2CMessage decode(RegistryByteBuf buf) { - return null; - } - - @Override - public NetworkManager.NetworkReceiver createReceiver() { - return ((buf, context) -> handler.receive(MinecraftClient.getInstance(), MinecraftClient.getInstance().player, buf)); - } - }); + CustomPayload.Id type = new CustomPayload.Id<>(identifier); + NetworkManager.registerReceiver(NetworkManager.Side.S2C, type, BufCustomPacketPayload.streamCodec(type), List.of(), + (value, context) -> { + RegistryByteBuf buf = new RegistryByteBuf(Unpooled.wrappedBuffer(value.payload()), context.registryAccess()); + ClientPlayerEntity player = null; + if (context.getPlayer() instanceof ClientPlayerEntity) + player = (ClientPlayerEntity) context.getPlayer(); + + handler.receive(MinecraftClient.getInstance(), player, buf); + buf.release(); + }); } @FunctionalInterface public interface ClientNetworkHandler { void receive(MinecraftClient client, ClientPlayerEntity player, PacketByteBuf buf); } + + public static void registerC2SType(CustomPayload.Id type, PacketCodec codec, List packetTransformers) { + Objects.requireNonNull(type, "Cannot register a null type!"); + packetTransformers = Objects.requireNonNullElse(packetTransformers, List.of()); + C2S_CODECS.put(type.id(), (PacketCodec) codec); + C2S_TRANSFORMERS.put(type.id(), PacketTransformer.concat(packetTransformers)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index fd6790fd1..6d45691fe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -2,10 +2,8 @@ import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; -import dev.architectury.networking.simple.BaseC2SMessage; -import dev.architectury.networking.simple.MessageDecoder; -import dev.architectury.networking.simple.SimpleNetworkManager; import io.netty.buffer.ByteBufUtil; +import io.netty.buffer.Unpooled; import net.minecraft.network.PacketByteBuf; import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.packet.CustomPayload; @@ -13,20 +11,35 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; +import java.util.List; + import static dev.architectury.impl.NetworkAggregator.S2C_TYPE; +import static dev.architectury.impl.NetworkAggregator.BufCustomPacketPayload; + public class ServerNetworking { public static void send(ServerPlayerEntity player, Identifier identifier, PacketByteBuf buf) { - if (!S2C_TYPE.containsKey(identifier)) - S2C_TYPE.put(identifier, new CustomPayload.Id<>(identifier)); - CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + if (!S2C_TYPE.containsKey(identifier)) { + CustomPayload.Id type = new CustomPayload.Id<>(identifier); + S2C_TYPE.put(identifier, type); + + if (!NetworkAggregator.S2C_CODECS.containsKey(type)) + NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); + } + + CustomPayload payload = new BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToPlayer(player, payload); } public static void send(Iterable players, Identifier identifier, PacketByteBuf buf) { - if (!S2C_TYPE.containsKey(identifier)) - S2C_TYPE.put(identifier, new CustomPayload.Id<>(identifier)); - CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + if (!S2C_TYPE.containsKey(identifier)) { + CustomPayload.Id type = new CustomPayload.Id<>(identifier); + S2C_TYPE.put(identifier, type); + + if (!NetworkAggregator.S2C_CODECS.containsKey(type)) + NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); + } + CustomPayload payload = new BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToPlayers(players, payload); } @@ -35,16 +48,16 @@ public static void sendAll(MinecraftServer server, Identifier identifier, Packet } public static void registerReceiver(Identifier identifier, ServerNetworkHandler handler) { - SimpleNetworkManager.create(identifier.getNamespace()).registerC2S(identifier.getPath(), new MessageDecoder<>() { - @Override - public BaseC2SMessage decode(RegistryByteBuf buf) { - return null; - } - - @Override - public NetworkManager.NetworkReceiver createReceiver() { - return ((buf, context) -> handler.receive(context.getPlayer().getServer(), (ServerPlayerEntity) context.getPlayer(), buf)); - } + CustomPayload.Id type = new CustomPayload.Id<>(identifier); + NetworkManager.registerReceiver(NetworkManager.Side.C2S, type, BufCustomPacketPayload.streamCodec(type), List.of(), + (value, context) -> { + RegistryByteBuf buf = new RegistryByteBuf(Unpooled.wrappedBuffer(value.payload()), context.registryAccess()); + ServerPlayerEntity player = null; + if (context.getPlayer() instanceof ServerPlayerEntity) + player = (ServerPlayerEntity) context.getPlayer(); + + handler.receive(context.getPlayer().getServer(), player, buf); + buf.release(); }); } From 5c9ed9d5b36318111135cf169262b75ccc8d0ae4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 31 Aug 2024 19:40:23 +0900 Subject: [PATCH 358/622] add fixer --- .../ItemStackComponentizationFixMixin.java | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackComponentizationFixMixin.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackComponentizationFixMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackComponentizationFixMixin.java new file mode 100644 index 000000000..86b0a5bc8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackComponentizationFixMixin.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.mixin; + +import com.mojang.serialization.Dynamic; +import net.minecraft.datafixer.fix.ItemStackComponentizationFix; +import net.pitan76.mcpitanlib.api.datafixer.ItemStackFixer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ItemStackComponentizationFix.class) +public class ItemStackComponentizationFixMixin { + @Inject(method = "fixStack", at = @At("TAIL")) + private static void mcpitanlib$fixStack(ItemStackComponentizationFix.StackData data, Dynamic dynamic, CallbackInfo ci) { + if (!ItemStackFixer.getNbt2componentMapIfItemEqualMap().isEmpty()) { + ItemStackFixer.getNbt2componentMapIfItemEqualMap().forEach((itemId, map) -> { + for (String nbtKey : map.keySet()) { + if (data.itemEquals(itemId)) { + data.moveToComponent(nbtKey, map.get(nbtKey)); + } + } + }); + } + + if (!ItemStackFixer.getNbt2componentMapIfitemMatchesMap().isEmpty()) { + ItemStackFixer.getNbt2componentMapIfitemMatchesMap().forEach((itemIds, map) -> { + for (String nbtKey : map.keySet()) { + if (data.itemMatches(itemIds)) { + data.moveToComponent(nbtKey, map.get(nbtKey)); + } + } + }); + } + + if (!ItemStackFixer.getNbt2componentMap().isEmpty()) { + ItemStackFixer.getNbt2componentMap().forEach(data::moveToComponent); + } + } + +} From d022c98c8fee80bd78254638cb9c40a0d7cfbc81 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 31 Aug 2024 19:40:50 +0900 Subject: [PATCH 359/622] add APIs --- .../api/block/CompatPillarBlock.java | 52 +++++++++++++ .../api/block/CompatStairsBlock.java | 73 +++++++++++++++++++ .../api/block/ExtendPillarBlock.java | 13 ---- .../api/datafixer/ItemStackFixer.java | 52 +++++++++++++ .../api/registry/v2/CompatRegistryV2.java | 13 +++- .../mcpitanlib/core/datafixer/Pair.java | 43 +++++++++++ 6 files changed, 229 insertions(+), 17 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java delete mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/datafixer/ItemStackFixer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/core/datafixer/Pair.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java new file mode 100644 index 000000000..4be321670 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java @@ -0,0 +1,52 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.PillarBlock; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; + +public class CompatPillarBlock extends PillarBlock implements ExtendBlockProvider { + public CompatPillarBlock(Settings settings) { + super(settings); + } + + public CompatPillarBlock(CompatibleBlockSettings settings) { + this(settings.build()); + } + + public void appendProperties(AppendPropertiesArgs args) { + super.appendProperties(args.builder); + } + + public BlockState getPlacementState(PlacementStateArgs args) { + return super.getPlacementState(args.ctx); + } + + @Deprecated + @Override + public void appendProperties(StateManager.Builder builder) { + appendProperties(new AppendPropertiesArgs(builder)); + } + + @Deprecated + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return getPlacementState(new PlacementStateArgs(ctx)); + } + + // ExtendBlockProvider + @Deprecated + @Override + public void appendProperties(AppendPropertiesArgs args, Options options) { + ExtendBlockProvider.super.appendProperties(args, options); + } + + @Deprecated + @Override + public BlockState getPlacementState(PlacementStateArgs args, Options options) { + return ExtendBlockProvider.super.getPlacementState(args, options); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java new file mode 100644 index 000000000..3a016f3e3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java @@ -0,0 +1,73 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.StairsBlock; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.event.block.OutlineShapeEvent; +import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; + +public class CompatStairsBlock extends StairsBlock implements ExtendBlockProvider { + public CompatStairsBlock(BlockState baseBlockState, Settings settings) { + super(baseBlockState, settings); + } + + public CompatStairsBlock(BlockState baseBlockState, CompatibleBlockSettings settings) { + this(baseBlockState, settings.build()); + } + + public VoxelShape getOutlineShape(OutlineShapeEvent event) { + return super.getOutlineShape(event.state, event.world, event.pos, event.context); + } + + public void appendProperties(AppendPropertiesArgs args) { + super.appendProperties(args.builder); + } + + public BlockState getPlacementState(PlacementStateArgs args) { + return super.getPlacementState(args.ctx); + } + + @Deprecated + @Override + public void appendProperties(StateManager.Builder builder) { + appendProperties(new AppendPropertiesArgs(builder)); + } + + @Deprecated + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return getPlacementState(new PlacementStateArgs(ctx)); + } + + @Deprecated + @Override + protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return getOutlineShape(new OutlineShapeEvent(state, world, pos, context)); + } + + // ExtendBlockProvider + @Deprecated + @Override + public void appendProperties(AppendPropertiesArgs args, Options options) { + ExtendBlockProvider.super.appendProperties(args, options); + } + + @Deprecated + @Override + public BlockState getPlacementState(PlacementStateArgs args, Options options) { + return ExtendBlockProvider.super.getPlacementState(args, options); + } + + @Deprecated + @Override + public VoxelShape getOutlineShape(OutlineShapeEvent event, Options options) { + return ExtendBlockProvider.super.getOutlineShape(event, options); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java deleted file mode 100644 index e6449fa99..000000000 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendPillarBlock.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.pitan76.mcpitanlib.api.block; - -import net.minecraft.block.PillarBlock; - -public class ExtendPillarBlock extends PillarBlock implements ExtendBlockProvider { - public ExtendPillarBlock(Settings settings) { - super(settings); - } - - public ExtendPillarBlock(CompatibleBlockSettings settings) { - this(settings.build()); - } -} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/datafixer/ItemStackFixer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/datafixer/ItemStackFixer.java new file mode 100644 index 000000000..a3b041b01 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/datafixer/ItemStackFixer.java @@ -0,0 +1,52 @@ +package net.pitan76.mcpitanlib.api.datafixer; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +public class ItemStackFixer { + private static final Map> nbt2componentMapIfItemEqualMap = new HashMap<>(); + private static final Map, Map> nbt2componentMapIfitemMatchesMap = new HashMap<>(); + private static final Map nbt2componentMap = new HashMap<>(); + + public static void nbt2componentIfItemEquals(String itemId, String nbtKey, String componentId) { + Map nbt2componentMap; + if (nbt2componentMapIfItemEqualMap.containsKey(itemId)) { + nbt2componentMap = nbt2componentMapIfItemEqualMap.get(itemId); + } else { + nbt2componentMap = new HashMap<>(); + nbt2componentMapIfItemEqualMap.put(itemId, nbt2componentMap); + } + + nbt2componentMap.put(nbtKey, componentId); + } + + public static void nbt2componentIfItemMatches(Set itemId, String nbtKey, String componentId) { + Map nbt2componentMap; + if (nbt2componentMapIfitemMatchesMap.containsKey(itemId)) { + nbt2componentMap = nbt2componentMapIfitemMatchesMap.get(itemId); + } else { + nbt2componentMap = new HashMap<>(); + nbt2componentMapIfitemMatchesMap.put(itemId, nbt2componentMap); + } + + nbt2componentMap.put(nbtKey, componentId); + } + + public static void nbt2component(String nbtKey, String componentId) { + if (nbt2componentMap.containsKey(nbtKey)) return; + nbt2componentMap.put(nbtKey, componentId); + } + + public static Map> getNbt2componentMapIfItemEqualMap() { + return nbt2componentMapIfItemEqualMap; + } + + public static Map, Map> getNbt2componentMapIfitemMatchesMap() { + return nbt2componentMapIfitemMatchesMap; + } + + public static Map getNbt2componentMap() { + return nbt2componentMap; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 7650904ea..20a4996e5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -28,12 +28,17 @@ public CompatRegistryV2(CompatRegistry compatRegistry) { } /** - * Create a new CompatRegistry + * Create a new CompatRegistryV2 * @param MOD_ID The mod id - * @return The new CompatRegistry + * @return The new CompatRegistryV2 */ - public static CompatRegistry create(String MOD_ID) { - return CompatRegistry.create(MOD_ID); + public static CompatRegistryV2 create(String MOD_ID) { + CompatRegistry cr1 = CompatRegistry.create(MOD_ID); + return new CompatRegistryV2(cr1); + } + + public static CompatRegistryV2 create(CompatRegistry compatRegistry) { + return new CompatRegistryV2(compatRegistry); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/datafixer/Pair.java b/common/src/main/java/net/pitan76/mcpitanlib/core/datafixer/Pair.java new file mode 100644 index 000000000..d6d85643f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/datafixer/Pair.java @@ -0,0 +1,43 @@ +package net.pitan76.mcpitanlib.core.datafixer; + +public class Pair { + private A a; + private B b; + + public Pair(A a, B b) { + this.a = a; + this.b = b; + } + + public A getA() { + return a; + } + + public B getB() { + return b; + } + + public void setA(A a) { + this.a = a; + } + + public void setB(B b) { + this.b = b; + } + + public static Pair of(A a, B b) { + return new Pair<>(a, b); + } + + public static Pair of() { + return new Pair<>(null, null); + } + + public static Pair ofA(A a) { + return new Pair<>(a, null); + } + + public static Pair ofB(B b) { + return new Pair<>(null, b); + } +} From 80c5281f979cc6e5b9f991c4141e273fd210d984 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 31 Aug 2024 19:40:59 +0900 Subject: [PATCH 360/622] mixin --- common/src/main/resources/mcpitanlib-common.mixins.json | 1 + common/src/main/resources/mcpitanlib.accesswidener | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/src/main/resources/mcpitanlib-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json index 6dad93704..2e376f82b 100644 --- a/common/src/main/resources/mcpitanlib-common.mixins.json +++ b/common/src/main/resources/mcpitanlib-common.mixins.json @@ -7,6 +7,7 @@ "AbstractBlockMixin", "BlockMixin", "ItemMixin", + "ItemStackComponentizationFixMixin", "ItemStackMixin", "ItemUsageContextMixin", "MinecraftServerTimer", diff --git a/common/src/main/resources/mcpitanlib.accesswidener b/common/src/main/resources/mcpitanlib.accesswidener index e0993935d..8a4da5e54 100644 --- a/common/src/main/resources/mcpitanlib.accesswidener +++ b/common/src/main/resources/mcpitanlib.accesswidener @@ -14,8 +14,10 @@ accessible field net/minecraft/item/ItemGroups SPAWN_EGGS Lnet/minec accessible field net/minecraft/item/ItemGroups OPERATOR Lnet/minecraft/registry/RegistryKey; accessible field net/minecraft/item/ItemGroups INVENTORY Lnet/minecraft/registry/RegistryKey; -accessible method net/minecraft/block/AbstractBlock onStateReplaced (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V +accessible method net/minecraft/block/AbstractBlock onStateReplaced (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Z)V accessible class net/minecraft/screen/ScreenHandlerType$Factory accessible method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V -extendable method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V \ No newline at end of file +extendable method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V + +accessible class net/minecraft/datafixer/fix/ItemStackComponentizationFix$StackData \ No newline at end of file From dc30eb380b45abf22f83b62f626ba5ab753f2449 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 31 Aug 2024 19:41:16 +0900 Subject: [PATCH 361/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index e4530718c..41119228c 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.5 +mod_version=2.3.6 maven_group=net.pitan76 \ No newline at end of file From f6ed2e6cd0e64b89b24ab0ef933ff4775ef8f31f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 1 Sep 2024 18:12:10 +0900 Subject: [PATCH 362/622] Fix NeoForge --- .../pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index b7569bead..5bef727f3 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -1,15 +1,12 @@ package net.pitan76.mcpitanlib.neoforge; +import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.pitan76.mcpitanlib.MCPitanLib; @Mod(MCPitanLib.MOD_ID) public class MCPitanLibNeoForge { - public MCPitanLibNeoForge() { - //EventBuses.registerModEventBus(MCPitanLib.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); + public MCPitanLibNeoForge(ModContainer modContainer) { MCPitanLib.init(); - - //if (Platform.getEnv().isClient()) - // FMLJavaModLoadingContext.get().getModEventBus().addListener(MCPitanLibNeoForgeClient::clientInit); } } \ No newline at end of file From b82ca752bea2e33b2397fb2c67e2050e3c83abf4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 1 Sep 2024 20:27:17 +0900 Subject: [PATCH 363/622] add APIs --- .../mcpitanlib/api/CommonModInitializer.java | 66 ++++++++++++++++++ .../api/client/SimpleHandledScreen.java | 25 +++++++ .../fabric/ExtendModInitializer.java | 68 +++++++++++++++++++ info.properties | 2 +- 4 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/CommonModInitializer.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/fabric/ExtendModInitializer.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/CommonModInitializer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/CommonModInitializer.java new file mode 100644 index 000000000..148772679 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/CommonModInitializer.java @@ -0,0 +1,66 @@ +package net.pitan76.mcpitanlib.api; + +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; +import net.pitan76.mcpitanlib.api.util.Logger; + +public abstract class CommonModInitializer { + + public final String MOD_ID; + public final String MOD_NAME; + + public final CompatRegistryV2 registry; + public final Logger logger; + + public CommonModInitializer() { + this.MOD_ID = getId(); + this.MOD_NAME = getName(); + + this.registry = CompatRegistryV2.create(MOD_ID); + this.logger = new Logger(MOD_ID); + + logger.initializeMessage(); + init(); + registry.allRegister(); + } + + public abstract void init(); + + public abstract String getId(); + + public String getName() { + return getId(); + } + + + // Utilities + public Identifier id(String path) { + return IdentifierUtil.id(MOD_ID, path); + } + + public CompatIdentifier compatId(String path) { + return CompatIdentifier.of(MOD_ID, path); + } + + public void info(String message) { + logger.info(message); + } + + public void warn(String message) { + logger.warn(message); + } + + public void error(String message) { + logger.error(message); + } + + public void debug(String message) { + logger.debug(message); + } + + public void trace(String message) { + logger.trace(message); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 0f16ebc78..f6f7d4b9d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -235,4 +235,29 @@ public void removed() { public Identifier getBackgroundTexture() { return null; } + + public void setTitleX(int x) { + this.titleX = x; + } + + public void setTitleY(int y) { + this.titleY = y; + } + + public void setTitlePos(int x, int y) { + setTitleX(x); + setTitleY(y); + } + + public void setTitleXCenter() { + setTitleX(width / 2 - textRenderer.getWidth(title) / 2); + } + + public int getTitleX() { + return titleX; + } + + public int getTitleY() { + return titleY; + } } diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/ExtendModInitializer.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/ExtendModInitializer.java new file mode 100644 index 000000000..e0244894c --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/ExtendModInitializer.java @@ -0,0 +1,68 @@ +package net.pitan76.mcpitanlib.fabric; + +import net.fabricmc.api.ModInitializer; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; +import net.pitan76.mcpitanlib.api.util.Logger; + +public abstract class ExtendModInitializer implements ModInitializer { + + public String MOD_ID; + public String MOD_NAME; + + public CompatRegistryV2 registry; + public Logger logger; + + @Override + public void onInitialize() { + this.MOD_ID = getId(); + this.MOD_NAME = getName(); + + this.registry = CompatRegistryV2.create(MOD_ID); + this.logger = new Logger(MOD_ID); + + logger.initializeMessage(); + init(); + registry.allRegister(); + } + + public abstract void init(); + + public abstract String getId(); + + public String getName() { + return getId(); + } + + + // Utilities + public Identifier id(String path) { + return IdentifierUtil.id(MOD_ID, path); + } + + public CompatIdentifier compatId(String path) { + return CompatIdentifier.of(MOD_ID, path); + } + + public void info(String message) { + logger.info(message); + } + + public void warn(String message) { + logger.warn(message); + } + + public void error(String message) { + logger.error(message); + } + + public void debug(String message) { + logger.debug(message); + } + + public void trace(String message) { + logger.trace(message); + } +} diff --git a/info.properties b/info.properties index 41119228c..184dd8764 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.6 +mod_version=2.3.7 maven_group=net.pitan76 \ No newline at end of file From 5142504ff4b641dd8abb1bd7769872119e3e8768 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 2 Sep 2024 21:09:17 +0900 Subject: [PATCH 364/622] gradle --- forge/build.gradle | 4 ++-- info.properties | 2 +- neoforge/build.gradle | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/forge/build.gradle b/forge/build.gradle index c354c06f7..e19619471 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -40,8 +40,8 @@ dependencies { //modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") //compileOnly("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") - shadowCommon("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") - compileOnly("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") + //shadowCommon("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") + include("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") } processResources { diff --git a/info.properties b/info.properties index 184dd8764..a37ab492b 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.7 +mod_version=2.3.7-fix.1 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle index dc3c0efc1..a47cd7394 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -37,14 +37,11 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } - shadowCommon 'org.yaml:snakeyaml:2.0' - compileOnly 'org.yaml:snakeyaml:2.0' + include 'org.yaml:snakeyaml:2.0' - modApi("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") - compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") + include("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") - shadowCommon("net.pitan76:compatdatapacks76-neoforge:${rootProject.compatdatapacks76_version}") - compileOnly("net.pitan76:compatdatapacks76-neoforge:${rootProject.compatdatapacks76_version}") + include("net.pitan76:compatdatapacks76-neoforge:${rootProject.compatdatapacks76_version}") } processResources { From 10bdd1c250969c414eabab085a7b095bbe6baed4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 2 Sep 2024 23:04:35 +0900 Subject: [PATCH 365/622] Add APIs --- .../mcpitanlib/api/block/ExtendBlock.java | 12 ++++- .../api/block/ExtendBlockProvider.java | 5 ++ .../api/client/CompatInventoryScreen.java | 21 ++++++++ .../client/registry/CompatRegistryClient.java | 7 +++ .../api/enchantment/CompatEnchantment.java | 3 +- .../event/block/CanPathfindThroughArgs.java | 50 +++++++++++++++++++ .../api/item/CompatibleItemSettings.java | 9 ++++ .../mcpitanlib/api/util/EnchantmentUtil.java | 28 +++++++++++ .../mcpitanlib/api/util/FluidStateUtil.java | 20 ++++++++ .../mcpitanlib/api/util/InventoryUtil.java | 5 ++ .../mcpitanlib/api/util/ItemStackUtil.java | 16 ++++++ .../pitan76/mcpitanlib/api/util/SlotUtil.java | 21 ++++++++ .../mcpitanlib/mixin/AbstractBlockMixin.java | 13 +++++ .../fabric/CompatRegistryClientImpl.java | 14 ++++++ info.properties | 2 +- .../neoforge/CompatRegistryClientImpl.java | 23 +++++++++ 16 files changed, 246 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/CompatInventoryScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CanPathfindThroughArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 0bcf39ba6..d21689cf7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemPlacementContext; @@ -17,7 +18,6 @@ import net.minecraft.state.StateManager; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; @@ -275,4 +275,14 @@ public void appendTooltip(ItemStack stack, Item.TooltipContext context, List> void registerScreen(ScreenHandlerType type, ScreenFactory factory) { + registerScreen(MCPitanLib.MOD_ID, type, factory); + } + + @ExpectPlatform + public static > void registerScreen(String modId, ScreenHandlerType type, ScreenFactory factory) { MenuRegistry.registerScreenFactory(type, factory::create); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java index 949dbe1b5..d20d4a2b4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java @@ -46,7 +46,8 @@ public boolean equals(Object obj) { return false; } - protected RegistryEntry getEntry(@Nullable World world) { + @Deprecated + public RegistryEntry getEntry(@Nullable World world) { Optional> optionalEntry; if (world == null) { optionalEntry = BuiltinRegistries.createWrapperLookup().createRegistryLookup() diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CanPathfindThroughArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CanPathfindThroughArgs.java new file mode 100644 index 000000000..eb92b3f7f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/CanPathfindThroughArgs.java @@ -0,0 +1,50 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.fluid.FluidState; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.FluidStateUtil; + +public class CanPathfindThroughArgs extends BaseEvent { + public BlockState state; + public NavigationType type; + + public CanPathfindThroughArgs(BlockState state, NavigationType type) { + this.state = state; + + this.type = type; + } + + public BlockState getState() { + return state; + } + + public NavigationType getType() { + return type; + } + + public FluidState getFluidState() { + return state.getFluidState(); + } + + public boolean isWaterNavigationType() { + return type == NavigationType.WATER; + } + + public boolean isAirNavigationType() { + return type == NavigationType.AIR; + } + + public boolean isLandNavigationType() { + return type == NavigationType.LAND; + } + + public boolean isWaterState() { + return FluidStateUtil.isWater(getFluidState()); + } + + public boolean isLavaState() { + return FluidStateUtil.isLava(getFluidState()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index 75cfd65ad..4fb494a9b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; import java.util.function.Supplier; @@ -82,4 +83,12 @@ public ExtendSettings build() { } return settings; } + + public CompatibleItemSettings addGroup(ItemGroup itemGroup, CompatIdentifier identifier) { + return addGroup(itemGroup, identifier.toMinecraft()); + } + + public CompatibleItemSettings addGroup(Supplier itemGroup, CompatIdentifier identifier) { + return addGroup(itemGroup, identifier.toMinecraft()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java index bf9afb248..5f8fa9cfb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.component.type.ItemEnchantmentsComponent; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; @@ -11,7 +12,9 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class EnchantmentUtil { public static CompatEnchantment getEnchantment(Identifier identifier) { @@ -46,4 +49,29 @@ public static List getEnchantments(ItemStack stack) { return enchantments; } + + public static void hasEnchantment(ItemStack stack) { + EnchantmentHelper.hasEnchantments(stack); + } + + public static Map getEnchantment(ItemStack stack, @Nullable World world) { + Map enchantments = new HashMap<>(); + + List enchantmentList = getEnchantments(stack); + enchantmentList.forEach((enchantment) -> { + enchantments.put(enchantment, getLevel(enchantment, stack, world)); + }); + + return enchantments; + } + + public static void setEnchantment(ItemStack stack, Map enchantments, @Nullable World world) { + ItemEnchantmentsComponent.Builder builder = new ItemEnchantmentsComponent.Builder(ItemEnchantmentsComponent.DEFAULT); + + enchantments.forEach((compatEnchantment, integer) -> { + builder.add(compatEnchantment.getEntry(world), integer); + }); + + EnchantmentHelper.set(stack, builder.build()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java new file mode 100644 index 000000000..3f00687cb --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java @@ -0,0 +1,20 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.BlockState; +import net.minecraft.fluid.FluidState; +import net.minecraft.registry.tag.FluidTags; + +public class FluidStateUtil { + public static boolean isWater(FluidState state) { + return state.isIn(FluidTags.WATER); + } + + public static boolean isLava(FluidState state) { + return state.isIn(FluidTags.LAVA); + } + + @Deprecated + public static FluidState getFluidState(BlockState state) { + return state.getFluidState(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java index b2fb0eb7e..89c059e68 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.inventory.Inventories; +import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.util.collection.DefaultedList; @@ -89,4 +90,8 @@ public static void readNbt(World world, NbtCompound nbt, DefaultedList entity.sendEquipmentBreakStatus(item, EquipmentSlot.MAINHAND)); } + + public static ItemStack empty() { + return ItemStack.EMPTY; + } + + public static ItemStack create(Item item) { + return new ItemStack(item); + } + + public static ItemStack create(Item item, int count) { + return new ItemStack(item, count); + } + + public static boolean isEmpty(ItemStack stack) { + return stack.isEmpty(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java index 8a2826b73..23a65c55c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java @@ -2,6 +2,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; +import net.pitan76.mcpitanlib.api.entity.Player; public class SlotUtil { public static void setStack(Slot slot, ItemStack stack) { @@ -15,4 +16,24 @@ public static ItemStack getStack(Slot slot) { public static void takeStack(Slot slot, int amount) { slot.takeStack(amount); } + + public static boolean hasStack(Slot slot) { + return slot.hasStack(); + } + + public static void markDirty(Slot slot) { + slot.markDirty(); + } + + public static boolean canInsert(Slot slot, ItemStack stack) { + return slot.canInsert(stack); + } + + public static boolean canTakeItems(Slot slot) { + return slot.canTakeItems(null); + } + + public static void onTakeItem(Slot slot, Player player, ItemStack stack) { + slot.onTakeItem(player.getEntity(), stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java index d369db3a3..947eb2aa1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -3,6 +3,7 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; +import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContextParameterSet; @@ -106,4 +107,16 @@ public class AbstractBlockMixin { cir.setReturnValue(returnValue); } } + + @Inject(method = "canPathfindThrough", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_canPathfindThrough(BlockState state, NavigationType type, CallbackInfoReturnable cir) { + if (this instanceof ExtendBlockProvider) { + ExtendBlockProvider provider = (ExtendBlockProvider) this; + Options options = new Options(); + Boolean returnValue = provider.canPathfindThrough(new CanPathfindThroughArgs(state, type), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + } diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java new file mode 100644 index 000000000..0b11d5c38 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.client.registry.fabric; + +import dev.architectury.registry.menu.MenuRegistry; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; + +public class CompatRegistryClientImpl { + public static > void registerScreen(String modId, ScreenHandlerType type, CompatRegistryClient.ScreenFactory factory) { + MenuRegistry.registerScreenFactory(type, factory::create); + } +} diff --git a/info.properties b/info.properties index a37ab492b..a07d156e3 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.7-fix.1 +mod_version=2.3.8 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java new file mode 100644 index 000000000..acc00a782 --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.client.registry.neoforge; + +import dev.architectury.platform.hooks.EventBusesHooks; +import dev.architectury.registry.menu.MenuRegistry; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; +import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; + +import java.util.Objects; + +public class CompatRegistryClientImpl { + public static > void registerScreen(String modId, ScreenHandlerType type, CompatRegistryClient.ScreenFactory factory) { + EventBusesHooks.whenAvailable(modId, (bus) -> { + bus.addListener(RegisterMenuScreensEvent.class, (event) -> { + Objects.requireNonNull(factory); + event.register(type, factory::create); + }); + }); + } +} From bc6ce3231038461a9d1685b4368162a6ef1c9bae Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 2 Sep 2024 23:20:30 +0900 Subject: [PATCH 366/622] fix --- .../net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java | 4 ++-- forge/build.gradle | 6 ++---- neoforge/build.gradle | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java index 5f8fa9cfb..7dfd155fa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java @@ -50,8 +50,8 @@ public static List getEnchantments(ItemStack stack) { return enchantments; } - public static void hasEnchantment(ItemStack stack) { - EnchantmentHelper.hasEnchantments(stack); + public static boolean hasEnchantment(ItemStack stack) { + return EnchantmentHelper.hasEnchantments(stack); } public static Map getEnchantment(ItemStack stack, @Nullable World world) { diff --git a/forge/build.gradle b/forge/build.gradle index e19619471..29b53836e 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -35,12 +35,10 @@ dependencies { shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } shadowCommon 'org.yaml:snakeyaml:2.0' - compileOnly 'org.yaml:snakeyaml:2.0' + include 'org.yaml:snakeyaml:2.0' - //modApi("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") - //compileOnly("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") + include("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") - //shadowCommon("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") include("net.pitan76:compatdatapacks76-forge:${rootProject.compatdatapacks76_version}") } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index a47cd7394..44007e711 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -37,6 +37,7 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } + shadowCommon 'org.yaml:snakeyaml:2.0' include 'org.yaml:snakeyaml:2.0' include("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") From de5a2401615d1328f99a378a02ae2198ef29f92e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 3 Sep 2024 01:49:24 +0900 Subject: [PATCH 367/622] fix --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index a07d156e3..b3c0a5e27 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.8 +mod_version=2.3.8-fix.1 maven_group=net.pitan76 \ No newline at end of file From b356cb9fee49521e628da302e53fc20ea46c93e5 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 3 Sep 2024 01:49:31 +0900 Subject: [PATCH 368/622] fix --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index b3c0a5e27..a07d156e3 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.8-fix.1 +mod_version=2.3.8 maven_group=net.pitan76 \ No newline at end of file From a0314b9889ada5457a274122cb7a2917a3fedc92 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 3 Sep 2024 01:50:19 +0900 Subject: [PATCH 369/622] fix gradle --- forge/build.gradle | 2 +- info.properties | 2 +- neoforge/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge/build.gradle b/forge/build.gradle index 29b53836e..cd23560c2 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -35,7 +35,7 @@ dependencies { shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } shadowCommon 'org.yaml:snakeyaml:2.0' - include 'org.yaml:snakeyaml:2.0' + compileOnly 'org.yaml:snakeyaml:2.0' include("me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_config_version}") diff --git a/info.properties b/info.properties index a07d156e3..b3c0a5e27 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.8 +mod_version=2.3.8-fix.1 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 44007e711..4a7143fd0 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -38,7 +38,7 @@ dependencies { shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } shadowCommon 'org.yaml:snakeyaml:2.0' - include 'org.yaml:snakeyaml:2.0' + compileOnly 'org.yaml:snakeyaml:2.0' include("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") From 6ebdd4f1daa06d65f6a94fd11b54468ea75ce208 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:07:14 +0900 Subject: [PATCH 370/622] fix --- .../pitan76/mcpitanlib/api/network/ClientNetworking.java | 2 +- .../pitan76/mcpitanlib/api/network/ServerNetworking.java | 8 ++++---- info.properties | 2 +- .../registry/neoforge/CompatRegistryClientImpl.java | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index 02e247c03..ec7abe7c4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -24,7 +24,7 @@ public static void send(Identifier identifier, PacketByteBuf buf) { if (!C2S_TYPE.containsKey(identifier)) { CustomPayload.Id type = new CustomPayload.Id<>(identifier); C2S_TYPE.put(identifier, type); - registerC2SType(type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), List.of()); + //registerC2SType(type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), List.of()); } CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(C2S_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToServer(payload); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index 6d45691fe..d1a3df37d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -23,8 +23,8 @@ public static void send(ServerPlayerEntity player, Identifier identifier, Packet CustomPayload.Id type = new CustomPayload.Id<>(identifier); S2C_TYPE.put(identifier, type); - if (!NetworkAggregator.S2C_CODECS.containsKey(type)) - NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); + //if (!NetworkAggregator.S2C_CODECS.containsKey(type)) + // NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); } CustomPayload payload = new BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); @@ -36,8 +36,8 @@ public static void send(Iterable players, Identifier identif CustomPayload.Id type = new CustomPayload.Id<>(identifier); S2C_TYPE.put(identifier, type); - if (!NetworkAggregator.S2C_CODECS.containsKey(type)) - NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); + //if (!NetworkAggregator.S2C_CODECS.containsKey(type)) + // NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); } CustomPayload payload = new BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); NetworkManager.sendToPlayers(players, payload); diff --git a/info.properties b/info.properties index b3c0a5e27..b821dc772 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.8-fix.1 +mod_version=2.3.8-fix.2 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java index acc00a782..d57dd6a2b 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java @@ -1,7 +1,6 @@ package net.pitan76.mcpitanlib.api.client.registry.neoforge; import dev.architectury.platform.hooks.EventBusesHooks; -import dev.architectury.registry.menu.MenuRegistry; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; import net.minecraft.screen.ScreenHandler; From 8b80996f9498d4d7d515141431c979e3e7aa0aca Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 6 Sep 2024 15:39:22 +0900 Subject: [PATCH 371/622] update compatdatapacks --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1ab523aa1..377c84a69 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ neoforge_version=21.0.42-beta cloth_config_version=15.0.127 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.8.210 +compatdatapacks76_version=1.0.9.210 fabricEnabled=true forgeEnabled=false From ef44b2b1a819cbcae07a2cb40423cebe4133487d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 6 Sep 2024 18:48:35 +0900 Subject: [PATCH 372/622] add APIs --- .../mcpitanlib/api/block/ExtendBlock.java | 22 +++ .../pitan76/mcpitanlib/api/entity/Player.java | 47 ++++++ .../api/entity/effect/CompatStatusEffect.java | 63 ++++++++ .../effect/CompatStatusEffectInstance.java | 74 ++++++++++ .../api/event/block/BlockBreakStartEvent.java | 56 +++++++ .../api/event/block/EntityCollisionEvent.java | 83 +++++++++++ .../api/event/block/PickStackEvent.java | 14 ++ .../event/item/ItemAppendTooltipEvent.java | 6 + .../mcpitanlib/api/event/nbt/NbtRWArgs.java | 23 ++- .../mcpitanlib/api/event/nbt/ReadNbtArgs.java | 5 + .../api/event/nbt/WriteNbtArgs.java | 5 + .../api/item/CompatFoodComponent.java | 129 +++++++++++++++++ .../api/network/v2/ClientNetworking.java | 19 +++ .../api/network/v2/ServerNetworking.java | 55 +++++++ .../network/v2/args/ClientReceiveEvent.java | 36 +++++ .../network/v2/args/ServerReceiveEvent.java | 36 +++++ .../api/registry/CompatRegistryLookup.java | 24 +++ .../api/util/BlockEntityDataUtil.java | 44 ++++++ .../mcpitanlib/api/util/BlockEntityUtil.java | 61 ++++++++ .../mcpitanlib/api/util/BlockViewUtil.java | 24 +++ .../mcpitanlib/api/util/EnchantmentUtil.java | 5 + .../mcpitanlib/api/util/InventoryUtil.java | 13 ++ .../mcpitanlib/api/util/ItemStackUtil.java | 9 ++ .../pitan76/mcpitanlib/api/util/Logger.java | 41 +++++- .../mcpitanlib/api/util/PropertyUtil.java | 137 ++++++++++++++++++ .../api/util/RegistryLookupUtil.java | 35 +++++ .../api/util/SimpleInventoryUtil.java | 20 +++ .../mcpitanlib/api/util/SoundEventUtil.java | 8 + .../mcpitanlib/api/util/StatusEffectUtil.java | 27 ++++ .../mcpitanlib/api/util/ToolMaterialUtil.java | 15 ++ .../mcpitanlib/api/util/VoxelShapeUtil.java | 3 + .../mcpitanlib/api/util/WorldUtil.java | 4 + .../api/util/entity/ItemEntityUtil.java | 29 ++++ .../api/util/v2/CustomNameUtil.java | 50 +++++++ info.properties | 2 +- 35 files changed, 1214 insertions(+), 10 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffectInstance.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ServerNetworking.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockViewUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/StatusEffectUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/CustomNameUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index d21689cf7..636b11c10 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -3,6 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; +import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.player.PlayerEntity; @@ -25,6 +26,7 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; +import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; @@ -285,4 +287,24 @@ public boolean canPathfindThrough(BlockState state, NavigationType type) { public boolean canPathfindThrough(CanPathfindThroughArgs args) { return super.canPathfindThrough(args.state, args.type); } + + @Deprecated + @Override + public void onEntityCollision(BlockState state, World world, BlockPos pos, Entity entity) { + onEntityCollision(new EntityCollisionEvent(state, world, pos, entity)); + } + + public void onEntityCollision(EntityCollisionEvent e) { + super.onEntityCollision(e.state, e.world, e.pos, e.entity); + } + + @Deprecated + @Override + public void onBlockBreakStart(BlockState state, World world, BlockPos pos, PlayerEntity player) { + onBlockBreakStart(new BlockBreakStartEvent(state, world, pos, new Player(player))); + } + + public void onBlockBreakStart(BlockBreakStartEvent e) { + super.onBlockBreakStart(e.state, e.world, e.pos, e.player.getPlayerEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 668796869..8cc9ed2bf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -19,15 +19,19 @@ import net.minecraft.stat.StatType; import net.minecraft.text.Text; import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; +import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; import net.pitan76.mcpitanlib.core.player.ItemCooldown; +import java.util.Optional; import java.util.OptionalInt; import java.util.UUID; import java.util.function.Consumer; @@ -172,6 +176,14 @@ public boolean isCreative() { return getAbilities().creativeMode; } + public boolean isFlying() { + return getAbilities().flying; + } + + public boolean isInvulnerable() { + return getAbilities().invulnerable; + } + public World getWorld() { return getEntity().getWorld(); } @@ -277,6 +289,14 @@ public void incrementStat(StatType type, T object) { getEntity().incrementStat(type.getOrCreateStat(object)); } + public void incrementStat(Identifier id) { + getEntity().incrementStat(id); + } + + public void incrementStat(CompatIdentifier id) { + getEntity().incrementStat(id.toMinecraft()); + } + public void teleport(double x, double y, double z) { getEntity().teleport(x, y, z, false); } @@ -292,4 +312,31 @@ public ItemStack getOffHandStack() { public Direction getHorizontalFacing() { return getEntity().getHorizontalFacing(); } + + public void eatFood(World world, ItemStack stack, CompatFoodComponent foodComponentBuilder) { + getEntity().eatFood(world, stack, foodComponentBuilder.build()); + } + + public double getX() { + return getEntity().getX(); + } + + public double getY() { + return getEntity().getY(); + } + + public double getZ() { + return getEntity().getZ(); + } + + public boolean isServerPlayer() { + return getEntity() instanceof ServerPlayerEntity; + } + + public Optional getServerPlayer() { + if (isServerPlayer()) + return Optional.of((ServerPlayerEntity) getEntity()); + + return Optional.empty(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java new file mode 100644 index 000000000..a8e9d4a57 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java @@ -0,0 +1,63 @@ +package net.pitan76.mcpitanlib.api.entity.effect; + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.registry.BuiltinRegistries; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.Identifier; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.StatusEffectUtil; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; + +public class CompatStatusEffect { + private final RegistryKey registryKey; + + @Deprecated + public CompatStatusEffect(RegistryKey registryKey) { + this.registryKey = registryKey; + } + + public CompatStatusEffect of(Identifier identifier) { + return StatusEffectUtil.getStatusEffect(identifier); + } + + public Identifier getId() { + return registryKey.getRegistry(); + } + + @Deprecated + public RegistryKey getRegistryKey() { + return registryKey; + } + + public String toString() { + return getId().toString(); + } + + public boolean equals(Object obj) { + if (obj instanceof CompatStatusEffect) { + return ((CompatStatusEffect) obj).getId().equals(getId()); + } + return false; + } + + @Deprecated + public RegistryEntry getEntry(@Nullable World world) { + Optional> optionalEntry; + if (world == null) { + optionalEntry = BuiltinRegistries.createWrapperLookup().createRegistryLookup() + .getOptionalEntry(RegistryKeys.STATUS_EFFECT, registryKey); + } else { + optionalEntry = world.getRegistryManager().get(RegistryKeys.STATUS_EFFECT).getEntry(registryKey); + } + + return optionalEntry.orElseThrow(); + } + + public StatusEffect getStatusEffect(@Nullable World world) { + return getEntry(world).value(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffectInstance.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffectInstance.java new file mode 100644 index 000000000..fe23894f3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffectInstance.java @@ -0,0 +1,74 @@ +package net.pitan76.mcpitanlib.api.entity.effect; + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.registry.RegistryKey; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; + +public class CompatStatusEffectInstance { + private final StatusEffectInstance instance; + + @Deprecated + public CompatStatusEffectInstance(StatusEffectInstance instance) { + this.instance = instance; + } + + public StatusEffectInstance getInstance() { + return instance; + } + + public Optional getCompatStatusEffect() { + Optional> optional = instance.getEffectType().getKey(); + return optional.map(CompatStatusEffect::new); + } + + public CompatStatusEffectInstance(CompatStatusEffect effect) { + this(effect, 0, 0); + } + + public CompatStatusEffectInstance(CompatStatusEffect effect, int duration) { + this(effect, duration, 0); + } + + public CompatStatusEffectInstance(CompatStatusEffect effect, int duration, int amplifier) { + this(effect, duration, amplifier, false, true); + } + + public CompatStatusEffectInstance(CompatStatusEffect effect, int duration, int amplifier, boolean ambient, boolean visible) { + this(effect, duration, amplifier, ambient, visible, visible); + } + + public CompatStatusEffectInstance(CompatStatusEffect effect, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon) { + this(effect, duration, amplifier, ambient, showParticles, showIcon, null); + } + + public CompatStatusEffectInstance(CompatStatusEffect effect, int duration, int amplifier, boolean ambient, boolean showParticles, boolean showIcon, @Nullable StatusEffectInstance hiddenEffect) { + this.instance = new StatusEffectInstance(effect.getEntry(null), duration, amplifier, ambient, showParticles, showIcon, hiddenEffect); + } + + public int getDuration() { + return instance.getDuration(); + } + + public int getAmplifier() { + return instance.getAmplifier(); + } + + public boolean isAmbient() { + return instance.isAmbient(); + } + + public boolean showParticles() { + return instance.shouldShowParticles(); + } + + public boolean showIcon() { + return instance.shouldShowIcon(); + } + + public boolean isInfinite() { + return instance.isInfinite(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java new file mode 100644 index 000000000..a98b2db09 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java @@ -0,0 +1,56 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +public class BlockBreakStartEvent extends BaseEvent { + + public BlockState state; + public World world; + public BlockPos pos; + public Player player; + + public BlockBreakStartEvent(BlockState state, World world, BlockPos pos, Player player) { + this.state = state; + this.world = world; + this.pos = pos; + this.player = player; + } + + public boolean isClient() { + return WorldUtil.isClient(world); + } + + public BlockState getState() { + return state; + } + + public World getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public Player getPlayer() { + return player; + } + + public BlockPos getPlayerPos() { + return player.getBlockPos(); + } + + public ItemStack getPlayerMainHandStack() { + return player.getMainHandStack(); + } + + public ItemStack getPlayerOffHandStack() { + return player.getOffHandStack(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java new file mode 100644 index 000000000..298685fa1 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java @@ -0,0 +1,83 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.SoundEventUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +import java.util.Optional; + +public class EntityCollisionEvent extends BaseEvent { + + public BlockState state; + public World world; + public BlockPos pos; + public Entity entity; + + public EntityCollisionEvent(BlockState state, World world, BlockPos pos, Entity entity) { + this.state = state; + this.world = world; + this.pos = pos; + this.entity = entity; + } + + public boolean isClient() { + return WorldUtil.isClient(world); + } + + public BlockPos getEntityPos() { + return entity.getBlockPos(); + } + + public BlockPos getBlockPos() { + return pos; + } + + public BlockState getState() { + return state; + } + + public Entity getEntity() { + return entity; + } + + public World getWorld() { + return world; + } + + public void playSound(SoundEvent event, SoundCategory category, float volume, float pitch) { + WorldUtil.playSound(world, null, entity.getBlockPos(), event, category, volume, pitch); + } + + public void playSound(SoundEvent event, float volume, float pitch) { + playSound(event, SoundCategory.BLOCKS, volume, pitch); + } + + public void playSound(SoundEvent event) { + playSound(event, 1f, 1f); + } + + public void playSound(SoundEvent event, SoundCategory category) { + playSound(event, category, 1f, 1f); + } + + public void playSound(CompatIdentifier id, SoundCategory category, float volume, float pitch) { + playSound(SoundEventUtil.getSoundEvent(id), category, volume, pitch); + } + + public boolean hasPlayerEntity() { + return entity instanceof PlayerEntity; + } + + public Optional getPlayerEntity() { + if (!hasPlayerEntity()) return Optional.empty(); + return Optional.of((PlayerEntity) entity); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java index 8be82972f..1eb8b355c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java @@ -61,4 +61,18 @@ public BlockEntity getBlockEntity() { return worldView.getBlockEntity(pos); return null; } + + public boolean isClient() { + if (blockView != null) + return getBlockEntity().getWorld().isClient(); + if (worldView != null) + return worldView.isClient(); + + try { + net.minecraft.client.MinecraftClient.getInstance(); + return true; + } catch (Error e) { + return false; + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java index 7169ce2f1..d2ce8bd6d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java @@ -6,6 +6,8 @@ import net.minecraft.text.Text; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.RegistryLookupUtil; import org.jetbrains.annotations.Nullable; import java.util.List; @@ -61,4 +63,8 @@ public boolean isCreative() { public boolean isAdvanced() { return type.isAdvanced(); } + + public CompatRegistryLookup getRegistryLookup() { + return RegistryLookupUtil.getRegistryLookup(this); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java index f6b00513d..31df3703e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java @@ -2,27 +2,40 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; public class NbtRWArgs { public NbtCompound nbt; - private final RegistryWrapper.WrapperLookup wrapperLookup; + public CompatRegistryLookup registryLookup; + + public NbtRWArgs(NbtCompound nbt, CompatRegistryLookup registryLookup) { + this.nbt = nbt; + this.registryLookup = registryLookup; + } @Deprecated public NbtRWArgs(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup) { - this.nbt = nbt; - this.wrapperLookup = wrapperLookup; + this(nbt, new CompatRegistryLookup(wrapperLookup)); } public NbtRWArgs(NbtCompound nbt) { - this(nbt, null); + this(nbt, (CompatRegistryLookup) null); } public NbtCompound getNbt() { return nbt; } + public CompatRegistryLookup getRegistryLookup() { + return registryLookup; + } + + public boolean hasRegistryLookup() { + return registryLookup != null; + } + @Deprecated public RegistryWrapper.WrapperLookup getWrapperLookup() { - return wrapperLookup; + return registryLookup.getRegistryLookup(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java index 857887850..54062abab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java @@ -2,6 +2,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; public class ReadNbtArgs extends NbtRWArgs { @@ -13,4 +14,8 @@ public ReadNbtArgs(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup) public ReadNbtArgs(NbtCompound nbt) { super(nbt); } + + public ReadNbtArgs(NbtCompound nbt, CompatRegistryLookup registryLookup) { + super(nbt, registryLookup); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java index 71bc990b6..9a32af93d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java @@ -2,6 +2,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.registry.RegistryWrapper; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; public class WriteNbtArgs extends NbtRWArgs { @@ -10,6 +11,10 @@ public WriteNbtArgs(NbtCompound nbt, RegistryWrapper.WrapperLookup wrapperLookup super(nbt, wrapperLookup); } + public WriteNbtArgs(NbtCompound nbt, CompatRegistryLookup registryLookup) { + super(nbt, registryLookup); + } + public WriteNbtArgs(NbtCompound nbt) { super(nbt); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java new file mode 100644 index 000000000..cc6115cad --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java @@ -0,0 +1,129 @@ +package net.pitan76.mcpitanlib.api.item; + +import com.google.common.collect.ImmutableList; +import com.mojang.datafixers.util.Pair; +import net.minecraft.component.type.FoodComponent; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffectInstance; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +public class CompatFoodComponent { + private int hunger; + private float saturation; + private boolean meat; + private boolean alwaysEdible; + private boolean snack; + private final List> statusEffects = new ArrayList<>(); + + private FoodComponent latestComponent = null; + + public static CompatFoodComponent create() { + return new CompatFoodComponent(); + } + + public CompatFoodComponent setHunger(int hunger) { + this.hunger = hunger; + return this; + } + + public CompatFoodComponent setSaturation(float saturation) { + this.saturation = saturation; + return this; + } + + public CompatFoodComponent setAlwaysEdible() { + this.alwaysEdible = true; + return this; + } + + public CompatFoodComponent setSnack() { + this.snack = true; + return this; + } + + public CompatFoodComponent setMeat() { + this.meat = true; + return this; + } + + @Deprecated + public CompatFoodComponent addStatusEffect(StatusEffectInstance effect, float chance) { + statusEffects.add(Pair.of(effect, chance)); + return this; + } + + public CompatFoodComponent addStatusEffect(CompatStatusEffectInstance instance, float chance) { + return addStatusEffect(instance.getInstance(), chance); + } + + public FoodComponent.Builder getVanillaBuilder() { + FoodComponent.Builder builder = new FoodComponent.Builder(); + builder.nutrition(hunger).saturationModifier(saturation); + if (alwaysEdible) builder.alwaysEdible(); + if (snack) builder.snack(); + //if (meat) builder.meat(); + for (Pair pair : statusEffects) { + builder.statusEffect(pair.getFirst(), pair.getSecond()); + } + return builder; + } + + public FoodComponent build() { + if (latestComponent != null) return latestComponent; + + float eatSeconds = 1.6f; + ImmutableList.Builder effects = ImmutableList.builder(); + effects.addAll(statusEffects.stream().map(pair -> new FoodComponent.StatusEffectEntry(pair.getFirst(), pair.getSecond())).iterator()); + if (snack) eatSeconds = 0.8f; + if (meat) eatSeconds = 1.6f; + + latestComponent = new FoodComponent(hunger, saturation, alwaysEdible, eatSeconds, Optional.empty(), effects.build()); + + return latestComponent; + } + + public FoodComponent vanillaBuild() { + if (latestComponent != null) return latestComponent; + + latestComponent = getVanillaBuilder().build(); + return latestComponent; + } + + // ---- + + public int getHunger() { + return hunger; + } + + public float getSaturation() { + return saturation; + } + + public boolean isMeat() { + return meat; + } + + public boolean isSnack() { + return snack; + } + + public boolean isAlwaysEdible() { + return alwaysEdible; + } + + @Deprecated + public List> getStatusEffects() { + return statusEffects; + } + + public List> getCompatStatusEffects() { + List> compatStatusEffects = new ArrayList<>(); + for (Pair pair : statusEffects) { + compatStatusEffects.add(Pair.of(new CompatStatusEffectInstance(pair.getFirst()), pair.getSecond())); + } + return compatStatusEffects; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java new file mode 100644 index 000000000..92c660eaf --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.network.v2; + +import net.minecraft.network.PacketByteBuf; +import net.pitan76.mcpitanlib.api.network.v2.args.ClientReceiveEvent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.function.Consumer; + +public class ClientNetworking { + public static void send(CompatIdentifier id, PacketByteBuf buf) { + net.pitan76.mcpitanlib.api.network.ClientNetworking.send(id.toMinecraft(), buf); + } + + public static void registerReceiver(CompatIdentifier id, Consumer consumer) { + net.pitan76.mcpitanlib.api.network.ClientNetworking.registerReceiver(id.toMinecraft(), (client, player, buf) -> { + consumer.accept(new ClientReceiveEvent(client, player, buf)); + }); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ServerNetworking.java new file mode 100644 index 000000000..9d855528c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ServerNetworking.java @@ -0,0 +1,55 @@ +package net.pitan76.mcpitanlib.api.network.v2; + +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.network.v2.args.ServerReceiveEvent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.function.Consumer; + +public class ServerNetworking { + public static void send(ServerPlayerEntity serverPlayerEntity, CompatIdentifier id, PacketByteBuf buf) { + net.pitan76.mcpitanlib.api.network.ServerNetworking.send(serverPlayerEntity, id.toMinecraft(), buf); + } + + public static void sendByServerPlayerEntity(Iterable players, CompatIdentifier id, PacketByteBuf buf) { + net.pitan76.mcpitanlib.api.network.ServerNetworking.send(players, id.toMinecraft(), buf); + } + + public static void send(Player player, CompatIdentifier id, PacketByteBuf buf) { + Optional optional = player.getServerPlayer(); + if (optional.isEmpty()) return; + + send(optional.get(), id, buf); + } + + public static void send(Iterable players, CompatIdentifier id, PacketByteBuf buf) { + List list = new ArrayList<>(); + for (Player player : players) { + Optional optional = player.getServerPlayer(); + optional.ifPresent(list::add); + } + + sendByServerPlayerEntity(list, id, buf); + } + + public static void sendAll(MinecraftServer server, CompatIdentifier id, PacketByteBuf buf) { + net.pitan76.mcpitanlib.api.network.ServerNetworking.sendAll(server, id.toMinecraft(), buf); + } + + public static void sendAll(World world, CompatIdentifier id, PacketByteBuf buf) { + sendAll(world.getServer(), id, buf); + } + + public static void registerReceiver(CompatIdentifier id, Consumer consumer) { + net.pitan76.mcpitanlib.api.network.ServerNetworking.registerReceiver(id.toMinecraft(), (server, player, buf) -> { + consumer.accept(new ServerReceiveEvent(server, player, buf)); + }); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java new file mode 100644 index 000000000..a2de5923e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java @@ -0,0 +1,36 @@ +package net.pitan76.mcpitanlib.api.network.v2.args; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.network.PacketByteBuf; +import net.pitan76.mcpitanlib.api.entity.Player; + +public class ClientReceiveEvent { + public MinecraftClient client; + public ClientPlayerEntity clientPlayer; + public Player player; + public PacketByteBuf buf; + + public ClientReceiveEvent(MinecraftClient client, ClientPlayerEntity player, PacketByteBuf buf) { + this.client = client; + this.clientPlayer = player; + this.player = new Player(player); + this.buf = buf; + } + + public ClientPlayerEntity getClientPlayer() { + return clientPlayer; + } + + public Player getPlayer() { + return player; + } + + public MinecraftClient getClient() { + return client; + } + + public PacketByteBuf getBuf() { + return buf; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java new file mode 100644 index 000000000..b1afedc0d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java @@ -0,0 +1,36 @@ +package net.pitan76.mcpitanlib.api.network.v2.args; + +import net.minecraft.network.PacketByteBuf; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; +import net.pitan76.mcpitanlib.api.entity.Player; + +public class ServerReceiveEvent { + public MinecraftServer server; + public ServerPlayerEntity serverPlayer; + public Player player; + public PacketByteBuf buf; + + public ServerReceiveEvent(MinecraftServer server, ServerPlayerEntity player, PacketByteBuf buf) { + this.server = server; + this.serverPlayer = player; + this.player = new Player(player); + this.buf = buf; + } + + public ServerPlayerEntity getServerPlayer() { + return serverPlayer; + } + + public Player getPlayer() { + return player; + } + + public MinecraftServer getServer() { + return server; + } + + public PacketByteBuf getBuf() { + return buf; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java new file mode 100644 index 000000000..943a3665e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java @@ -0,0 +1,24 @@ +package net.pitan76.mcpitanlib.api.registry; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.RegistryWrapper; +import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; + +public class CompatRegistryLookup { + + private final RegistryWrapper.WrapperLookup registryLookup; + + @Deprecated + public CompatRegistryLookup(RegistryWrapper.WrapperLookup registryLookup) { + this.registryLookup = registryLookup; + } + + @Deprecated + public RegistryWrapper.WrapperLookup getRegistryLookup() { + return registryLookup; + } + + public NbtRWArgs getNbtRWArgs(NbtCompound nbt) { + return new NbtRWArgs(nbt, registryLookup); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java new file mode 100644 index 000000000..be1bd580f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java @@ -0,0 +1,44 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.NbtComponent; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; + +public class BlockEntityDataUtil { + public static NbtCompound getBlockEntityNbt(ItemStack stack) { + if (!stack.contains(DataComponentTypes.BLOCK_ENTITY_DATA)) return NbtUtil.create(); + NbtComponent component = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA); + if (component == null) return NbtUtil.create(); + + NbtCompound nbt = component.copyNbt(); + if (nbt == null) return NbtUtil.create(); + return nbt; + } + + public static void setBlockEntityNbt(ItemStack stack, NbtCompound nbt) { + stack.set(DataComponentTypes.BLOCK_ENTITY_DATA, NbtComponent.of(nbt)); + } + + public static boolean hasBlockEntityNbt(ItemStack stack) { + return stack.contains(DataComponentTypes.BLOCK_ENTITY_DATA); + } + + public static void readCompatBlockEntityNbtFromStack(ItemStack stack, CompatBlockEntity blockEntity) { + NbtCompound nbt = getBlockEntityNbt(stack); + blockEntity.readNbt(new ReadNbtArgs(nbt)); + } + + public static void writeCompatBlockEntityNbtToStack(ItemStack stack, CompatBlockEntity blockEntity) { + NbtCompound nbt = getBlockEntityNbt(stack); + blockEntity.writeNbt(new WriteNbtArgs(nbt)); + setBlockEntityNbt(stack, nbt); + } + + public static void removeBlockEntityNbt(ItemStack stack) { + stack.remove(DataComponentTypes.BLOCK_ENTITY_DATA); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java new file mode 100644 index 000000000..e2347401b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -0,0 +1,61 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; + +public class BlockEntityUtil { + + public static BlockEntity getBlockEntity(World world, BlockPos pos) { + return WorldUtil.getBlockEntity(world, pos); + } + + public static NbtCompound getBlockEntityNbt(@Nullable World world, BlockEntity blockEntity) { + if (world == null) + world = getWorld(blockEntity); + if (world == null) + return NbtUtil.create(); + + return blockEntity.createNbt(world.getRegistryManager()); + } + + public static NbtCompound getBlockEntityNbt(BlockEntity blockEntity) { + return getBlockEntityNbt(null, blockEntity); + } + + public static World getWorld(BlockEntity blockEntity) { + return blockEntity.getWorld(); + } + + public static boolean hasWorld(BlockEntity blockEntity) { + return blockEntity.hasWorld(); + } + + public static BlockPos getPos(BlockEntity blockEntity) { + return blockEntity.getPos(); + } + + public static BlockState getCachedState(BlockEntity blockEntity) { + return blockEntity.getCachedState(); + } + + public static BlockState getBlockState(BlockEntity blockEntity) { + return getWorld(blockEntity).getBlockState(getPos(blockEntity)); + } + + public static Block getBlock(BlockEntity blockEntity) { + return getBlockState(blockEntity).getBlock(); + } + + public static void markRemoved(BlockEntity blockEntity) { + blockEntity.markRemoved(); + } + + public static void markDirty(BlockEntity blockEntity) { + blockEntity.markDirty(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockViewUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockViewUtil.java new file mode 100644 index 000000000..a95953baf --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockViewUtil.java @@ -0,0 +1,24 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; + +public class BlockViewUtil { + public static BlockState getBlockState(BlockView blockView, BlockPos pos) { + return blockView.getBlockState(pos); + } + + public static BlockEntity getBlockEntity(BlockView blockView, BlockPos pos) { + return blockView.getBlockEntity(pos); + } + + public static boolean hasBlockEntity(BlockView blockView, BlockPos pos) { + return getBlockEntity(blockView, pos) != null; + } + + public static boolean isAir(BlockView blockView, BlockPos pos) { + return getBlockState(blockView, pos).isAir(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java index 7dfd155fa..8f449872f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EnchantmentUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.ItemEnchantmentsComponent; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -74,4 +75,8 @@ public static void setEnchantment(ItemStack stack, Map inventory) { @@ -65,6 +66,18 @@ public static void readNbt(NbtRWArgs args, DefaultedList stacks) { readNbt(args, args.getNbt(), stacks); } + public static void readNbt(CompatRegistryLookup registryLookup, NbtCompound nbt, DefaultedList stacks) { + Inventories.readNbt(nbt, stacks, registryLookup.getRegistryLookup()); + } + + public static NbtCompound writeNbt(CompatRegistryLookup registryLookup, NbtCompound nbt, DefaultedList stacks, boolean setIfEmpty) { + return Inventories.writeNbt(nbt, stacks, setIfEmpty, registryLookup.getRegistryLookup()); + } + + public static NbtCompound writeNbt(CompatRegistryLookup registryLookup, NbtCompound nbt, DefaultedList stacks) { + return writeNbt(registryLookup, nbt, stacks, true); + } + // deprecated /** * @deprecated Use {@link #writeNbt(NbtRWArgs, DefaultedList)} instead diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 9c1a41791..3c1e63304 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -3,6 +3,7 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.network.ServerPlayerEntity; @@ -127,6 +128,14 @@ public static ItemStack create(Item item, int count) { return new ItemStack(item, count); } + public static ItemStack create(ItemConvertible item) { + return new ItemStack(item); + } + + public static ItemStack create(ItemConvertible item, int count) { + return new ItemStack(item, count); + } + public static boolean isEmpty(ItemStack stack) { return stack.isEmpty(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java index 4c3c8df7b..1309ddebd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java @@ -1,10 +1,28 @@ package net.pitan76.mcpitanlib.api.util; public class Logger { + public String name = ""; + + public boolean usingPrefix = true; + private final org.apache.logging.log4j.Logger logger; - public Logger(String modid) { - this.logger = LoggerUtil.getLogger(modid); + public Logger(String name) { + this.name = name; + this.logger = LoggerUtil.getLogger(name); + } + + public Logger() { + this.logger = LoggerUtil.getLogger(); + } + + public Logger(Class clazz) { + this.logger = LoggerUtil.getLogger(clazz); + } + + public Logger(String name, boolean usePrefix) { + this(name); + usePrefix(usePrefix); } public org.apache.logging.log4j.Logger getLogger() { @@ -38,10 +56,25 @@ public void error(Exception e) { } public void initializeMessage() { - info("Initializing..."); + info(prefix() + "Initializing..."); } public void initializedMessage() { - info("Initialized"); + info(prefix() + "Initialized"); + } + + public String prefix() { + if (name.isEmpty() || !isUsingPrefix()) + return ""; + + return "[" + name + "] "; + } + + public void usePrefix(boolean use) { + usingPrefix = use; + } + + public boolean isUsingPrefix() { + return usingPrefix; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java new file mode 100644 index 000000000..bb1d865f2 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java @@ -0,0 +1,137 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.BlockState; +import net.minecraft.state.property.*; +import net.minecraft.util.StringIdentifiable; +import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; + +public class PropertyUtil { + public static BooleanProperty createBooleanProperty(String name) { + return BooleanProperty.of(name); + } + + public static DirectionProperty createDirectionProperty(String name) { + return DirectionProperty.of(name); + } + + public static IntProperty createIntProperty(String name, int min, int max) { + return IntProperty.of(name, min, max); + } + + public static & StringIdentifiable> EnumProperty createEnumProperty(String name, Class type) { + return EnumProperty.of(name, type); + } + + public static BlockState with(BlockState state, BooleanProperty property, boolean value) { + return state.with(property, value); + } + + public static BlockState with(BlockState state, IntProperty property, int value) { + return state.with(property, value); + } + + public static BlockState with(BlockState state, DirectionProperty property, Direction value) { + return state.with(property, value); + } + + public static boolean get(BlockState state, BooleanProperty property) { + return state.get(property); + } + + public static int get(BlockState state, IntProperty property) { + return state.get(property); + } + + public static Direction get(BlockState state, DirectionProperty property) { + return state.get(property); + } + + public static Direction getFacing(BlockState state) { + return state.get(facing()); + } + + public static Direction getHorizontalFacing(BlockState state) { + return state.get(horizontalFacing()); + } + + public static int getPower(BlockState state) { + return state.get(power()); + } + + public static boolean isPowered(BlockState state) { + return state.get(powered()); + } + + public static void append(AppendPropertiesArgs args, Property... properties) { + args.addProperty(properties); + } + + public static void appendFacing(AppendPropertiesArgs args) { + args.addProperty(facing()); + } + + public static void appendHorizontalFacing(AppendPropertiesArgs args) { + args.addProperty(horizontalFacing()); + } + + public static void appendPower(AppendPropertiesArgs args) { + args.addProperty(power()); + } + + public static void appendPowered(AppendPropertiesArgs args) { + args.addProperty(powered()); + } + + public static IntProperty power() { + return Properties.POWER; + } + + public static BooleanProperty powered() { + return Properties.POWERED; + } + + public static DirectionProperty facing() { + return Properties.FACING; + } + + public static DirectionProperty horizontalFacing() { + return Properties.HORIZONTAL_FACING; + } + + public static BooleanProperty lit() { + return Properties.LIT; + } + + public static BooleanProperty waterlogged() { + return Properties.WATERLOGGED; + } + + public static BooleanProperty attached() { + return Properties.ATTACHED; + } + + public static BooleanProperty hanging() { + return Properties.HANGING; + } + + public static BooleanProperty bottom() { + return Properties.BOTTOM; + } + + public static BooleanProperty conditional() { + return Properties.CONDITIONAL; + } + + public static BooleanProperty inWall() { + return Properties.IN_WALL; + } + + public static BooleanProperty open() { + return Properties.OPEN; + } + + public static BooleanProperty occupied() { + return Properties.OCCUPIED; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java new file mode 100644 index 000000000..16e0fe5e6 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.Entity; +import net.pitan76.mcpitanlib.api.entity.CompatEntity; +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; + +public class RegistryLookupUtil { + public static CompatRegistryLookup getRegistryLookup(ItemAppendTooltipEvent e) { + return new CompatRegistryLookup(e.context.getRegistryLookup()); + } + + public static CompatRegistryLookup getRegistryLookup(CompatEntity entity) { + return new CompatRegistryLookup(entity.getRegistryManager()); + } + + public static CompatRegistryLookup getRegistryLookup(Entity entity) { + return new CompatRegistryLookup(entity.getRegistryManager()); + } + + public static CompatRegistryLookup getRegistryLookup(CompatBlockEntity entity) { + return new CompatRegistryLookup(entity.getWorld().getRegistryManager()); + } + + public static CompatRegistryLookup getRegistryLookup(BlockEntity entity) { + return new CompatRegistryLookup(entity.getWorld().getRegistryManager()); + } + + public static CompatRegistryLookup getRegistryLookup(NbtRWArgs args) { + return args.getRegistryLookup(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java index d2a8ce4c2..de8392cc1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java @@ -8,4 +8,24 @@ public class SimpleInventoryUtil { public static DefaultedList getHeldStacks(SimpleInventory inventory) { return inventory.getHeldStacks(); } + + public static SimpleInventory create(int size) { + return InventoryUtil.createSimpleInventory(size); + } + + public static ItemStack getStack(SimpleInventory inventory, int slot) { + return inventory.getStack(slot); + } + + public static void setStack(SimpleInventory inventory, int slot, ItemStack stack) { + inventory.setStack(slot, stack); + } + + public static void clear(SimpleInventory inventory) { + inventory.clear(); + } + + public static int size(SimpleInventory inventory) { + return inventory.size(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java index dc0b47099..a6f367799 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java @@ -17,6 +17,14 @@ public static SoundEvent getSoundEvent(Identifier id) { return SoundEvent.of(id); } + public static CompatIdentifier getCompatId(SoundEvent soundEvent) { + return CompatIdentifier.fromMinecraft(getId(soundEvent)); + } + + public static SoundEvent getSoundEvent(CompatIdentifier id) { + return getSoundEvent(id.toMinecraft()); + } + public static List getAllSoundEvents() { return Registries.SOUND_EVENT.stream().collect(Collectors.toList()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StatusEffectUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StatusEffectUtil.java new file mode 100644 index 000000000..333f996f8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StatusEffectUtil.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.entity.effect.StatusEffect; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; + +public class StatusEffectUtil { + public static CompatStatusEffect getStatusEffect(Identifier identifier) { + RegistryKey registryKey = RegistryKey.of(RegistryKeys.STATUS_EFFECT, identifier); + return new CompatStatusEffect(registryKey); + } + + public static CompatStatusEffect getStatusEffect(CompatIdentifier identifier) { + return getStatusEffect(identifier.toMinecraft()); + } + + public static Identifier getId(CompatStatusEffect statusEffect) { + return statusEffect.getId(); + } + + public static CompatIdentifier getCompatId(CompatStatusEffect statusEffect) { + return CompatIdentifier.fromMinecraft(statusEffect.getId()); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java index 1a61aa75d..87571de96 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ToolMaterialUtil.java @@ -4,7 +4,22 @@ import net.pitan76.mcpitanlib.api.item.tool.CompatibleToolMaterial; public class ToolMaterialUtil { + // ミスでstatic化し忘れていたが、互換性のため保持しておく public CompatibleToolMaterial create(int miningLevel, int durability, float miningSpeed, float attackDamage, int enchantability, Ingredient repairIngredient) { + return create2(miningLevel, durability, miningSpeed, attackDamage, enchantability, repairIngredient); + } + + /** + * Create CompatibleToolMaterial + * @param miningLevel Mining Level + * @param durability Durability + * @param miningSpeed Mining Speed + * @param attackDamage Attack Damage + * @param enchantability Enchantability + * @param repairIngredient Repair Ingredient + * @return CompatibleToolMaterial + */ + public static CompatibleToolMaterial create2(int miningLevel, int durability, float miningSpeed, float attackDamage, int enchantability, Ingredient repairIngredient) { return new CompatibleToolMaterial() { @Override public int getCompatMiningLevel() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java index 8c2343406..837bb8b7f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java @@ -32,4 +32,7 @@ public static VoxelShape fullCube() { return VoxelShapes.fullCube(); } + public static VoxelShape blockCuboid(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + return VoxelShapes.cuboid(minX / 16.0, minY / 16.0, minZ / 16.0, maxX / 16.0, maxY / 16.0, maxZ / 16.0); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 021084f60..58217cb42 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -219,4 +219,8 @@ public static boolean removeBlock(World world, BlockPos pos, boolean move) { public static void addParticle(World world, ParticleEffect parameters, double x, double y, double z, double velocityX, double velocityY, double velocityZ) { world.addParticle(parameters, x, y, z, velocityX, velocityY, velocityZ); } + + public static boolean canSetBlock(World world, BlockPos pos) { + return world.canSetBlock(pos); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java new file mode 100644 index 000000000..2454910ab --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java @@ -0,0 +1,29 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.ItemEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class ItemEntityUtil { + public static ItemEntity create(World world, double x, double y, double z, ItemStack stack) { + return new ItemEntity(world, x, y, z, stack); + } + + public static ItemEntity create(World world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) { + ItemEntity itemEntity = create(world, x, y, z, stack); + setVelocity(itemEntity, velocityX, velocityY, velocityZ); + return itemEntity; + } + + public static void setVelocity(ItemEntity itemEntity, double velocityX, double velocityY, double velocityZ) { + itemEntity.setVelocity(velocityX, velocityY, velocityZ); + } + + public static void setPickupDelay(ItemEntity itemEntity, int pickupDelay) { + itemEntity.setPickupDelay(pickupDelay); + } + + public static void setToDefaultPickupDelay(ItemEntity itemEntity) { + itemEntity.setToDefaultPickupDelay(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/CustomNameUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/CustomNameUtil.java new file mode 100644 index 000000000..c24eb0df9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/CustomNameUtil.java @@ -0,0 +1,50 @@ +package net.pitan76.mcpitanlib.api.util.v2; + +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.text.TextComponent; +import net.pitan76.mcpitanlib.api.util.TextUtil; + +public class CustomNameUtil { + + public static void setCustomName(ItemStack stack, Text name) { + stack.set(DataComponentTypes.CUSTOM_NAME, name); + } + + public static void setCustomName(ItemStack stack, String name) { + setCustomNameFromString(stack, name); + } + + public static void setCustomNameFromString(ItemStack stack, String name) { + setCustomName(stack, TextUtil.literal(name)); + } + + public static void setCustomNameFromTranslatable(ItemStack stack, String key) { + setCustomName(stack, TextUtil.translatable(key)); + } + + public static void setCustomName(ItemStack stack, TextComponent name) { + setCustomName(stack, name.getText()); + } + + public static Text getCustomName(ItemStack stack) { + return stack.get(DataComponentTypes.CUSTOM_NAME); + } + + public static String getCustomNameAsString(ItemStack stack) { + return getCustomName(stack).getString(); + } + + public static TextComponent getCustomNameAsTextComponent(ItemStack stack) { + return new TextComponent(getCustomName(stack)); + } + + public static boolean hasCustomName(ItemStack stack) { + return stack.contains(DataComponentTypes.CUSTOM_NAME); + } + + public static void removeCustomName(ItemStack stack) { + stack.remove(DataComponentTypes.CUSTOM_NAME); + } +} diff --git a/info.properties b/info.properties index b821dc772..36230804b 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.8-fix.2 +mod_version=2.3.9 maven_group=net.pitan76 \ No newline at end of file From f65bd63fd3aaf0eb574125b033b8b1fcfc2623c7 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 7 Sep 2024 19:10:32 +0900 Subject: [PATCH 373/622] fix --- .../net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java index be1bd580f..fa31cb3d5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java @@ -35,6 +35,7 @@ public static void readCompatBlockEntityNbtFromStack(ItemStack stack, CompatBloc public static void writeCompatBlockEntityNbtToStack(ItemStack stack, CompatBlockEntity blockEntity) { NbtCompound nbt = getBlockEntityNbt(stack); blockEntity.writeNbt(new WriteNbtArgs(nbt)); + NbtUtil.set(nbt, "id", BlockEntityTypeUtil.toID(blockEntity.getType()).toString()); setBlockEntityNbt(stack, nbt); } From 73735d6899b7639cbfb351982f1bf5e048210c4d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 7 Sep 2024 22:20:10 +0900 Subject: [PATCH 374/622] add API --- .../pitan76/mcpitanlib/api/entity/Player.java | 16 ++ .../api/event/block/BlockBreakEvent.java | 6 + .../api/event/block/BlockBreakStartEvent.java | 5 + .../api/event/block/BlockPlacedEvent.java | 6 + .../event/block/BlockScheduledTickEvent.java | 6 + .../api/event/block/EntityCollisionEvent.java | 5 + .../api/event/block/ItemScattererUtil.java | 38 +++ .../api/event/block/PlacementStateArgs.java | 6 + .../api/event/block/StateReplacedEvent.java | 16 +- .../mcpitanlib/api/helper/SimpleRegister.java | 69 +++++ .../api/item/CompatibleItemSettings.java | 5 + .../api/util/BlockEntityTypeUtil.java | 16 ++ .../mcpitanlib/api/util/BlockUtil.java | 27 ++ .../mcpitanlib/api/util/CompatIdentifier.java | 4 + .../mcpitanlib/api/util/EntityTypeUtil.java | 16 ++ .../mcpitanlib/api/util/IngredientUtil.java | 18 ++ .../pitan76/mcpitanlib/api/util/ItemUtil.java | 27 ++ .../pitan76/mcpitanlib/api/util/NbtUtil.java | 241 ++++++++++++++++++ .../mcpitanlib/api/util/WorldUtil.java | 28 +- info.properties | 2 +- 20 files changed, 547 insertions(+), 10 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/helper/SimpleRegister.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 8cc9ed2bf..30a726b08 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -264,10 +264,26 @@ public float getPitch() { } public void playSound(SoundEvent event, SoundCategory category, float volume, float pitch) { + if (isServerPlayerEntity()) { + Optional player = getServerPlayer(); + if (player.isPresent()) { + player.get().playSoundToPlayer(event, category, volume, pitch); + return; + } + } + playSound(event, volume, pitch); } public void playSound(SoundEvent event, float volume, float pitch) { + if (isServerPlayerEntity()) { + Optional player = getServerPlayer(); + if (player.isPresent()) { + player.get().playSound(event, volume, pitch); + return; + } + } + getEntity().playSound(event, volume, pitch); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java index 25e353458..47c330fb5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java @@ -1,11 +1,13 @@ package net.pitan76.mcpitanlib.api.event.block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; public class BlockBreakEvent extends BaseEvent { public World world; @@ -43,4 +45,8 @@ public World getWorld() { public boolean isClient() { return world.isClient(); } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(getWorld(), getPos()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java index a98b2db09..c50170a81 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakStartEvent.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.event.block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -53,4 +54,8 @@ public ItemStack getPlayerMainHandStack() { public ItemStack getPlayerOffHandStack() { return player.getOffHandStack(); } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(getWorld(), getPos()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java index 940958701..639d95761 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java @@ -1,11 +1,13 @@ package net.pitan76.mcpitanlib.api.event.block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; public class BlockPlacedEvent extends BaseEvent { @@ -46,4 +48,8 @@ public LivingEntity getPlacer() { public boolean isClient() { return world.isClient(); } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(getWorld(), getPos()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java index bd14b7e6e..6503217c1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java @@ -1,10 +1,12 @@ package net.pitan76.mcpitanlib.api.event.block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; public class BlockScheduledTickEvent extends BaseEvent { public BlockState state; @@ -35,4 +37,8 @@ public ServerWorld getWorld() { public Random getRandom() { return random; } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(getWorld(), getPos()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java index 298685fa1..41abb7dcf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/EntityCollisionEvent.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.event.block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.sound.SoundCategory; @@ -80,4 +81,8 @@ public Optional getPlayerEntity() { if (!hasPlayerEntity()) return Optional.empty(); return Optional.of((PlayerEntity) entity); } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(getWorld(), getBlockPos()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java new file mode 100644 index 000000000..4abcf5823 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java @@ -0,0 +1,38 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ItemScatterer; +import net.minecraft.util.collection.DefaultedList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class ItemScattererUtil { + public static void spawn(World world, BlockPos pos, BlockEntity blockEntity) { + if (blockEntity instanceof Inventory) { + spawn(world, pos, (Inventory) blockEntity); + } + } + + public static void spawn(World world, BlockPos pos, Inventory inventory) { + ItemScatterer.spawn(world, pos, inventory); + } + + public static void spawn(World world, BlockPos pos, ItemStack stack) { + ItemScatterer.spawn(world, pos.getX(), pos.getY(), pos.getZ(), stack); + } + + public static void spawn(World world, BlockPos pos, DefaultedList stacks) { + ItemScatterer.spawn(world, pos, stacks); + } + + public static void onStateReplaced(StateReplacedEvent e) { + onStateReplaced(e.getState(), e.getNewState(), e.getWorld(), e.getPos()); + } + + public static void onStateReplaced(BlockState state, BlockState newState, World world, BlockPos pos) { + ItemScatterer.onStateReplaced(state, newState, world, pos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java index 6c59a99cc..416952df3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java @@ -2,6 +2,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.property.Property; import net.minecraft.util.Hand; @@ -14,6 +15,7 @@ import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; import net.pitan76.mcpitanlib.api.util.BlockStateUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; import org.jetbrains.annotations.Nullable; @@ -103,4 +105,8 @@ public , V extends T> BlockState withBlockState(Property return BlockStateUtil.with(BlockStateUtil.getDefaultState(block), property, value); } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(getWorld(), getPos()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java index 3e08d355c..a314e2526 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java @@ -3,7 +3,6 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.inventory.Inventory; -import net.minecraft.util.ItemScatterer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; @@ -77,17 +76,20 @@ public BlockEntity getBlockEntity() { * spawn the drops in the container */ public void spawnDropsInContainer() { - BlockEntity blockEntity = getBlockEntity(); - if (blockEntity instanceof Inventory) { - Inventory inventory = (Inventory) blockEntity; - ItemScatterer.spawn(world, pos, inventory); - } + if (isSameState() || !hasInventory()) return; + + ItemScattererUtil.spawn(getWorld(), getPos(), getBlockEntity()); + updateComparators(); + } + + public boolean hasInventory() { + return getBlockEntity() instanceof Inventory; } /** * update the comparators */ public void updateComparators() { - world.updateComparators(pos, state.getBlock()); + WorldUtil.updateComparators(getWorld(), getPos(), getState().getBlock()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/helper/SimpleRegister.java b/common/src/main/java/net/pitan76/mcpitanlib/api/helper/SimpleRegister.java new file mode 100644 index 000000000..763444f86 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/helper/SimpleRegister.java @@ -0,0 +1,69 @@ +package net.pitan76.mcpitanlib.api.helper; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; +import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.util.ItemUtil; +import net.pitan76.mcpitanlib.core.datafixer.Pair; + +import java.util.function.Supplier; + +public class SimpleRegister { + public static Supplier createItem(CompatRegistryV2 registry, CompatIdentifier id, CompatibleItemSettings settings) { + return registry.registerExtendItem(id, () -> new ExtendItem(settings)); + } + + public static Supplier createSimpleItem(CompatRegistryV2 registry, CompatIdentifier id) { + return createItem(registry, id, new CompatibleItemSettings()); + } + + public static Supplier createFoodItem(CompatRegistryV2 registry, CompatIdentifier id, CompatFoodComponent component) { + return createItem(registry, id, new CompatibleItemSettings().food(component)); + } + + public static Supplier createSimpleFoodItem(CompatRegistryV2 registry, CompatIdentifier id, int hunger, float saturation, boolean meat, boolean snack) { + CompatFoodComponent component = new CompatFoodComponent().setHunger(hunger).setSaturation(saturation); + if (meat) component.setMeat(); + if (snack) component.setSnack(); + return createFoodItem(registry, id, component); + } + + public static Supplier createSimpleFoodItem(CompatRegistryV2 registry, CompatIdentifier id, int hunger, float saturation) { + return createSimpleFoodItem(registry, id, hunger, saturation, false, false); + } + + public static Pair, Supplier> createBlock(CompatRegistryV2 registry, CompatIdentifier id, CompatibleBlockSettings blockSettings, CompatibleItemSettings itemSettings) { + Supplier blockSupplier = registry.registerExtendBlock(id, () -> new ExtendBlock(blockSettings)); + RegistryResult itemRegistryResult = registry.registerItem(id, () -> ItemUtil.ofBlock(blockSupplier.get(), itemSettings)); + Supplier itemSupplier = itemRegistryResult::getOrNull; + return new Pair<>(blockSupplier, itemSupplier); + } + + public static Pair, Supplier> createSimpleBlock(CompatRegistryV2 registry, CompatIdentifier id, CompatibleItemSettings itemSettings) { + return createBlock(registry, id, new CompatibleBlockSettings(), itemSettings); + } + + public static Pair, Supplier> createSimpleBlock(CompatRegistryV2 registry, CompatIdentifier id) { + return createBlock(registry, id, new CompatibleBlockSettings(), new CompatibleItemSettings()); + } + + public static CreativeTabBuilder createCreativeTab(CompatRegistryV2 registry, CompatIdentifier id, Supplier icon) { + CreativeTabBuilder builder = CreativeTabBuilder.create(id).setIcon(icon); + registry.registerItemGroup(builder); + return builder; + } + + public static CreativeTabBuilder createCreativeTabByItem(CompatRegistryV2 registry, CompatIdentifier id, Supplier item) { + return createCreativeTab(registry, id, () -> ItemStackUtil.create(item.get())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index 4fb494a9b..ffc6a1cfb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -61,6 +61,7 @@ public CompatibleItemSettings maxDamageIfAbsent(int maxDamage) { return this; } + @Deprecated public CompatibleItemSettings food(FoodComponent foodComponent) { settings.food(foodComponent); return this; @@ -91,4 +92,8 @@ public CompatibleItemSettings addGroup(ItemGroup itemGroup, CompatIdentifier ide public CompatibleItemSettings addGroup(Supplier itemGroup, CompatIdentifier identifier) { return addGroup(itemGroup, identifier.toMinecraft()); } + + public CompatibleItemSettings food(CompatFoodComponent foodComponent) { + return food(foodComponent.build()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityTypeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityTypeUtil.java index 8f45bc639..22355031b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityTypeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityTypeUtil.java @@ -13,6 +13,22 @@ public static BlockEntityType fromId(Identifier identifier) { return Registries.BLOCK_ENTITY_TYPE.get(identifier); } + public static boolean isExist(Identifier identifier) { + return Registries.BLOCK_ENTITY_TYPE.containsId(identifier); + } + + public static CompatIdentifier toCompatID(BlockEntityType entityType) { + return CompatIdentifier.fromMinecraft(toID(entityType)); + } + + public static BlockEntityType fromId(CompatIdentifier identifier) { + return fromId(identifier.toMinecraft()); + } + + public static boolean isExist(CompatIdentifier identifier) { + return isExist(identifier.toMinecraft()); + } + public static int getRawId(BlockEntityType type) { return Registries.BLOCK_ENTITY_TYPE.getRawId(type); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java index 3888d10a7..a2ae6c73f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -97,6 +97,33 @@ public static Block fromId(Identifier identifier) { return BlockUtilV1.fromId(identifier); } + /** + * Get CompatIdentifier from block. + * @param block Block to get CompatIdentifier. + * @return CompatIdentifier of the block. + */ + public static CompatIdentifier toCompatID(Block block) { + return CompatIdentifier.fromMinecraft(toID(block)); + } + + /** + * Get block from CompatIdentifier. + * @param identifier CompatIdentifier of the block. + * @return Block of the CompatIdentifier. + */ + public static Block fromId(CompatIdentifier identifier) { + return fromId(identifier.toMinecraft()); + } + + /** + * Check if the block is existed. + * @param identifier CompatIdentifier of the block. + * @return If the block is existed. + */ + public static boolean isExist(CompatIdentifier identifier) { + return isExist(identifier.toMinecraft()); + } + /** * Get all blocks. * @return List of all blocks. diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java index 5a21546e9..1d786c02e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java @@ -84,6 +84,10 @@ public boolean equals(Object obj) { } else if (obj != null && this.getClass() == obj.getClass()) { CompatIdentifier identifier = (CompatIdentifier)obj; return this.namespace.equals(identifier.namespace) && this.path.equals(identifier.path); + } else if (obj instanceof Identifier) { + return this.toString().equals(obj.toString()); + } else if (obj instanceof String) { + return this.toString().equals(obj); } else { return false; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java index 50d42a6b8..171144592 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java @@ -13,6 +13,22 @@ public static EntityType fromId(Identifier identifier) { return Registries.ENTITY_TYPE.get(identifier); } + public static boolean isExist(Identifier identifier) { + return Registries.ENTITY_TYPE.containsId(identifier); + } + + public static CompatIdentifier toCompatID(EntityType entityType) { + return CompatIdentifier.fromMinecraft(toID(entityType)); + } + + public static EntityType fromId(CompatIdentifier identifier) { + return fromId(identifier.toMinecraft()); + } + + public static boolean isExist(CompatIdentifier identifier) { + return isExist(identifier.toMinecraft()); + } + public static int getRawId(EntityType type) { return Registries.ENTITY_TYPE.getRawId(type); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index 8bfc84286..6bb989f24 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -1,10 +1,14 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.item.Item; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.Registries; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; +import java.util.ArrayList; +import java.util.List; + public class IngredientUtil { public static Ingredient fromTagByIdentifier(Identifier id) { return Ingredient.fromTag(TagKey.of(Registries.ITEM.getKey(), id)); @@ -13,4 +17,18 @@ public static Ingredient fromTagByIdentifier(Identifier id) { public static Ingredient fromTagByString(String id) { return fromTagByIdentifier(IdentifierUtil.id(id)); } + + public static Ingredient fromTagByIdentifier(CompatIdentifier id) { + return fromTagByIdentifier(id.toMinecraft()); + } + + public static List getItems(Ingredient ingredient) { + List items = new ArrayList<>(); + for (int rawId : ingredient.getMatchingItemIds()) { + try { + items.add(ItemUtil.fromIndex(rawId)); + } catch (Exception ignored) {} + } + return items; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java index d584e1e18..9d0ebc80a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java @@ -90,6 +90,33 @@ public static Item fromId(Identifier identifier) { return ItemUtilV1.fromId(identifier); } + /** + * Get CompatIdentifier from Item. + * @param item Item to get CompatIdentifier. + * @return CompatIdentifier of the Item. + */ + public static CompatIdentifier toCompatID(Item item) { + return CompatIdentifier.fromMinecraft(toID(item)); + } + + /** + * Get item from CompatIdentifier. + * @param identifier CompatIdentifier of the item. + * @return Item of the CompatIdentifier. + */ + public static Item fromId(CompatIdentifier identifier) { + return fromId(identifier.toMinecraft()); + } + + /** + * Check if the item is existed. + * @param identifier CompatIdentifier of the item. + * @return If the item is existed. + */ + public static boolean isExist(CompatIdentifier identifier) { + return isExist(identifier.toMinecraft()); + } + /** * Create BlockItem from Block and Item.Settings. * @param block Block to create BlockItem. diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index d20b2dc16..5f77f9127 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -1,9 +1,21 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.NbtList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.Vec3i; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.math.PosUtil; +import net.pitan76.mcpitanlib.api.util.math.Vec3dUtil; +import net.pitan76.mcpitanlib.api.util.math.Vec3iUtil; +import java.util.Optional; import java.util.Set; +import java.util.UUID; public class NbtUtil { @@ -25,6 +37,16 @@ public static void put(NbtCompound nbt, String key, NbtCompound value) { nbt.put(key, value); } + /** + * 値を設定する。 + * @param nbt NbtCompound + * @param key キー + * @param value 値 + */ + public static void put(NbtCompound nbt, String key, NbtElement value) { + nbt.put(key, value); + } + /** * 値を取得する。 * @param nbt NbtCompound @@ -92,6 +114,9 @@ public static T get(NbtCompound nbt, String key, Class clazz) { if (clazz == Short.class) { return (T) Short.valueOf(nbt.getShort(key)); } + if (clazz == UUID.class) { + return (T) nbt.getUuid(key); + } return null; } @@ -142,6 +167,10 @@ public static void set(NbtCompound nbt, String key, T value) { nbt.putShort(key, (Short) value); return; } + if (value instanceof UUID) { + nbt.putUuid(key, (UUID) value); + return; + } } /** @@ -152,4 +181,216 @@ public static void set(NbtCompound nbt, String key, T value) { public static Set getKeys(NbtCompound nbt) { return nbt.getKeys(); } + + /** + * NbtListを取得する。 + * @return NbtList + */ + public static NbtList getList(NbtCompound nbt, String key) { + return nbt.getList(key, 9); + } + + /** + * NbtCompoundをコピーする。 + * @return NbtCompound + */ + public static NbtCompound copy(NbtCompound nbt) { + return nbt.copy(); + } + + // Helper methods + + public static void putInt(NbtCompound nbt, String key, int value) { + set(nbt, key, value); + } + + public static int getInt(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, Integer.class); + return 0; + } + + public static void putString(NbtCompound nbt, String key, String value) { + set(nbt, key, value); + } + + public static String getString(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, String.class); + return ""; + } + + public static void putBoolean(NbtCompound nbt, String key, boolean value) { + set(nbt, key, value); + } + + public static boolean getBoolean(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, Boolean.class); + return false; + } + + public static void putFloat(NbtCompound nbt, String key, float value) { + set(nbt, key, value); + } + + public static float getFloat(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, Float.class); + return 0; + } + + public static void putDouble(NbtCompound nbt, String key, double value) { + set(nbt, key, value); + } + + public static double getDouble(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, Double.class); + return 0; + } + + public static void putLong(NbtCompound nbt, String key, long value) { + set(nbt, key, value); + } + + public static long getLong(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, Long.class); + return 0; + } + + public static void putByte(NbtCompound nbt, String key, byte value) { + set(nbt, key, value); + } + + public static byte getByte(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, Byte.class); + return 0; + } + + public static void putShort(NbtCompound nbt, String key, short value) { + set(nbt, key, value); + } + + public static short getShort(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, Short.class); + return 0; + } + + public static void putUuid(NbtCompound nbt, String key, UUID value) { + set(nbt, key, value); + } + + public static UUID getUuid(NbtCompound nbt, String key) { + if (has(nbt, key)) + return get(nbt, key, UUID.class); + return null; + } + + /** + * BlockPosを設定する。 + * key: { + * "x": pos.getX(), + * "y": pos.getY(), + * "z": pos.getZ() + * } + * + * @param nbt NbtCompound + * @param key キー + * @param pos BlockPos + */ + public static void setBlockPos(NbtCompound nbt, String key, BlockPos pos) { + NbtCompound posNbt = create(); + putInt(posNbt, "x", pos.getX()); + putInt(posNbt, "y", pos.getY()); + putInt(posNbt, "z", pos.getZ()); + put(nbt, key, posNbt); + } + + /** + * BlockPosを取得する。 + * + * @param nbt NbtCompound + * @param key キー + * @return BlockPos + */ + public static BlockPos getBlockPos(NbtCompound nbt, String key) { + NbtCompound posNbt = get(nbt, key); + return PosUtil.flooredBlockPos(getInt(posNbt, "x"), getInt(posNbt, "y"), getInt(posNbt, "z")); + } + + public static void putVec3i(NbtCompound nbt, String key, Vec3i vec3i) { + NbtCompound vec3iNbt = create(); + putInt(vec3iNbt, "x", vec3i.getX()); + putInt(vec3iNbt, "y", vec3i.getY()); + putInt(vec3iNbt, "z", vec3i.getZ()); + put(nbt, key, vec3iNbt); + } + + public static Vec3i getVec3i(NbtCompound nbt, String key) { + NbtCompound vec3iNbt = get(nbt, key); + return Vec3iUtil.create(getInt(vec3iNbt, "x"), getInt(vec3iNbt, "y"), getInt(vec3iNbt, "z")); + } + + public static void putVec3d(NbtCompound nbt, String key, Vec3d vec3d) { + NbtCompound vec3dNbt = create(); + putDouble(vec3dNbt, "x", vec3d.getX()); + putDouble(vec3dNbt, "y", vec3d.getY()); + putDouble(vec3dNbt, "z", vec3d.getZ()); + put(nbt, key, vec3dNbt); + } + + public static Vec3d getVec3d(NbtCompound nbt, String key) { + NbtCompound vec3dNbt = get(nbt, key); + return Vec3dUtil.create(getDouble(vec3dNbt, "x"), getDouble(vec3dNbt, "y"), getDouble(vec3dNbt, "z")); + } + + public static void putItemStack(NbtCompound nbt, String key, ItemStack stack, CompatRegistryLookup registryLookup) { + NbtElement stackNbt = stack.encode(registryLookup.getRegistryLookup()); + put(nbt, key, stackNbt); + } + + public static Optional getItemStack(NbtCompound nbt, String key, CompatRegistryLookup registryLookup) { + NbtElement stackNbt = get(nbt, key); + return ItemStack.fromNbt(registryLookup.getRegistryLookup(), stackNbt); + } + + public static void putSimpleItemStack(NbtCompound nbt, String key, ItemStack stack) { + NbtCompound stackNbt = create(); + putString(stackNbt, "id", ItemUtil.toID(stack.getItem()).toString()); + putByte(stackNbt, "Count", (byte) ItemStackUtil.getCount(stack)); + + NbtCompound tagNbt = create(); + NbtCompound componentsNbt = create(); + put(componentsNbt, "minecraft:custom_data", CustomDataUtil.getOrCreateNbt(stack)); + put(tagNbt, "components", componentsNbt); + put(stackNbt, "tag", tagNbt); + put(nbt, key, stackNbt); + } + + public static Optional getSimpleItemStack(NbtCompound nbt, String key) { + if (!has(nbt, key)) return Optional.empty(); + NbtCompound stackNbt = get(nbt, key); + + if (!has(stackNbt, "id") || !has(stackNbt, "Count")) return Optional.empty(); + Item item = ItemUtil.fromId(CompatIdentifier.of(getString(stackNbt, "id"))); + int count = getByte(stackNbt, "Count"); + + ItemStack stack = ItemStackUtil.create(item, count); + + if (has(stackNbt, "tag")) { + NbtCompound tagNbt = get(stackNbt, "tag"); + if (has(tagNbt, "components")) { + NbtCompound componentsNbt = get(tagNbt, "components"); + if (has(componentsNbt, "minecraft:custom_data")) { + CustomDataUtil.setNbt(stack, get(componentsNbt, "minecraft:custom_data")); + } + } + } + + return Optional.of(stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 58217cb42..db3217831 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -27,6 +27,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Objects; +import java.util.Optional; public class WorldUtil { public static boolean hasSkyLight(World world) { @@ -99,9 +100,20 @@ public static BlockPos getSpawnPos(World world) { return world.getSpawnPos(); } + public static Optional getServer(World world) { + if (isClient(world)) return Optional.empty(); + return Optional.ofNullable(world.getServer()); + } + public static World getWorld(World world, Identifier worldId) { - if (isClient(world)) return null; - return getWorld(world.getServer(), worldId); + Optional server = getServer(world); + if (!server.isPresent()) return null; + + return getWorld(server.get(), worldId); + } + + public static Optional getWorld(World world, CompatIdentifier worldId) { + return Optional.ofNullable(getWorld(world, worldId.toMinecraft())); } public static World getOverworld(MinecraftServer server) { @@ -120,10 +132,18 @@ public static World getWorld(MinecraftServer server, Identifier worldId) { return server.getWorld(RegistryKey.of(RegistryKeys.WORLD, worldId)); } + public static World getWorld(MinecraftServer server, CompatIdentifier worldId) { + return getWorld(server, worldId.toMinecraft()); + } + public static Identifier getWorldId(World world) { return world.getRegistryKey().getValue(); } + public static CompatIdentifier getCompatWorldId(World world) { + return CompatIdentifier.fromMinecraft(getWorldId(world)); + } + public static boolean equals(World world, World world2) { return Objects.equals(getWorldId(world), getWorldId(world2)); } @@ -223,4 +243,8 @@ public static void addParticle(World world, ParticleEffect parameters, double x, public static boolean canSetBlock(World world, BlockPos pos) { return world.canSetBlock(pos); } + + public static void updateComparators(World world, BlockPos pos, Block block) { + world.updateComparators(pos, block); + } } diff --git a/info.properties b/info.properties index 36230804b..65cab9385 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.3.9 +mod_version=2.4.0 maven_group=net.pitan76 \ No newline at end of file From d13521aaa594e0890efd3b6c94809370feee495f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 12 Sep 2024 13:29:33 +0900 Subject: [PATCH 375/622] add API --- .../api/block/CompatPillarBlock.java | 12 + .../mcpitanlib/api/block/CompatSlabBlock.java | 82 + .../api/block/CompatStairsBlock.java | 34 +- .../api/block/CompatibleBlockSettings.java | 7 + .../mcpitanlib/api/block/ExtendBlock.java | 23 + .../api/client/event/WorldRenderRegistry.java | 15 + .../listener/BeforeBlockOutlineEvent.java | 108 ++ .../listener/BeforeBlockOutlineListener.java | 11 + .../event/listener/WorldRenderContext.java | 63 + .../pitan76/mcpitanlib/api/entity/Player.java | 47 + .../api/item/v2/CompatArmorMaterial.java | 24 + .../api/sound/CompatSoundEvent.java | 38 + .../api/sound/CompatSoundEvents.java | 1619 +++++++++++++++++ .../pitan76/mcpitanlib/api/util/NbtUtil.java | 4 + .../api/util/PersistentStateUtil.java | 4 + .../mcpitanlib/api/util/VoxelShapeUtil.java | 5 + .../mcpitanlib/api/util/WorldUtil.java | 12 + .../api/util/client/ClientUtil.java | 48 +- .../core/serialization/CompatMapCodec.java | 54 + .../event/fabric/WorldRenderRegistryImpl.java | 89 + info.properties | 2 +- .../neoforge/WorldRenderRegistryImpl.java | 105 ++ 22 files changed, 2399 insertions(+), 7 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineListener.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java index 4be321670..7f358ac91 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.block; +import com.mojang.serialization.MapCodec; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.PillarBlock; @@ -7,6 +8,7 @@ import net.minecraft.state.StateManager; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; +import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatPillarBlock extends PillarBlock implements ExtendBlockProvider { public CompatPillarBlock(Settings settings) { @@ -49,4 +51,14 @@ public void appendProperties(AppendPropertiesArgs args, Options options) { public BlockState getPlacementState(PlacementStateArgs args, Options options) { return ExtendBlockProvider.super.getPlacementState(args, options); } + + @Deprecated + @Override + public MapCodec getCodec() { + return getCompatCodec().getCodec(); + } + + public CompatMapCodec getCompatCodec() { + return CompatMapCodec.of(super.getCodec()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java new file mode 100644 index 000000000..251dcda7f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java @@ -0,0 +1,82 @@ +package net.pitan76.mcpitanlib.api.block; + +import com.mojang.serialization.MapCodec; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.SlabBlock; +import net.minecraft.block.StairsBlock; +import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.StateManager; +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.event.block.CanPathfindThroughArgs; +import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; +import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; + +public class CompatSlabBlock extends SlabBlock implements ExtendBlockProvider { + public CompatSlabBlock(Settings settings) { + super(settings); + } + + public CompatSlabBlock(CompatibleBlockSettings settings) { + this(settings.build()); + } + + public void appendProperties(AppendPropertiesArgs args) { + super.appendProperties(args.builder); + } + + public BlockState getPlacementState(PlacementStateArgs args) { + return super.getPlacementState(args.ctx); + } + + @Deprecated + @Override + public void appendProperties(StateManager.Builder builder) { + appendProperties(new AppendPropertiesArgs(builder)); + } + + @Deprecated + @Override + public BlockState getPlacementState(ItemPlacementContext ctx) { + return getPlacementState(new PlacementStateArgs(ctx)); + } + + // ExtendBlockProvider + @Deprecated + @Override + public void appendProperties(AppendPropertiesArgs args, Options options) { + ExtendBlockProvider.super.appendProperties(args, options); + } + + @Deprecated + @Override + public BlockState getPlacementState(PlacementStateArgs args, Options options) { + return ExtendBlockProvider.super.getPlacementState(args, options); + } + + @Deprecated + @Override + public MapCodec getCodec() { + return getCompatCodec().getCodec(); + } + + public CompatMapCodec getCompatCodec() { + return CompatMapCodec.of(super.getCodec()); + } + + @Deprecated + @Override + public boolean canPathfindThrough(BlockState state, NavigationType type) { + return canPathfindThrough(new CanPathfindThroughArgs(state, type)); + } + + public boolean canPathfindThrough(CanPathfindThroughArgs args) { + return super.canPathfindThrough(args.state, args.type); + } + + @Override + public Boolean canPathfindThrough(CanPathfindThroughArgs args, Options options) { + return ExtendBlockProvider.super.canPathfindThrough(args, options); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java index 3a016f3e3..b4b37aa8b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java @@ -1,17 +1,18 @@ package net.pitan76.mcpitanlib.api.block; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.ShapeContext; -import net.minecraft.block.StairsBlock; +import com.mojang.serialization.MapCodec; +import net.minecraft.block.*; +import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.event.block.CanPathfindThroughArgs; import net.pitan76.mcpitanlib.api.event.block.OutlineShapeEvent; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; +import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatStairsBlock extends StairsBlock implements ExtendBlockProvider { public CompatStairsBlock(BlockState baseBlockState, Settings settings) { @@ -70,4 +71,29 @@ public BlockState getPlacementState(PlacementStateArgs args, Options options) { public VoxelShape getOutlineShape(OutlineShapeEvent event, Options options) { return ExtendBlockProvider.super.getOutlineShape(event, options); } + + @Deprecated + @Override + public MapCodec getCodec() { + return getCompatCodec().getCodec(); + } + + public CompatMapCodec getCompatCodec() { + return CompatMapCodec.of(super.getCodec()); + } + + @Deprecated + @Override + public boolean canPathfindThrough(BlockState state, NavigationType type) { + return canPathfindThrough(new CanPathfindThroughArgs(state, type)); + } + + public boolean canPathfindThrough(CanPathfindThroughArgs args) { + return super.canPathfindThrough(args.state, args.type); + } + + @Override + public Boolean canPathfindThrough(CanPathfindThroughArgs args, Options options) { + return ExtendBlockProvider.super.canPathfindThrough(args, options); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java index 8b68dc9a4..2034f9e2d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.block; +import com.mojang.serialization.Codec; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -11,12 +12,18 @@ import java.util.function.ToIntFunction; public class CompatibleBlockSettings { + public static final Codec CODEC = Codec.unit(CompatibleBlockSettings::of); + private final AbstractBlock.Settings settings; public CompatibleBlockSettings() { this.settings = AbstractBlock.Settings.create(); } + public static CompatibleBlockSettings of() { + return new CompatibleBlockSettings(); + } + private static CompatibleBlockSettings copyCompatibleMaterial(CompatibleMaterial material, CompatibleBlockSettings settings) { settings.mapColor(material.getColor()); if (material.isLiquid()) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 636b11c10..8563170f6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.block; +import com.mojang.serialization.MapCodec; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -31,17 +32,29 @@ import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; import org.jetbrains.annotations.Nullable; import java.util.List; public class ExtendBlock extends Block { + public CompatibleBlockSettings compatSettings; + public ExtendBlock(Settings settings) { super(settings); } public ExtendBlock(CompatibleBlockSettings settings) { super(settings.build()); + this.compatSettings = settings; + } + + /** + * get compatible block settings + * @return CompatibleBlockSettings + */ + public CompatibleBlockSettings getCompatSettings() { + return compatSettings; } /** @@ -307,4 +320,14 @@ public void onBlockBreakStart(BlockState state, World world, BlockPos pos, Playe public void onBlockBreakStart(BlockBreakStartEvent e) { super.onBlockBreakStart(e.state, e.world, e.pos, e.player.getPlayerEntity()); } + + @Deprecated + @Override + protected MapCodec getCodec() { + return getCompatCodec().getCodec(); + } + + public CompatMapCodec getCompatCodec() { + return CompatMapCodec.of(super.getCodec()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java new file mode 100644 index 000000000..5d0d0695c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java @@ -0,0 +1,15 @@ +package net.pitan76.mcpitanlib.api.client.event; + +import dev.architectury.injectables.annotations.ExpectPlatform; +import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; + +public class WorldRenderRegistry { + public WorldRenderRegistry() { + + } + + @ExpectPlatform + public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListener listener) { + throw new AssertionError(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java new file mode 100644 index 000000000..9cf86627b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java @@ -0,0 +1,108 @@ +package net.pitan76.mcpitanlib.api.client.event.listener; + +import net.minecraft.block.BlockState; +import net.minecraft.client.render.Camera; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.VoxelShapeUtil; + +import java.util.Objects; +import java.util.Optional; + +public class BeforeBlockOutlineEvent { + public WorldRenderContext context; + public HitResult hitResult; + + public BeforeBlockOutlineEvent(WorldRenderContext context, HitResult hitResult) { + this.context = context; + this.hitResult = hitResult; + } + + public HitResult getHitResult() { + return hitResult; + } + + public WorldRenderContext getContext() { + return context; + } + + public WorldRenderer getWorldRenderer() { + return context.worldRenderer(); + } + + public Optional getBlockState() { + return Optional.ofNullable(getWorld().getBlockState(getBlockPos().orElse(null))); + } + + public World getWorld() { + return context.world(); + } + + public Optional getBlockPos() { + return Optional.ofNullable(((BlockHitResult) hitResult).getBlockPos()); + } + + public boolean isBlockType() { + return getHitResultType() == HitResult.Type.BLOCK; + } + + public HitResult.Type getHitResultType() { + return hitResult.getType(); + } + + public Camera getCamera() { + return context.camera(); + } + + public Optional getOutlineShape() { + return getBlockState().map(blockState -> blockState.getOutlineShape(getWorld(), + getBlockPos().orElse(null))); + } + + public MatrixStack getMatrixStack() { + return context.matrixStack(); + } + + public void push() { + getMatrixStack().push(); + } + + public void translate(double x, double y, double z) { + getMatrixStack().translate(x, y, z); + } + + public void pop() { + getMatrixStack().pop(); + } + + public Optional getVertexConsumer() { + if (context.consumers() == null) + return Optional.empty(); + + return Optional.of(Objects.requireNonNull(context.consumers()).getBuffer(RenderLayer.getLines())); + } + + public void drawBox(float red, float green, float blue, float alpha) { + Optional outlineShape = getOutlineShape(); + if (!outlineShape.isPresent()) return; + + drawBox(VoxelShapeUtil.getBoundingBox(outlineShape.get()), red, green, blue, alpha); + } + + public void drawBox(Box box, float red, float green, float blue, float alpha) { + Optional vertexConsumer = getVertexConsumer(); + + if (!vertexConsumer.isPresent()) + return; + + WorldRenderer.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineListener.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineListener.java new file mode 100644 index 000000000..881ee7b11 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineListener.java @@ -0,0 +1,11 @@ +package net.pitan76.mcpitanlib.api.client.event.listener; + + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +@FunctionalInterface +public interface BeforeBlockOutlineListener { + boolean beforeBlockOutline(BeforeBlockOutlineEvent event); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java new file mode 100644 index 000000000..70532c7f4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java @@ -0,0 +1,63 @@ +package net.pitan76.mcpitanlib.api.client.event.listener; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.BlockState; +import net.minecraft.client.render.*; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.profiler.Profiler; +import org.jetbrains.annotations.Nullable; +import org.joml.Matrix4f; + +public interface WorldRenderContext { + + WorldRenderer worldRenderer(); + + MatrixStack matrixStack(); + + float tickDelta(); + + long limitTime(); + + boolean blockOutlines(); + + Camera camera(); + + GameRenderer gameRenderer(); + + LightmapTextureManager lightmapTextureManager(); + + @Deprecated + Matrix4f projectionMatrix(); + + ClientWorld world(); + + Profiler profiler(); + + @Deprecated + boolean advancedTranslucency(); + + @Nullable VertexConsumerProvider consumers(); + @Nullable Frustum frustum(); + + @Environment(EnvType.CLIENT) + interface BlockOutlineContext { + @Deprecated + VertexConsumer vertexConsumer(); + + Entity entity(); + + double cameraX(); + + double cameraY(); + + double cameraZ(); + + BlockPos blockPos(); + + BlockState blockState(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 30a726b08..9985d0ab7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -1,7 +1,10 @@ package net.pitan76.mcpitanlib.api.entity; import dev.architectury.registry.menu.ExtendedMenuProvider; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; +import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.ItemCooldownManager; import net.minecraft.entity.player.PlayerAbilities; @@ -12,6 +15,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; +import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; @@ -27,6 +31,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; import net.pitan76.mcpitanlib.core.player.ItemCooldown; @@ -287,6 +292,14 @@ public void playSound(SoundEvent event, float volume, float pitch) { getEntity().playSound(event, volume, pitch); } + public void playSound(CompatSoundEvent event, SoundCategory category, float volume, float pitch) { + playSound(event.getSoundEvent(), category, volume, pitch); + } + + public void playSound(CompatSoundEvent event, float volume, float pitch) { + playSound(event.getSoundEvent(), volume, pitch); + } + public ItemCooldown itemCooldown = new ItemCooldown(this); public ItemCooldown getItemCooldown() { @@ -355,4 +368,38 @@ public Optional getServerPlayer() { return Optional.empty(); } + + @Environment(EnvType.CLIENT) + public Optional getClientPlayer() { + if (getEntity() instanceof ClientPlayerEntity) + return Optional.of((ClientPlayerEntity) getEntity()); + + return Optional.empty(); + } + + public void setVelocity(double x, double y, double z) { + getEntity().setVelocity(x, y, z); + } + + public void setVelocity(Vec3d velocity) { + getEntity().setVelocity(velocity); + } + + public Vec3d getVelocity() { + return getEntity().getVelocity(); + } + + public Optional getNetworkHandler() { + Optional player = getServerPlayer(); + return player.map(sp -> sp.networkHandler); + } + + public boolean hasNetworkHandler() { + return getNetworkHandler().isPresent(); + } + + public boolean isSpectator() { + return getEntity().isSpectator(); + } + } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java new file mode 100644 index 000000000..ef5dd87f6 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java @@ -0,0 +1,24 @@ +package net.pitan76.mcpitanlib.api.item.v2; + +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public interface CompatArmorMaterial extends CompatibleArmorMaterial { + + @Override + default SoundEvent getEquipSound() { + return getEquipCompatSound().getSoundEvent(); + } + + CompatSoundEvent getEquipCompatSound(); + + @Override + default Identifier getId() { + return getCompatId().toMinecraft(); + } + + CompatIdentifier getCompatId(); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java new file mode 100644 index 000000000..df84214d5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java @@ -0,0 +1,38 @@ +package net.pitan76.mcpitanlib.api.sound; + +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.sound.SoundEvent; + +public class CompatSoundEvent { + public SoundEvent soundEvent; + public RegistryEntry.Reference reference; + public RegistryEntry entry; + + public CompatSoundEvent(SoundEvent soundEvent) { + this.soundEvent = soundEvent; + } + + public CompatSoundEvent(RegistryEntry.Reference reference) { + this.reference = reference; + } + + public CompatSoundEvent(RegistryEntry entry) { + this.entry = entry; + } + + public static CompatSoundEvent of(SoundEvent soundEvent) { + return new CompatSoundEvent(soundEvent); + } + + public SoundEvent getSoundEvent() { + if (soundEvent == null) { + if (reference != null) { + soundEvent = reference.value(); + } else if (entry != null) { + soundEvent = entry.value(); + } + } + + return soundEvent; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java new file mode 100644 index 000000000..22b271ead --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java @@ -0,0 +1,1619 @@ +package net.pitan76.mcpitanlib.api.sound; + +import com.google.common.collect.ImmutableList; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; + +import java.util.stream.Collectors; + +public class CompatSoundEvents { + public static final CompatSoundEvent ENTITY_ALLAY_AMBIENT_WITH_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_AMBIENT_WITH_ITEM); + public static final CompatSoundEvent ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM); + public static final CompatSoundEvent ENTITY_ALLAY_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_DEATH); + public static final CompatSoundEvent ENTITY_ALLAY_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_HURT); + public static final CompatSoundEvent ENTITY_ALLAY_ITEM_GIVEN = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_ITEM_GIVEN); + public static final CompatSoundEvent ENTITY_ALLAY_ITEM_TAKEN = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_ITEM_TAKEN); + public static final CompatSoundEvent ENTITY_ALLAY_ITEM_THROWN = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_ITEM_THROWN); + public static final CompatSoundEvent AMBIENT_CAVE = new CompatSoundEvent(SoundEvents.AMBIENT_CAVE); + public static final CompatSoundEvent AMBIENT_BASALT_DELTAS_ADDITIONS = new CompatSoundEvent(SoundEvents.AMBIENT_BASALT_DELTAS_ADDITIONS); + public static final CompatSoundEvent AMBIENT_BASALT_DELTAS_LOOP = new CompatSoundEvent(SoundEvents.AMBIENT_BASALT_DELTAS_LOOP); + public static final CompatSoundEvent AMBIENT_BASALT_DELTAS_MOOD = new CompatSoundEvent(SoundEvents.AMBIENT_BASALT_DELTAS_MOOD); + public static final CompatSoundEvent AMBIENT_CRIMSON_FOREST_ADDITIONS = new CompatSoundEvent(SoundEvents.AMBIENT_CRIMSON_FOREST_ADDITIONS); + public static final CompatSoundEvent AMBIENT_CRIMSON_FOREST_LOOP = new CompatSoundEvent(SoundEvents.AMBIENT_CRIMSON_FOREST_LOOP); + public static final CompatSoundEvent AMBIENT_CRIMSON_FOREST_MOOD = new CompatSoundEvent(SoundEvents.AMBIENT_CRIMSON_FOREST_MOOD); + public static final CompatSoundEvent AMBIENT_NETHER_WASTES_ADDITIONS = new CompatSoundEvent(SoundEvents.AMBIENT_NETHER_WASTES_ADDITIONS); + public static final CompatSoundEvent AMBIENT_NETHER_WASTES_LOOP = new CompatSoundEvent(SoundEvents.AMBIENT_NETHER_WASTES_LOOP); + public static final CompatSoundEvent AMBIENT_NETHER_WASTES_MOOD = new CompatSoundEvent(SoundEvents.AMBIENT_NETHER_WASTES_MOOD); + public static final CompatSoundEvent AMBIENT_SOUL_SAND_VALLEY_ADDITIONS = new CompatSoundEvent(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_ADDITIONS); + public static final CompatSoundEvent AMBIENT_SOUL_SAND_VALLEY_LOOP = new CompatSoundEvent(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_LOOP); + public static final CompatSoundEvent AMBIENT_SOUL_SAND_VALLEY_MOOD = new CompatSoundEvent(SoundEvents.AMBIENT_SOUL_SAND_VALLEY_MOOD); + public static final CompatSoundEvent AMBIENT_WARPED_FOREST_ADDITIONS = new CompatSoundEvent(SoundEvents.AMBIENT_WARPED_FOREST_ADDITIONS); + public static final CompatSoundEvent AMBIENT_WARPED_FOREST_LOOP = new CompatSoundEvent(SoundEvents.AMBIENT_WARPED_FOREST_LOOP); + public static final CompatSoundEvent AMBIENT_WARPED_FOREST_MOOD = new CompatSoundEvent(SoundEvents.AMBIENT_WARPED_FOREST_MOOD); + public static final CompatSoundEvent AMBIENT_UNDERWATER_ENTER = new CompatSoundEvent(SoundEvents.AMBIENT_UNDERWATER_ENTER); + public static final CompatSoundEvent AMBIENT_UNDERWATER_EXIT = new CompatSoundEvent(SoundEvents.AMBIENT_UNDERWATER_EXIT); + public static final CompatSoundEvent AMBIENT_UNDERWATER_LOOP = new CompatSoundEvent(SoundEvents.AMBIENT_UNDERWATER_LOOP); + public static final CompatSoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS = new CompatSoundEvent(SoundEvents.AMBIENT_UNDERWATER_LOOP_ADDITIONS); + public static final CompatSoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE = new CompatSoundEvent(SoundEvents.AMBIENT_UNDERWATER_LOOP_ADDITIONS_RARE); + public static final CompatSoundEvent AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE = new CompatSoundEvent(SoundEvents.AMBIENT_UNDERWATER_LOOP_ADDITIONS_ULTRA_RARE); + public static final CompatSoundEvent BLOCK_AMETHYST_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_AMETHYST_BLOCK_CHIME = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_BLOCK_CHIME); + public static final CompatSoundEvent BLOCK_AMETHYST_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_AMETHYST_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_AMETHYST_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_AMETHYST_BLOCK_RESONATE = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_BLOCK_RESONATE); + public static final CompatSoundEvent BLOCK_AMETHYST_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_BLOCK_STEP); + public static final CompatSoundEvent BLOCK_AMETHYST_CLUSTER_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_CLUSTER_BREAK); + public static final CompatSoundEvent BLOCK_AMETHYST_CLUSTER_FALL = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_CLUSTER_FALL); + public static final CompatSoundEvent BLOCK_AMETHYST_CLUSTER_HIT = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_CLUSTER_HIT); + public static final CompatSoundEvent BLOCK_AMETHYST_CLUSTER_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_CLUSTER_PLACE); + public static final CompatSoundEvent BLOCK_AMETHYST_CLUSTER_STEP = new CompatSoundEvent(SoundEvents.BLOCK_AMETHYST_CLUSTER_STEP); + public static final CompatSoundEvent BLOCK_ANCIENT_DEBRIS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_ANCIENT_DEBRIS_BREAK); + public static final CompatSoundEvent BLOCK_ANCIENT_DEBRIS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_ANCIENT_DEBRIS_STEP); + public static final CompatSoundEvent BLOCK_ANCIENT_DEBRIS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_ANCIENT_DEBRIS_PLACE); + public static final CompatSoundEvent BLOCK_ANCIENT_DEBRIS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_ANCIENT_DEBRIS_HIT); + public static final CompatSoundEvent BLOCK_ANCIENT_DEBRIS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_ANCIENT_DEBRIS_FALL); + public static final CompatSoundEvent BLOCK_ANVIL_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_BREAK); + public static final CompatSoundEvent BLOCK_ANVIL_DESTROY = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_DESTROY); + public static final CompatSoundEvent BLOCK_ANVIL_FALL = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_FALL); + public static final CompatSoundEvent BLOCK_ANVIL_HIT = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_HIT); + public static final CompatSoundEvent BLOCK_ANVIL_LAND = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_LAND); + public static final CompatSoundEvent BLOCK_ANVIL_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_PLACE); + public static final CompatSoundEvent BLOCK_ANVIL_STEP = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_STEP); + public static final CompatSoundEvent BLOCK_ANVIL_USE = new CompatSoundEvent(SoundEvents.BLOCK_ANVIL_USE); + public static final CompatSoundEvent ENTITY_ARMADILLO_EAT = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_EAT); + public static final CompatSoundEvent ENTITY_ARMADILLO_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_HURT); + public static final CompatSoundEvent ENTITY_ARMADILLO_HURT_REDUCED = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_HURT_REDUCED); + public static final CompatSoundEvent ENTITY_ARMADILLO_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_AMBIENT); + public static final CompatSoundEvent ENTITY_ARMADILLO_STEP = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_STEP); + public static final CompatSoundEvent ENTITY_ARMADILLO_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_DEATH); + public static final CompatSoundEvent ENTITY_ARMADILLO_ROLL = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_ROLL); + public static final CompatSoundEvent ENTITY_ARMADILLO_LAND = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_LAND); + public static final CompatSoundEvent ENTITY_ARMADILLO_SCUTE_DROP = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_SCUTE_DROP); + public static final CompatSoundEvent ENTITY_ARMADILLO_UNROLL_FINISH = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_UNROLL_FINISH); + public static final CompatSoundEvent ENTITY_ARMADILLO_PEEK = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_PEEK); + public static final CompatSoundEvent ENTITY_ARMADILLO_UNROLL_START = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_UNROLL_START); + public static final CompatSoundEvent ENTITY_ARMADILLO_BRUSH = new CompatSoundEvent(SoundEvents.ENTITY_ARMADILLO_BRUSH); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_CHAIN = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_CHAIN); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_DIAMOND = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_ELYTRA = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_ELYTRA); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_GENERIC = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_GENERIC); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_GOLD = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_GOLD); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_IRON = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_IRON); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_LEATHER = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_LEATHER); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_NETHERITE = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_TURTLE = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_TURTLE); + public static final CompatSoundEvent ITEM_ARMOR_EQUIP_WOLF = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_WOLF); + public static final CompatSoundEvent ITEM_ARMOR_UNEQUIP_WOLF = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_UNEQUIP_WOLF); + public static final CompatSoundEvent ENTITY_ARMOR_STAND_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_ARMOR_STAND_BREAK); + public static final CompatSoundEvent ENTITY_ARMOR_STAND_FALL = new CompatSoundEvent(SoundEvents.ENTITY_ARMOR_STAND_FALL); + public static final CompatSoundEvent ENTITY_ARMOR_STAND_HIT = new CompatSoundEvent(SoundEvents.ENTITY_ARMOR_STAND_HIT); + public static final CompatSoundEvent ENTITY_ARMOR_STAND_PLACE = new CompatSoundEvent(SoundEvents.ENTITY_ARMOR_STAND_PLACE); + public static final CompatSoundEvent ENTITY_ARROW_HIT = new CompatSoundEvent(SoundEvents.ENTITY_ARROW_HIT); + public static final CompatSoundEvent ENTITY_ARROW_HIT_PLAYER = new CompatSoundEvent(SoundEvents.ENTITY_ARROW_HIT_PLAYER); + public static final CompatSoundEvent ENTITY_ARROW_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_ARROW_SHOOT); + public static final CompatSoundEvent ITEM_AXE_STRIP = new CompatSoundEvent(SoundEvents.ITEM_AXE_STRIP); + public static final CompatSoundEvent ITEM_AXE_SCRAPE = new CompatSoundEvent(SoundEvents.ITEM_AXE_SCRAPE); + public static final CompatSoundEvent ITEM_AXE_WAX_OFF = new CompatSoundEvent(SoundEvents.ITEM_AXE_WAX_OFF); + public static final CompatSoundEvent ENTITY_AXOLOTL_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_AXOLOTL_ATTACK); + public static final CompatSoundEvent ENTITY_AXOLOTL_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_AXOLOTL_DEATH); + public static final CompatSoundEvent ENTITY_AXOLOTL_HURT = new CompatSoundEvent(SoundEvents.ENTITY_AXOLOTL_HURT); + public static final CompatSoundEvent ENTITY_AXOLOTL_IDLE_AIR = new CompatSoundEvent(SoundEvents.ENTITY_AXOLOTL_IDLE_AIR); + public static final CompatSoundEvent ENTITY_AXOLOTL_IDLE_WATER = new CompatSoundEvent(SoundEvents.ENTITY_AXOLOTL_IDLE_WATER); + public static final CompatSoundEvent ENTITY_AXOLOTL_SPLASH = new CompatSoundEvent(SoundEvents.ENTITY_AXOLOTL_SPLASH); + public static final CompatSoundEvent ENTITY_AXOLOTL_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_AXOLOTL_SWIM); + public static final CompatSoundEvent BLOCK_AZALEA_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_BREAK); + public static final CompatSoundEvent BLOCK_AZALEA_FALL = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_FALL); + public static final CompatSoundEvent BLOCK_AZALEA_HIT = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_HIT); + public static final CompatSoundEvent BLOCK_AZALEA_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_PLACE); + public static final CompatSoundEvent BLOCK_AZALEA_STEP = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_STEP); + public static final CompatSoundEvent BLOCK_AZALEA_LEAVES_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_LEAVES_BREAK); + public static final CompatSoundEvent BLOCK_AZALEA_LEAVES_FALL = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_LEAVES_FALL); + public static final CompatSoundEvent BLOCK_AZALEA_LEAVES_HIT = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_LEAVES_HIT); + public static final CompatSoundEvent BLOCK_AZALEA_LEAVES_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_LEAVES_PLACE); + public static final CompatSoundEvent BLOCK_AZALEA_LEAVES_STEP = new CompatSoundEvent(SoundEvents.BLOCK_AZALEA_LEAVES_STEP); + public static final CompatSoundEvent BLOCK_BAMBOO_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_BREAK); + public static final CompatSoundEvent BLOCK_BAMBOO_FALL = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_FALL); + public static final CompatSoundEvent BLOCK_BAMBOO_HIT = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_HIT); + public static final CompatSoundEvent BLOCK_BAMBOO_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_PLACE); + public static final CompatSoundEvent BLOCK_BAMBOO_STEP = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_STEP); + public static final CompatSoundEvent BLOCK_BAMBOO_SAPLING_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_SAPLING_BREAK); + public static final CompatSoundEvent BLOCK_BAMBOO_SAPLING_HIT = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_SAPLING_HIT); + public static final CompatSoundEvent BLOCK_BAMBOO_SAPLING_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_SAPLING_PLACE); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_BREAK); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_FALL = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_FALL); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_HIT = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_HIT); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_PLACE); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_STEP = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_STEP); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_DOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_DOOR_CLOSE); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_DOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_DOOR_OPEN); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_TRAPDOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_TRAPDOOR_CLOSE); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_TRAPDOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_TRAPDOOR_OPEN); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_BUTTON_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_BUTTON_CLICK_OFF); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_BUTTON_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_BUTTON_CLICK_ON); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_OFF); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_ON); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_FENCE_GATE_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_FENCE_GATE_CLOSE); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_FENCE_GATE_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_FENCE_GATE_OPEN); + public static final CompatSoundEvent BLOCK_BARREL_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_BARREL_CLOSE); + public static final CompatSoundEvent BLOCK_BARREL_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_BARREL_OPEN); + public static final CompatSoundEvent BLOCK_BASALT_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_BASALT_BREAK); + public static final CompatSoundEvent BLOCK_BASALT_STEP = new CompatSoundEvent(SoundEvents.BLOCK_BASALT_STEP); + public static final CompatSoundEvent BLOCK_BASALT_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_BASALT_PLACE); + public static final CompatSoundEvent BLOCK_BASALT_HIT = new CompatSoundEvent(SoundEvents.BLOCK_BASALT_HIT); + public static final CompatSoundEvent BLOCK_BASALT_FALL = new CompatSoundEvent(SoundEvents.BLOCK_BASALT_FALL); + public static final CompatSoundEvent ENTITY_BAT_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_BAT_AMBIENT); + public static final CompatSoundEvent ENTITY_BAT_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_BAT_DEATH); + public static final CompatSoundEvent ENTITY_BAT_HURT = new CompatSoundEvent(SoundEvents.ENTITY_BAT_HURT); + public static final CompatSoundEvent ENTITY_BAT_LOOP = new CompatSoundEvent(SoundEvents.ENTITY_BAT_LOOP); + public static final CompatSoundEvent ENTITY_BAT_TAKEOFF = new CompatSoundEvent(SoundEvents.ENTITY_BAT_TAKEOFF); + public static final CompatSoundEvent BLOCK_BEACON_ACTIVATE = new CompatSoundEvent(SoundEvents.BLOCK_BEACON_ACTIVATE); + public static final CompatSoundEvent BLOCK_BEACON_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_BEACON_AMBIENT); + public static final CompatSoundEvent BLOCK_BEACON_DEACTIVATE = new CompatSoundEvent(SoundEvents.BLOCK_BEACON_DEACTIVATE); + public static final CompatSoundEvent BLOCK_BEACON_POWER_SELECT = new CompatSoundEvent(SoundEvents.BLOCK_BEACON_POWER_SELECT); + public static final CompatSoundEvent ENTITY_BEE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_BEE_DEATH); + public static final CompatSoundEvent ENTITY_BEE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_BEE_HURT); + public static final CompatSoundEvent ENTITY_BEE_LOOP_AGGRESSIVE = new CompatSoundEvent(SoundEvents.ENTITY_BEE_LOOP_AGGRESSIVE); + public static final CompatSoundEvent ENTITY_BEE_LOOP = new CompatSoundEvent(SoundEvents.ENTITY_BEE_LOOP); + public static final CompatSoundEvent ENTITY_BEE_STING = new CompatSoundEvent(SoundEvents.ENTITY_BEE_STING); + public static final CompatSoundEvent ENTITY_BEE_POLLINATE = new CompatSoundEvent(SoundEvents.ENTITY_BEE_POLLINATE); + public static final CompatSoundEvent BLOCK_BEEHIVE_DRIP = new CompatSoundEvent(SoundEvents.BLOCK_BEEHIVE_DRIP); + public static final CompatSoundEvent BLOCK_BEEHIVE_ENTER = new CompatSoundEvent(SoundEvents.BLOCK_BEEHIVE_ENTER); + public static final CompatSoundEvent BLOCK_BEEHIVE_EXIT = new CompatSoundEvent(SoundEvents.BLOCK_BEEHIVE_EXIT); + public static final CompatSoundEvent BLOCK_BEEHIVE_SHEAR = new CompatSoundEvent(SoundEvents.BLOCK_BEEHIVE_SHEAR); + public static final CompatSoundEvent BLOCK_BEEHIVE_WORK = new CompatSoundEvent(SoundEvents.BLOCK_BEEHIVE_WORK); + public static final CompatSoundEvent BLOCK_BELL_USE = new CompatSoundEvent(SoundEvents.BLOCK_BELL_USE); + public static final CompatSoundEvent BLOCK_BELL_RESONATE = new CompatSoundEvent(SoundEvents.BLOCK_BELL_RESONATE); + public static final CompatSoundEvent BLOCK_BIG_DRIPLEAF_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_BIG_DRIPLEAF_BREAK); + public static final CompatSoundEvent BLOCK_BIG_DRIPLEAF_FALL = new CompatSoundEvent(SoundEvents.BLOCK_BIG_DRIPLEAF_FALL); + public static final CompatSoundEvent BLOCK_BIG_DRIPLEAF_HIT = new CompatSoundEvent(SoundEvents.BLOCK_BIG_DRIPLEAF_HIT); + public static final CompatSoundEvent BLOCK_BIG_DRIPLEAF_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_BIG_DRIPLEAF_PLACE); + public static final CompatSoundEvent BLOCK_BIG_DRIPLEAF_STEP = new CompatSoundEvent(SoundEvents.BLOCK_BIG_DRIPLEAF_STEP); + public static final CompatSoundEvent ENTITY_BLAZE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_BLAZE_AMBIENT); + public static final CompatSoundEvent ENTITY_BLAZE_BURN = new CompatSoundEvent(SoundEvents.ENTITY_BLAZE_BURN); + public static final CompatSoundEvent ENTITY_BLAZE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_BLAZE_DEATH); + public static final CompatSoundEvent ENTITY_BLAZE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_BLAZE_HURT); + public static final CompatSoundEvent ENTITY_BLAZE_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_BLAZE_SHOOT); + public static final CompatSoundEvent ENTITY_BOAT_PADDLE_LAND = new CompatSoundEvent(SoundEvents.ENTITY_BOAT_PADDLE_LAND); + public static final CompatSoundEvent ENTITY_BOAT_PADDLE_WATER = new CompatSoundEvent(SoundEvents.ENTITY_BOAT_PADDLE_WATER); + public static final CompatSoundEvent ENTITY_BOGGED_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_BOGGED_AMBIENT); + public static final CompatSoundEvent ENTITY_BOGGED_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_BOGGED_DEATH); + public static final CompatSoundEvent ENTITY_BOGGED_HURT = new CompatSoundEvent(SoundEvents.ENTITY_BOGGED_HURT); + public static final CompatSoundEvent ENTITY_BOGGED_SHEAR = new CompatSoundEvent(SoundEvents.ENTITY_BOGGED_SHEAR); + public static final CompatSoundEvent ENTITY_BOGGED_STEP = new CompatSoundEvent(SoundEvents.ENTITY_BOGGED_STEP); + public static final CompatSoundEvent BLOCK_BONE_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_BONE_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_BONE_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_BONE_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_BONE_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_BONE_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_BONE_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_BONE_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_BONE_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_BONE_BLOCK_STEP); + public static final CompatSoundEvent ITEM_BONE_MEAL_USE = new CompatSoundEvent(SoundEvents.ITEM_BONE_MEAL_USE); + public static final CompatSoundEvent ITEM_BOOK_PAGE_TURN = new CompatSoundEvent(SoundEvents.ITEM_BOOK_PAGE_TURN); + public static final CompatSoundEvent ITEM_BOOK_PUT = new CompatSoundEvent(SoundEvents.ITEM_BOOK_PUT); + public static final CompatSoundEvent BLOCK_BLASTFURNACE_FIRE_CRACKLE = new CompatSoundEvent(SoundEvents.BLOCK_BLASTFURNACE_FIRE_CRACKLE); + public static final CompatSoundEvent ITEM_BOTTLE_EMPTY = new CompatSoundEvent(SoundEvents.ITEM_BOTTLE_EMPTY); + public static final CompatSoundEvent ITEM_BOTTLE_FILL = new CompatSoundEvent(SoundEvents.ITEM_BOTTLE_FILL); + public static final CompatSoundEvent ITEM_BOTTLE_FILL_DRAGONBREATH = new CompatSoundEvent(SoundEvents.ITEM_BOTTLE_FILL_DRAGONBREATH); + public static final CompatSoundEvent ENTITY_BREEZE_CHARGE = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_CHARGE); + public static final CompatSoundEvent ENTITY_BREEZE_DEFLECT = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_DEFLECT); + public static final CompatSoundEvent ENTITY_BREEZE_INHALE = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_INHALE); + public static final CompatSoundEvent ENTITY_BREEZE_IDLE_GROUND = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_IDLE_GROUND); + public static final CompatSoundEvent ENTITY_BREEZE_IDLE_AIR = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_IDLE_AIR); + public static final CompatSoundEvent ENTITY_BREEZE_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_SHOOT); + public static final CompatSoundEvent ENTITY_BREEZE_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_JUMP); + public static final CompatSoundEvent ENTITY_BREEZE_LAND = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_LAND); + public static final CompatSoundEvent ENTITY_BREEZE_SLIDE = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_SLIDE); + public static final CompatSoundEvent ENTITY_BREEZE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_DEATH); + public static final CompatSoundEvent ENTITY_BREEZE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_HURT); + public static final CompatSoundEvent ENTITY_BREEZE_WHIRL = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_WHIRL); + public static final CompatSoundEvent ENTITY_BREEZE_WIND_BURST = new CompatSoundEvent(SoundEvents.ENTITY_BREEZE_WIND_BURST); + public static final CompatSoundEvent BLOCK_BREWING_STAND_BREW = new CompatSoundEvent(SoundEvents.BLOCK_BREWING_STAND_BREW); + public static final CompatSoundEvent ITEM_BRUSH_BRUSHING_GENERIC = new CompatSoundEvent(SoundEvents.ITEM_BRUSH_BRUSHING_GENERIC); + public static final CompatSoundEvent ITEM_BRUSH_BRUSHING_SAND = new CompatSoundEvent(SoundEvents.ITEM_BRUSH_BRUSHING_SAND); + public static final CompatSoundEvent ITEM_BRUSH_BRUSHING_GRAVEL = new CompatSoundEvent(SoundEvents.ITEM_BRUSH_BRUSHING_GRAVEL); + public static final CompatSoundEvent ITEM_BRUSH_BRUSHING_SAND_COMPLETE = new CompatSoundEvent(SoundEvents.ITEM_BRUSH_BRUSHING_SAND_COMPLETE); + public static final CompatSoundEvent ITEM_BRUSH_BRUSHING_GRAVEL_COMPLETE = new CompatSoundEvent(SoundEvents.ITEM_BRUSH_BRUSHING_GRAVEL_COMPLETE); + public static final CompatSoundEvent BLOCK_BUBBLE_COLUMN_BUBBLE_POP = new CompatSoundEvent(SoundEvents.BLOCK_BUBBLE_COLUMN_BUBBLE_POP); + public static final CompatSoundEvent BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_BUBBLE_COLUMN_UPWARDS_AMBIENT); + public static final CompatSoundEvent BLOCK_BUBBLE_COLUMN_UPWARDS_INSIDE = new CompatSoundEvent(SoundEvents.BLOCK_BUBBLE_COLUMN_UPWARDS_INSIDE); + public static final CompatSoundEvent BLOCK_BUBBLE_COLUMN_WHIRLPOOL_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_BUBBLE_COLUMN_WHIRLPOOL_AMBIENT); + public static final CompatSoundEvent BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE = new CompatSoundEvent(SoundEvents.BLOCK_BUBBLE_COLUMN_WHIRLPOOL_INSIDE); + public static final CompatSoundEvent ITEM_BUCKET_EMPTY = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_EMPTY); + public static final CompatSoundEvent ITEM_BUCKET_EMPTY_AXOLOTL = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_EMPTY_AXOLOTL); + public static final CompatSoundEvent ITEM_BUCKET_EMPTY_FISH = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_EMPTY_FISH); + public static final CompatSoundEvent ITEM_BUCKET_EMPTY_LAVA = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_EMPTY_LAVA); + public static final CompatSoundEvent ITEM_BUCKET_EMPTY_POWDER_SNOW = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_EMPTY_POWDER_SNOW); + public static final CompatSoundEvent ITEM_BUCKET_EMPTY_TADPOLE = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_EMPTY_TADPOLE); + public static final CompatSoundEvent ITEM_BUCKET_FILL = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_FILL); + public static final CompatSoundEvent ITEM_BUCKET_FILL_AXOLOTL = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_FILL_AXOLOTL); + public static final CompatSoundEvent ITEM_BUCKET_FILL_FISH = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_FILL_FISH); + public static final CompatSoundEvent ITEM_BUCKET_FILL_LAVA = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_FILL_LAVA); + public static final CompatSoundEvent ITEM_BUCKET_FILL_POWDER_SNOW = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_FILL_POWDER_SNOW); + public static final CompatSoundEvent ITEM_BUCKET_FILL_TADPOLE = new CompatSoundEvent(SoundEvents.ITEM_BUCKET_FILL_TADPOLE); + public static final CompatSoundEvent ITEM_BUNDLE_DROP_CONTENTS = new CompatSoundEvent(SoundEvents.ITEM_BUNDLE_DROP_CONTENTS); + public static final CompatSoundEvent ITEM_BUNDLE_INSERT = new CompatSoundEvent(SoundEvents.ITEM_BUNDLE_INSERT); + public static final CompatSoundEvent ITEM_BUNDLE_REMOVE_ONE = new CompatSoundEvent(SoundEvents.ITEM_BUNDLE_REMOVE_ONE); + public static final CompatSoundEvent BLOCK_CAKE_ADD_CANDLE = new CompatSoundEvent(SoundEvents.BLOCK_CAKE_ADD_CANDLE); + public static final CompatSoundEvent BLOCK_CALCITE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CALCITE_BREAK); + public static final CompatSoundEvent BLOCK_CALCITE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CALCITE_STEP); + public static final CompatSoundEvent BLOCK_CALCITE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CALCITE_PLACE); + public static final CompatSoundEvent BLOCK_CALCITE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CALCITE_HIT); + public static final CompatSoundEvent BLOCK_CALCITE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CALCITE_FALL); + public static final CompatSoundEvent ENTITY_CAMEL_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_AMBIENT); + public static final CompatSoundEvent ENTITY_CAMEL_DASH = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_DASH); + public static final CompatSoundEvent ENTITY_CAMEL_DASH_READY = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_DASH_READY); + public static final CompatSoundEvent ENTITY_CAMEL_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_DEATH); + public static final CompatSoundEvent ENTITY_CAMEL_EAT = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_EAT); + public static final CompatSoundEvent ENTITY_CAMEL_HURT = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_HURT); + public static final CompatSoundEvent ENTITY_CAMEL_SADDLE = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_SADDLE); + public static final CompatSoundEvent ENTITY_CAMEL_SIT = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_SIT); + public static final CompatSoundEvent ENTITY_CAMEL_STAND = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_STAND); + public static final CompatSoundEvent ENTITY_CAMEL_STEP = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_STEP); + public static final CompatSoundEvent ENTITY_CAMEL_STEP_SAND = new CompatSoundEvent(SoundEvents.ENTITY_CAMEL_STEP_SAND); + public static final CompatSoundEvent BLOCK_CAMPFIRE_CRACKLE = new CompatSoundEvent(SoundEvents.BLOCK_CAMPFIRE_CRACKLE); + public static final CompatSoundEvent BLOCK_CANDLE_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_CANDLE_AMBIENT); + public static final CompatSoundEvent BLOCK_CANDLE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CANDLE_BREAK); + public static final CompatSoundEvent BLOCK_CANDLE_EXTINGUISH = new CompatSoundEvent(SoundEvents.BLOCK_CANDLE_EXTINGUISH); + public static final CompatSoundEvent BLOCK_CANDLE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CANDLE_FALL); + public static final CompatSoundEvent BLOCK_CANDLE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CANDLE_HIT); + public static final CompatSoundEvent BLOCK_CANDLE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CANDLE_PLACE); + public static final CompatSoundEvent BLOCK_CANDLE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CANDLE_STEP); + public static final CompatSoundEvent ENTITY_CAT_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_CAT_AMBIENT); + public static final CompatSoundEvent ENTITY_CAT_STRAY_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_CAT_STRAY_AMBIENT); + public static final CompatSoundEvent ENTITY_CAT_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_CAT_DEATH); + public static final CompatSoundEvent ENTITY_CAT_EAT = new CompatSoundEvent(SoundEvents.ENTITY_CAT_EAT); + public static final CompatSoundEvent ENTITY_CAT_HISS = new CompatSoundEvent(SoundEvents.ENTITY_CAT_HISS); + public static final CompatSoundEvent ENTITY_CAT_BEG_FOR_FOOD = new CompatSoundEvent(SoundEvents.ENTITY_CAT_BEG_FOR_FOOD); + public static final CompatSoundEvent ENTITY_CAT_HURT = new CompatSoundEvent(SoundEvents.ENTITY_CAT_HURT); + public static final CompatSoundEvent ENTITY_CAT_PURR = new CompatSoundEvent(SoundEvents.ENTITY_CAT_PURR); + public static final CompatSoundEvent ENTITY_CAT_PURREOW = new CompatSoundEvent(SoundEvents.ENTITY_CAT_PURREOW); + public static final CompatSoundEvent BLOCK_CAVE_VINES_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CAVE_VINES_BREAK); + public static final CompatSoundEvent BLOCK_CAVE_VINES_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CAVE_VINES_FALL); + public static final CompatSoundEvent BLOCK_CAVE_VINES_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CAVE_VINES_HIT); + public static final CompatSoundEvent BLOCK_CAVE_VINES_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CAVE_VINES_PLACE); + public static final CompatSoundEvent BLOCK_CAVE_VINES_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CAVE_VINES_STEP); + public static final CompatSoundEvent BLOCK_CAVE_VINES_PICK_BERRIES = new CompatSoundEvent(SoundEvents.BLOCK_CAVE_VINES_PICK_BERRIES); + public static final CompatSoundEvent BLOCK_CHAIN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CHAIN_BREAK); + public static final CompatSoundEvent BLOCK_CHAIN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CHAIN_FALL); + public static final CompatSoundEvent BLOCK_CHAIN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CHAIN_HIT); + public static final CompatSoundEvent BLOCK_CHAIN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CHAIN_PLACE); + public static final CompatSoundEvent BLOCK_CHAIN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CHAIN_STEP); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_BREAK); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_FALL); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_HIT); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_PLACE); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_STEP); + public static final CompatSoundEvent BLOCK_CHERRY_SAPLING_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_SAPLING_BREAK); + public static final CompatSoundEvent BLOCK_CHERRY_SAPLING_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_SAPLING_FALL); + public static final CompatSoundEvent BLOCK_CHERRY_SAPLING_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_SAPLING_HIT); + public static final CompatSoundEvent BLOCK_CHERRY_SAPLING_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_SAPLING_PLACE); + public static final CompatSoundEvent BLOCK_CHERRY_SAPLING_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_SAPLING_STEP); + public static final CompatSoundEvent BLOCK_CHERRY_LEAVES_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_LEAVES_BREAK); + public static final CompatSoundEvent BLOCK_CHERRY_LEAVES_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_LEAVES_FALL); + public static final CompatSoundEvent BLOCK_CHERRY_LEAVES_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_LEAVES_HIT); + public static final CompatSoundEvent BLOCK_CHERRY_LEAVES_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_LEAVES_PLACE); + public static final CompatSoundEvent BLOCK_CHERRY_LEAVES_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_LEAVES_STEP); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_HANGING_SIGN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_HANGING_SIGN_STEP); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_HANGING_SIGN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_HANGING_SIGN_BREAK); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_HANGING_SIGN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_HANGING_SIGN_FALL); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_HANGING_SIGN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_HANGING_SIGN_HIT); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_HANGING_SIGN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_HANGING_SIGN_PLACE); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_DOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_DOOR_CLOSE); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_DOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_DOOR_OPEN); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_TRAPDOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_TRAPDOOR_CLOSE); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_TRAPDOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_TRAPDOOR_OPEN); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_BUTTON_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_BUTTON_CLICK_OFF); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_BUTTON_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_BUTTON_CLICK_ON); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_OFF); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_ON); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_FENCE_GATE_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_FENCE_GATE_CLOSE); + public static final CompatSoundEvent BLOCK_CHERRY_WOOD_FENCE_GATE_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_CHERRY_WOOD_FENCE_GATE_OPEN); + public static final CompatSoundEvent BLOCK_CHEST_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_CHEST_CLOSE); + public static final CompatSoundEvent BLOCK_CHEST_LOCKED = new CompatSoundEvent(SoundEvents.BLOCK_CHEST_LOCKED); + public static final CompatSoundEvent BLOCK_CHEST_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_CHEST_OPEN); + public static final CompatSoundEvent ENTITY_CHICKEN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_CHICKEN_AMBIENT); + public static final CompatSoundEvent ENTITY_CHICKEN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_CHICKEN_DEATH); + public static final CompatSoundEvent ENTITY_CHICKEN_EGG = new CompatSoundEvent(SoundEvents.ENTITY_CHICKEN_EGG); + public static final CompatSoundEvent ENTITY_CHICKEN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_CHICKEN_HURT); + public static final CompatSoundEvent ENTITY_CHICKEN_STEP = new CompatSoundEvent(SoundEvents.ENTITY_CHICKEN_STEP); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_BREAK); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_FALL); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_HIT); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_INSERT = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_INSERT); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_INSERT_ENCHANTED = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_INSERT_ENCHANTED); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_STEP); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_PICKUP = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_PICKUP); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_PICKUP_ENCHANTED = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_PICKUP_ENCHANTED); + public static final CompatSoundEvent BLOCK_CHISELED_BOOKSHELF_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CHISELED_BOOKSHELF_PLACE); + public static final CompatSoundEvent BLOCK_CHORUS_FLOWER_DEATH = new CompatSoundEvent(SoundEvents.BLOCK_CHORUS_FLOWER_DEATH); + public static final CompatSoundEvent BLOCK_CHORUS_FLOWER_GROW = new CompatSoundEvent(SoundEvents.BLOCK_CHORUS_FLOWER_GROW); + public static final CompatSoundEvent ITEM_CHORUS_FRUIT_TELEPORT = new CompatSoundEvent(SoundEvents.ITEM_CHORUS_FRUIT_TELEPORT); + public static final CompatSoundEvent BLOCK_COBWEB_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_COBWEB_BREAK); + public static final CompatSoundEvent BLOCK_COBWEB_STEP = new CompatSoundEvent(SoundEvents.BLOCK_COBWEB_STEP); + public static final CompatSoundEvent BLOCK_COBWEB_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_COBWEB_PLACE); + public static final CompatSoundEvent BLOCK_COBWEB_HIT = new CompatSoundEvent(SoundEvents.BLOCK_COBWEB_HIT); + public static final CompatSoundEvent BLOCK_COBWEB_FALL = new CompatSoundEvent(SoundEvents.BLOCK_COBWEB_FALL); + public static final CompatSoundEvent ENTITY_COD_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_COD_AMBIENT); + public static final CompatSoundEvent ENTITY_COD_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_COD_DEATH); + public static final CompatSoundEvent ENTITY_COD_FLOP = new CompatSoundEvent(SoundEvents.ENTITY_COD_FLOP); + public static final CompatSoundEvent ENTITY_COD_HURT = new CompatSoundEvent(SoundEvents.ENTITY_COD_HURT); + public static final CompatSoundEvent BLOCK_COMPARATOR_CLICK = new CompatSoundEvent(SoundEvents.BLOCK_COMPARATOR_CLICK); + public static final CompatSoundEvent BLOCK_COMPOSTER_EMPTY = new CompatSoundEvent(SoundEvents.BLOCK_COMPOSTER_EMPTY); + public static final CompatSoundEvent BLOCK_COMPOSTER_FILL = new CompatSoundEvent(SoundEvents.BLOCK_COMPOSTER_FILL); + public static final CompatSoundEvent BLOCK_COMPOSTER_FILL_SUCCESS = new CompatSoundEvent(SoundEvents.BLOCK_COMPOSTER_FILL_SUCCESS); + public static final CompatSoundEvent BLOCK_COMPOSTER_READY = new CompatSoundEvent(SoundEvents.BLOCK_COMPOSTER_READY); + public static final CompatSoundEvent BLOCK_CONDUIT_ACTIVATE = new CompatSoundEvent(SoundEvents.BLOCK_CONDUIT_ACTIVATE); + public static final CompatSoundEvent BLOCK_CONDUIT_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_CONDUIT_AMBIENT); + public static final CompatSoundEvent BLOCK_CONDUIT_AMBIENT_SHORT = new CompatSoundEvent(SoundEvents.BLOCK_CONDUIT_AMBIENT_SHORT); + public static final CompatSoundEvent BLOCK_CONDUIT_ATTACK_TARGET = new CompatSoundEvent(SoundEvents.BLOCK_CONDUIT_ATTACK_TARGET); + public static final CompatSoundEvent BLOCK_CONDUIT_DEACTIVATE = new CompatSoundEvent(SoundEvents.BLOCK_CONDUIT_DEACTIVATE); + public static final CompatSoundEvent BLOCK_COPPER_BULB_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BULB_BREAK); + public static final CompatSoundEvent BLOCK_COPPER_BULB_STEP = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BULB_STEP); + public static final CompatSoundEvent BLOCK_COPPER_BULB_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BULB_PLACE); + public static final CompatSoundEvent BLOCK_COPPER_BULB_HIT = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BULB_HIT); + public static final CompatSoundEvent BLOCK_COPPER_BULB_FALL = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BULB_FALL); + public static final CompatSoundEvent BLOCK_COPPER_BULB_TURN_ON = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BULB_TURN_ON); + public static final CompatSoundEvent BLOCK_COPPER_BULB_TURN_OFF = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BULB_TURN_OFF); + public static final CompatSoundEvent BLOCK_COPPER_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_BREAK); + public static final CompatSoundEvent BLOCK_COPPER_STEP = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_STEP); + public static final CompatSoundEvent BLOCK_COPPER_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_PLACE); + public static final CompatSoundEvent BLOCK_COPPER_HIT = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_HIT); + public static final CompatSoundEvent BLOCK_COPPER_FALL = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_FALL); + public static final CompatSoundEvent BLOCK_COPPER_DOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_DOOR_CLOSE); + public static final CompatSoundEvent BLOCK_COPPER_DOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_DOOR_OPEN); + public static final CompatSoundEvent BLOCK_COPPER_GRATE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_GRATE_BREAK); + public static final CompatSoundEvent BLOCK_COPPER_GRATE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_GRATE_STEP); + public static final CompatSoundEvent BLOCK_COPPER_GRATE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_GRATE_PLACE); + public static final CompatSoundEvent BLOCK_COPPER_GRATE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_GRATE_HIT); + public static final CompatSoundEvent BLOCK_COPPER_GRATE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_GRATE_FALL); + public static final CompatSoundEvent BLOCK_COPPER_TRAPDOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_TRAPDOOR_CLOSE); + public static final CompatSoundEvent BLOCK_COPPER_TRAPDOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_COPPER_TRAPDOOR_OPEN); + public static final CompatSoundEvent BLOCK_CORAL_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CORAL_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_CORAL_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_CORAL_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_CORAL_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_CORAL_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_CORAL_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_CORAL_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_CORAL_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_CORAL_BLOCK_STEP); + public static final CompatSoundEvent ENTITY_COW_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_COW_AMBIENT); + public static final CompatSoundEvent ENTITY_COW_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_COW_DEATH); + public static final CompatSoundEvent ENTITY_COW_HURT = new CompatSoundEvent(SoundEvents.ENTITY_COW_HURT); + public static final CompatSoundEvent ENTITY_COW_MILK = new CompatSoundEvent(SoundEvents.ENTITY_COW_MILK); + public static final CompatSoundEvent ENTITY_COW_STEP = new CompatSoundEvent(SoundEvents.ENTITY_COW_STEP); + public static final CompatSoundEvent BLOCK_CRAFTER_CRAFT = new CompatSoundEvent(SoundEvents.BLOCK_CRAFTER_CRAFT); + public static final CompatSoundEvent BLOCK_CRAFTER_FAIL = new CompatSoundEvent(SoundEvents.BLOCK_CRAFTER_FAIL); + public static final CompatSoundEvent ENTITY_CREEPER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_CREEPER_DEATH); + public static final CompatSoundEvent ENTITY_CREEPER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_CREEPER_HURT); + public static final CompatSoundEvent ENTITY_CREEPER_PRIMED = new CompatSoundEvent(SoundEvents.ENTITY_CREEPER_PRIMED); + public static final CompatSoundEvent BLOCK_CROP_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_CROP_BREAK); + public static final CompatSoundEvent ITEM_CROP_PLANT = new CompatSoundEvent(SoundEvents.ITEM_CROP_PLANT); + public static final CompatSoundEvent ITEM_CROSSBOW_HIT = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_HIT); + public static final CompatSoundEvent ITEM_CROSSBOW_LOADING_END = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_LOADING_END); + public static final CompatSoundEvent ITEM_CROSSBOW_LOADING_MIDDLE = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_LOADING_MIDDLE); + public static final CompatSoundEvent ITEM_CROSSBOW_LOADING_START = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_LOADING_START); + public static final CompatSoundEvent ITEM_CROSSBOW_QUICK_CHARGE_1 = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_QUICK_CHARGE_1); + public static final CompatSoundEvent ITEM_CROSSBOW_QUICK_CHARGE_2 = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_QUICK_CHARGE_2); + public static final CompatSoundEvent ITEM_CROSSBOW_QUICK_CHARGE_3 = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_QUICK_CHARGE_3); + public static final CompatSoundEvent ITEM_CROSSBOW_SHOOT = new CompatSoundEvent(SoundEvents.ITEM_CROSSBOW_SHOOT); + public static final CompatSoundEvent BLOCK_DECORATED_POT_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_BREAK); + public static final CompatSoundEvent BLOCK_DECORATED_POT_FALL = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_FALL); + public static final CompatSoundEvent BLOCK_DECORATED_POT_HIT = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_HIT); + public static final CompatSoundEvent BLOCK_DECORATED_POT_INSERT = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_INSERT); + public static final CompatSoundEvent BLOCK_DECORATED_POT_INSERT_FAIL = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_INSERT_FAIL); + public static final CompatSoundEvent BLOCK_DECORATED_POT_STEP = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_STEP); + public static final CompatSoundEvent BLOCK_DECORATED_POT_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_PLACE); + public static final CompatSoundEvent BLOCK_DECORATED_POT_SHATTER = new CompatSoundEvent(SoundEvents.BLOCK_DECORATED_POT_SHATTER); + public static final CompatSoundEvent BLOCK_DEEPSLATE_BRICKS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_BRICKS_BREAK); + public static final CompatSoundEvent BLOCK_DEEPSLATE_BRICKS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_BRICKS_FALL); + public static final CompatSoundEvent BLOCK_DEEPSLATE_BRICKS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_BRICKS_HIT); + public static final CompatSoundEvent BLOCK_DEEPSLATE_BRICKS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_BRICKS_PLACE); + public static final CompatSoundEvent BLOCK_DEEPSLATE_BRICKS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_BRICKS_STEP); + public static final CompatSoundEvent BLOCK_DEEPSLATE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_BREAK); + public static final CompatSoundEvent BLOCK_DEEPSLATE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_FALL); + public static final CompatSoundEvent BLOCK_DEEPSLATE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_HIT); + public static final CompatSoundEvent BLOCK_DEEPSLATE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_PLACE); + public static final CompatSoundEvent BLOCK_DEEPSLATE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_STEP); + public static final CompatSoundEvent BLOCK_DEEPSLATE_TILES_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_TILES_BREAK); + public static final CompatSoundEvent BLOCK_DEEPSLATE_TILES_FALL = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_TILES_FALL); + public static final CompatSoundEvent BLOCK_DEEPSLATE_TILES_HIT = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_TILES_HIT); + public static final CompatSoundEvent BLOCK_DEEPSLATE_TILES_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_TILES_PLACE); + public static final CompatSoundEvent BLOCK_DEEPSLATE_TILES_STEP = new CompatSoundEvent(SoundEvents.BLOCK_DEEPSLATE_TILES_STEP); + public static final CompatSoundEvent BLOCK_DISPENSER_DISPENSE = new CompatSoundEvent(SoundEvents.BLOCK_DISPENSER_DISPENSE); + public static final CompatSoundEvent BLOCK_DISPENSER_FAIL = new CompatSoundEvent(SoundEvents.BLOCK_DISPENSER_FAIL); + public static final CompatSoundEvent BLOCK_DISPENSER_LAUNCH = new CompatSoundEvent(SoundEvents.BLOCK_DISPENSER_LAUNCH); + public static final CompatSoundEvent ENTITY_DOLPHIN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_AMBIENT); + public static final CompatSoundEvent ENTITY_DOLPHIN_AMBIENT_WATER = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_AMBIENT_WATER); + public static final CompatSoundEvent ENTITY_DOLPHIN_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_ATTACK); + public static final CompatSoundEvent ENTITY_DOLPHIN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_DEATH); + public static final CompatSoundEvent ENTITY_DOLPHIN_EAT = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_EAT); + public static final CompatSoundEvent ENTITY_DOLPHIN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_HURT); + public static final CompatSoundEvent ENTITY_DOLPHIN_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_JUMP); + public static final CompatSoundEvent ENTITY_DOLPHIN_PLAY = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_PLAY); + public static final CompatSoundEvent ENTITY_DOLPHIN_SPLASH = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_SPLASH); + public static final CompatSoundEvent ENTITY_DOLPHIN_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_DOLPHIN_SWIM); + public static final CompatSoundEvent ENTITY_DONKEY_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_DONKEY_AMBIENT); + public static final CompatSoundEvent ENTITY_DONKEY_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_DONKEY_ANGRY); + public static final CompatSoundEvent ENTITY_DONKEY_CHEST = new CompatSoundEvent(SoundEvents.ENTITY_DONKEY_CHEST); + public static final CompatSoundEvent ENTITY_DONKEY_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_DONKEY_DEATH); + public static final CompatSoundEvent ENTITY_DONKEY_EAT = new CompatSoundEvent(SoundEvents.ENTITY_DONKEY_EAT); + public static final CompatSoundEvent ENTITY_DONKEY_HURT = new CompatSoundEvent(SoundEvents.ENTITY_DONKEY_HURT); + public static final CompatSoundEvent ENTITY_DONKEY_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_DONKEY_JUMP); + public static final CompatSoundEvent BLOCK_DRIPSTONE_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_DRIPSTONE_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_DRIPSTONE_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_DRIPSTONE_BLOCK_STEP); + public static final CompatSoundEvent BLOCK_DRIPSTONE_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_DRIPSTONE_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_DRIPSTONE_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_DRIPSTONE_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_DRIPSTONE_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_DRIPSTONE_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_BREAK); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_STEP); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_PLACE); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_HIT); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_FALL); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_LAND = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_LAND); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_DRIP_LAVA = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_DRIP_LAVA); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_DRIP_WATER = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_DRIP_WATER); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_DRIP_LAVA_INTO_CAULDRON = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_DRIP_LAVA_INTO_CAULDRON); + public static final CompatSoundEvent BLOCK_POINTED_DRIPSTONE_DRIP_WATER_INTO_CAULDRON = new CompatSoundEvent(SoundEvents.BLOCK_POINTED_DRIPSTONE_DRIP_WATER_INTO_CAULDRON); + public static final CompatSoundEvent BLOCK_BIG_DRIPLEAF_TILT_DOWN = new CompatSoundEvent(SoundEvents.BLOCK_BIG_DRIPLEAF_TILT_DOWN); + public static final CompatSoundEvent BLOCK_BIG_DRIPLEAF_TILT_UP = new CompatSoundEvent(SoundEvents.BLOCK_BIG_DRIPLEAF_TILT_UP); + public static final CompatSoundEvent ENTITY_DROWNED_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_AMBIENT); + public static final CompatSoundEvent ENTITY_DROWNED_AMBIENT_WATER = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_AMBIENT_WATER); + public static final CompatSoundEvent ENTITY_DROWNED_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_DEATH); + public static final CompatSoundEvent ENTITY_DROWNED_DEATH_WATER = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_DEATH_WATER); + public static final CompatSoundEvent ENTITY_DROWNED_HURT = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_HURT); + public static final CompatSoundEvent ENTITY_DROWNED_HURT_WATER = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_HURT_WATER); + public static final CompatSoundEvent ENTITY_DROWNED_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_SHOOT); + public static final CompatSoundEvent ENTITY_DROWNED_STEP = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_STEP); + public static final CompatSoundEvent ENTITY_DROWNED_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_DROWNED_SWIM); + public static final CompatSoundEvent ITEM_DYE_USE = new CompatSoundEvent(SoundEvents.ITEM_DYE_USE); + public static final CompatSoundEvent ENTITY_EGG_THROW = new CompatSoundEvent(SoundEvents.ENTITY_EGG_THROW); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_AMBIENT); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_AMBIENT_LAND = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_AMBIENT_LAND); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_CURSE = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_CURSE); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_DEATH); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_DEATH_LAND = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_DEATH_LAND); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_FLOP = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_FLOP); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_HURT); + public static final CompatSoundEvent ENTITY_ELDER_GUARDIAN_HURT_LAND = new CompatSoundEvent(SoundEvents.ENTITY_ELDER_GUARDIAN_HURT_LAND); + public static final CompatSoundEvent ITEM_ELYTRA_FLYING = new CompatSoundEvent(SoundEvents.ITEM_ELYTRA_FLYING); + public static final CompatSoundEvent BLOCK_ENCHANTMENT_TABLE_USE = new CompatSoundEvent(SoundEvents.BLOCK_ENCHANTMENT_TABLE_USE); + public static final CompatSoundEvent BLOCK_ENDER_CHEST_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_ENDER_CHEST_CLOSE); + public static final CompatSoundEvent BLOCK_ENDER_CHEST_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_ENDER_CHEST_OPEN); + public static final CompatSoundEvent ENTITY_ENDER_DRAGON_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_DRAGON_AMBIENT); + public static final CompatSoundEvent ENTITY_ENDER_DRAGON_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_DRAGON_DEATH); + public static final CompatSoundEvent ENTITY_DRAGON_FIREBALL_EXPLODE = new CompatSoundEvent(SoundEvents.ENTITY_DRAGON_FIREBALL_EXPLODE); + public static final CompatSoundEvent ENTITY_ENDER_DRAGON_FLAP = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_DRAGON_FLAP); + public static final CompatSoundEvent ENTITY_ENDER_DRAGON_GROWL = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_DRAGON_GROWL); + public static final CompatSoundEvent ENTITY_ENDER_DRAGON_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_DRAGON_HURT); + public static final CompatSoundEvent ENTITY_ENDER_DRAGON_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_DRAGON_SHOOT); + public static final CompatSoundEvent ENTITY_ENDER_EYE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_EYE_DEATH); + public static final CompatSoundEvent ENTITY_ENDER_EYE_LAUNCH = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_EYE_LAUNCH); + public static final CompatSoundEvent ENTITY_ENDERMAN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMAN_AMBIENT); + public static final CompatSoundEvent ENTITY_ENDERMAN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMAN_DEATH); + public static final CompatSoundEvent ENTITY_ENDERMAN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMAN_HURT); + public static final CompatSoundEvent ENTITY_ENDERMAN_SCREAM = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMAN_SCREAM); + public static final CompatSoundEvent ENTITY_ENDERMAN_STARE = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMAN_STARE); + public static final CompatSoundEvent ENTITY_ENDERMAN_TELEPORT = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMAN_TELEPORT); + public static final CompatSoundEvent ENTITY_ENDERMITE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMITE_AMBIENT); + public static final CompatSoundEvent ENTITY_ENDERMITE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMITE_DEATH); + public static final CompatSoundEvent ENTITY_ENDERMITE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMITE_HURT); + public static final CompatSoundEvent ENTITY_ENDERMITE_STEP = new CompatSoundEvent(SoundEvents.ENTITY_ENDERMITE_STEP); + public static final CompatSoundEvent ENTITY_ENDER_PEARL_THROW = new CompatSoundEvent(SoundEvents.ENTITY_ENDER_PEARL_THROW); + public static final CompatSoundEvent BLOCK_END_GATEWAY_SPAWN = new CompatSoundEvent(SoundEvents.BLOCK_END_GATEWAY_SPAWN); + public static final CompatSoundEvent BLOCK_END_PORTAL_FRAME_FILL = new CompatSoundEvent(SoundEvents.BLOCK_END_PORTAL_FRAME_FILL); + public static final CompatSoundEvent BLOCK_END_PORTAL_SPAWN = new CompatSoundEvent(SoundEvents.BLOCK_END_PORTAL_SPAWN); + public static final CompatSoundEvent ENTITY_EVOKER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_AMBIENT); + public static final CompatSoundEvent ENTITY_EVOKER_CAST_SPELL = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_CAST_SPELL); + public static final CompatSoundEvent ENTITY_EVOKER_CELEBRATE = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_CELEBRATE); + public static final CompatSoundEvent ENTITY_EVOKER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_DEATH); + public static final CompatSoundEvent ENTITY_EVOKER_FANGS_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_FANGS_ATTACK); + public static final CompatSoundEvent ENTITY_EVOKER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_HURT); + public static final CompatSoundEvent ENTITY_EVOKER_PREPARE_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_PREPARE_ATTACK); + public static final CompatSoundEvent ENTITY_EVOKER_PREPARE_SUMMON = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_PREPARE_SUMMON); + public static final CompatSoundEvent ENTITY_EVOKER_PREPARE_WOLOLO = new CompatSoundEvent(SoundEvents.ENTITY_EVOKER_PREPARE_WOLOLO); + public static final CompatSoundEvent ENTITY_EXPERIENCE_BOTTLE_THROW = new CompatSoundEvent(SoundEvents.ENTITY_EXPERIENCE_BOTTLE_THROW); + public static final CompatSoundEvent ENTITY_EXPERIENCE_ORB_PICKUP = new CompatSoundEvent(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP); + public static final CompatSoundEvent BLOCK_FENCE_GATE_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_FENCE_GATE_CLOSE); + public static final CompatSoundEvent BLOCK_FENCE_GATE_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_FENCE_GATE_OPEN); + public static final CompatSoundEvent ITEM_FIRECHARGE_USE = new CompatSoundEvent(SoundEvents.ITEM_FIRECHARGE_USE); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_BLAST = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_BLAST); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_BLAST_FAR = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_BLAST_FAR); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_LARGE_BLAST = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_LARGE_BLAST); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_LARGE_BLAST_FAR = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_LARGE_BLAST_FAR); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_LAUNCH = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_LAUNCH); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_SHOOT); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_TWINKLE = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_TWINKLE); + public static final CompatSoundEvent ENTITY_FIREWORK_ROCKET_TWINKLE_FAR = new CompatSoundEvent(SoundEvents.ENTITY_FIREWORK_ROCKET_TWINKLE_FAR); + public static final CompatSoundEvent BLOCK_FIRE_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_FIRE_AMBIENT); + public static final CompatSoundEvent BLOCK_FIRE_EXTINGUISH = new CompatSoundEvent(SoundEvents.BLOCK_FIRE_EXTINGUISH); + public static final CompatSoundEvent ENTITY_FISH_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_FISH_SWIM); + public static final CompatSoundEvent ENTITY_FISHING_BOBBER_RETRIEVE = new CompatSoundEvent(SoundEvents.ENTITY_FISHING_BOBBER_RETRIEVE); + public static final CompatSoundEvent ENTITY_FISHING_BOBBER_SPLASH = new CompatSoundEvent(SoundEvents.ENTITY_FISHING_BOBBER_SPLASH); + public static final CompatSoundEvent ENTITY_FISHING_BOBBER_THROW = new CompatSoundEvent(SoundEvents.ENTITY_FISHING_BOBBER_THROW); + public static final CompatSoundEvent ITEM_FLINTANDSTEEL_USE = new CompatSoundEvent(SoundEvents.ITEM_FLINTANDSTEEL_USE); + public static final CompatSoundEvent BLOCK_FLOWERING_AZALEA_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_FLOWERING_AZALEA_BREAK); + public static final CompatSoundEvent BLOCK_FLOWERING_AZALEA_FALL = new CompatSoundEvent(SoundEvents.BLOCK_FLOWERING_AZALEA_FALL); + public static final CompatSoundEvent BLOCK_FLOWERING_AZALEA_HIT = new CompatSoundEvent(SoundEvents.BLOCK_FLOWERING_AZALEA_HIT); + public static final CompatSoundEvent BLOCK_FLOWERING_AZALEA_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_FLOWERING_AZALEA_PLACE); + public static final CompatSoundEvent BLOCK_FLOWERING_AZALEA_STEP = new CompatSoundEvent(SoundEvents.BLOCK_FLOWERING_AZALEA_STEP); + public static final CompatSoundEvent ENTITY_FOX_AGGRO = new CompatSoundEvent(SoundEvents.ENTITY_FOX_AGGRO); + public static final CompatSoundEvent ENTITY_FOX_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_FOX_AMBIENT); + public static final CompatSoundEvent ENTITY_FOX_BITE = new CompatSoundEvent(SoundEvents.ENTITY_FOX_BITE); + public static final CompatSoundEvent ENTITY_FOX_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_FOX_DEATH); + public static final CompatSoundEvent ENTITY_FOX_EAT = new CompatSoundEvent(SoundEvents.ENTITY_FOX_EAT); + public static final CompatSoundEvent ENTITY_FOX_HURT = new CompatSoundEvent(SoundEvents.ENTITY_FOX_HURT); + public static final CompatSoundEvent ENTITY_FOX_SCREECH = new CompatSoundEvent(SoundEvents.ENTITY_FOX_SCREECH); + public static final CompatSoundEvent ENTITY_FOX_SLEEP = new CompatSoundEvent(SoundEvents.ENTITY_FOX_SLEEP); + public static final CompatSoundEvent ENTITY_FOX_SNIFF = new CompatSoundEvent(SoundEvents.ENTITY_FOX_SNIFF); + public static final CompatSoundEvent ENTITY_FOX_SPIT = new CompatSoundEvent(SoundEvents.ENTITY_FOX_SPIT); + public static final CompatSoundEvent ENTITY_FOX_TELEPORT = new CompatSoundEvent(SoundEvents.ENTITY_FOX_TELEPORT); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_SAND_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_SAND_BREAK); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_SAND_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_SAND_STEP); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_SAND_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_SAND_PLACE); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_SAND_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_SAND_HIT); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_SAND_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_SAND_FALL); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_GRAVEL_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_GRAVEL_BREAK); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_GRAVEL_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_GRAVEL_STEP); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_GRAVEL_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_GRAVEL_PLACE); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_GRAVEL_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_GRAVEL_HIT); + public static final CompatSoundEvent BLOCK_SUSPICIOUS_GRAVEL_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SUSPICIOUS_GRAVEL_FALL); + public static final CompatSoundEvent BLOCK_FROGLIGHT_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_FROGLIGHT_BREAK); + public static final CompatSoundEvent BLOCK_FROGLIGHT_FALL = new CompatSoundEvent(SoundEvents.BLOCK_FROGLIGHT_FALL); + public static final CompatSoundEvent BLOCK_FROGLIGHT_HIT = new CompatSoundEvent(SoundEvents.BLOCK_FROGLIGHT_HIT); + public static final CompatSoundEvent BLOCK_FROGLIGHT_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_FROGLIGHT_PLACE); + public static final CompatSoundEvent BLOCK_FROGLIGHT_STEP = new CompatSoundEvent(SoundEvents.BLOCK_FROGLIGHT_STEP); + public static final CompatSoundEvent BLOCK_FROGSPAWN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_FROGSPAWN_STEP); + public static final CompatSoundEvent BLOCK_FROGSPAWN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_FROGSPAWN_BREAK); + public static final CompatSoundEvent BLOCK_FROGSPAWN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_FROGSPAWN_FALL); + public static final CompatSoundEvent BLOCK_FROGSPAWN_HATCH = new CompatSoundEvent(SoundEvents.BLOCK_FROGSPAWN_HATCH); + public static final CompatSoundEvent BLOCK_FROGSPAWN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_FROGSPAWN_HIT); + public static final CompatSoundEvent BLOCK_FROGSPAWN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_FROGSPAWN_PLACE); + public static final CompatSoundEvent ENTITY_FROG_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_FROG_AMBIENT); + public static final CompatSoundEvent ENTITY_FROG_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_FROG_DEATH); + public static final CompatSoundEvent ENTITY_FROG_EAT = new CompatSoundEvent(SoundEvents.ENTITY_FROG_EAT); + public static final CompatSoundEvent ENTITY_FROG_HURT = new CompatSoundEvent(SoundEvents.ENTITY_FROG_HURT); + public static final CompatSoundEvent ENTITY_FROG_LAY_SPAWN = new CompatSoundEvent(SoundEvents.ENTITY_FROG_LAY_SPAWN); + public static final CompatSoundEvent ENTITY_FROG_LONG_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_FROG_LONG_JUMP); + public static final CompatSoundEvent ENTITY_FROG_STEP = new CompatSoundEvent(SoundEvents.ENTITY_FROG_STEP); + public static final CompatSoundEvent ENTITY_FROG_TONGUE = new CompatSoundEvent(SoundEvents.ENTITY_FROG_TONGUE); + public static final CompatSoundEvent BLOCK_ROOTS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_ROOTS_BREAK); + public static final CompatSoundEvent BLOCK_ROOTS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_ROOTS_STEP); + public static final CompatSoundEvent BLOCK_ROOTS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_ROOTS_PLACE); + public static final CompatSoundEvent BLOCK_ROOTS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_ROOTS_HIT); + public static final CompatSoundEvent BLOCK_ROOTS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_ROOTS_FALL); + public static final CompatSoundEvent BLOCK_FURNACE_FIRE_CRACKLE = new CompatSoundEvent(SoundEvents.BLOCK_FURNACE_FIRE_CRACKLE); + public static final CompatSoundEvent ENTITY_GENERIC_BIG_FALL = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_BIG_FALL); + public static final CompatSoundEvent ENTITY_GENERIC_BURN = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_BURN); + public static final CompatSoundEvent ENTITY_GENERIC_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_DEATH); + public static final CompatSoundEvent ENTITY_GENERIC_DRINK = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_DRINK); + public static final CompatSoundEvent ENTITY_GENERIC_EAT = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_EAT); + public static final CompatSoundEvent ENTITY_GENERIC_EXPLODE = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_EXPLODE); + public static final CompatSoundEvent ENTITY_GENERIC_EXTINGUISH_FIRE = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_EXTINGUISH_FIRE); + public static final CompatSoundEvent ENTITY_GENERIC_HURT = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_HURT); + public static final CompatSoundEvent ENTITY_GENERIC_SMALL_FALL = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_SMALL_FALL); + public static final CompatSoundEvent ENTITY_GENERIC_SPLASH = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_SPLASH); + public static final CompatSoundEvent ENTITY_GENERIC_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_GENERIC_SWIM); + public static final CompatSoundEvent ENTITY_GHAST_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_AMBIENT); + public static final CompatSoundEvent ENTITY_GHAST_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_DEATH); + public static final CompatSoundEvent ENTITY_GHAST_HURT = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_HURT); + public static final CompatSoundEvent ENTITY_GHAST_SCREAM = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_SCREAM); + public static final CompatSoundEvent ENTITY_GHAST_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_SHOOT); + public static final CompatSoundEvent ENTITY_GHAST_WARN = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_WARN); + public static final CompatSoundEvent BLOCK_GILDED_BLACKSTONE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_GILDED_BLACKSTONE_BREAK); + public static final CompatSoundEvent BLOCK_GILDED_BLACKSTONE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_GILDED_BLACKSTONE_FALL); + public static final CompatSoundEvent BLOCK_GILDED_BLACKSTONE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_GILDED_BLACKSTONE_HIT); + public static final CompatSoundEvent BLOCK_GILDED_BLACKSTONE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_GILDED_BLACKSTONE_PLACE); + public static final CompatSoundEvent BLOCK_GILDED_BLACKSTONE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_GILDED_BLACKSTONE_STEP); + public static final CompatSoundEvent BLOCK_GLASS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_GLASS_BREAK); + public static final CompatSoundEvent BLOCK_GLASS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_GLASS_FALL); + public static final CompatSoundEvent BLOCK_GLASS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_GLASS_HIT); + public static final CompatSoundEvent BLOCK_GLASS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_GLASS_PLACE); + public static final CompatSoundEvent BLOCK_GLASS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_GLASS_STEP); + public static final CompatSoundEvent ITEM_GLOW_INK_SAC_USE = new CompatSoundEvent(SoundEvents.ITEM_GLOW_INK_SAC_USE); + public static final CompatSoundEvent ENTITY_GLOW_ITEM_FRAME_ADD_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_ITEM_FRAME_ADD_ITEM); + public static final CompatSoundEvent ENTITY_GLOW_ITEM_FRAME_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_ITEM_FRAME_BREAK); + public static final CompatSoundEvent ENTITY_GLOW_ITEM_FRAME_PLACE = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_ITEM_FRAME_PLACE); + public static final CompatSoundEvent ENTITY_GLOW_ITEM_FRAME_REMOVE_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_ITEM_FRAME_REMOVE_ITEM); + public static final CompatSoundEvent ENTITY_GLOW_ITEM_FRAME_ROTATE_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_ITEM_FRAME_ROTATE_ITEM); + public static final CompatSoundEvent ENTITY_GLOW_SQUID_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_SQUID_AMBIENT); + public static final CompatSoundEvent ENTITY_GLOW_SQUID_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_SQUID_DEATH); + public static final CompatSoundEvent ENTITY_GLOW_SQUID_HURT = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_SQUID_HURT); + public static final CompatSoundEvent ENTITY_GLOW_SQUID_SQUIRT = new CompatSoundEvent(SoundEvents.ENTITY_GLOW_SQUID_SQUIRT); + public static final CompatSoundEvent ENTITY_GOAT_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_AMBIENT); + public static final CompatSoundEvent ENTITY_GOAT_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_DEATH); + public static final CompatSoundEvent ENTITY_GOAT_EAT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_EAT); + public static final CompatSoundEvent ENTITY_GOAT_HURT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_HURT); + public static final CompatSoundEvent ENTITY_GOAT_LONG_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_LONG_JUMP); + public static final CompatSoundEvent ENTITY_GOAT_MILK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_MILK); + public static final CompatSoundEvent ENTITY_GOAT_PREPARE_RAM = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_PREPARE_RAM); + public static final CompatSoundEvent ENTITY_GOAT_RAM_IMPACT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_RAM_IMPACT); + public static final CompatSoundEvent ENTITY_GOAT_HORN_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_HORN_BREAK); + public static final CompatSoundEvent ITEM_GOAT_HORN_PLAY = new CompatSoundEvent(SoundEvents.ITEM_GOAT_HORN_PLAY); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_AMBIENT); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_DEATH); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_EAT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_EAT); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_HURT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_HURT); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_LONG_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_LONG_JUMP); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_MILK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_MILK); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_PREPARE_RAM = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_PREPARE_RAM); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_RAM_IMPACT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_RAM_IMPACT); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_HORN_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_HORN_BREAK); + public static final CompatSoundEvent ENTITY_GOAT_STEP = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_STEP); + public static final CompatSoundEvent BLOCK_GRASS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_GRASS_BREAK); + public static final CompatSoundEvent BLOCK_GRASS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_GRASS_FALL); + public static final CompatSoundEvent BLOCK_GRASS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_GRASS_HIT); + public static final CompatSoundEvent BLOCK_GRASS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_GRASS_PLACE); + public static final CompatSoundEvent BLOCK_GRASS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_GRASS_STEP); + public static final CompatSoundEvent BLOCK_GRAVEL_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_GRAVEL_BREAK); + public static final CompatSoundEvent BLOCK_GRAVEL_FALL = new CompatSoundEvent(SoundEvents.BLOCK_GRAVEL_FALL); + public static final CompatSoundEvent BLOCK_GRAVEL_HIT = new CompatSoundEvent(SoundEvents.BLOCK_GRAVEL_HIT); + public static final CompatSoundEvent BLOCK_GRAVEL_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_GRAVEL_PLACE); + public static final CompatSoundEvent BLOCK_GRAVEL_STEP = new CompatSoundEvent(SoundEvents.BLOCK_GRAVEL_STEP); + public static final CompatSoundEvent BLOCK_GRINDSTONE_USE = new CompatSoundEvent(SoundEvents.BLOCK_GRINDSTONE_USE); + public static final CompatSoundEvent BLOCK_GROWING_PLANT_CROP = new CompatSoundEvent(SoundEvents.BLOCK_GROWING_PLANT_CROP); + public static final CompatSoundEvent ENTITY_GUARDIAN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_AMBIENT); + public static final CompatSoundEvent ENTITY_GUARDIAN_AMBIENT_LAND = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_AMBIENT_LAND); + public static final CompatSoundEvent ENTITY_GUARDIAN_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_ATTACK); + public static final CompatSoundEvent ENTITY_GUARDIAN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_DEATH); + public static final CompatSoundEvent ENTITY_GUARDIAN_DEATH_LAND = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_DEATH_LAND); + public static final CompatSoundEvent ENTITY_GUARDIAN_FLOP = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_FLOP); + public static final CompatSoundEvent ENTITY_GUARDIAN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_HURT); + public static final CompatSoundEvent ENTITY_GUARDIAN_HURT_LAND = new CompatSoundEvent(SoundEvents.ENTITY_GUARDIAN_HURT_LAND); + public static final CompatSoundEvent BLOCK_HANGING_ROOTS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_ROOTS_BREAK); + public static final CompatSoundEvent BLOCK_HANGING_ROOTS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_ROOTS_FALL); + public static final CompatSoundEvent BLOCK_HANGING_ROOTS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_ROOTS_HIT); + public static final CompatSoundEvent BLOCK_HANGING_ROOTS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_ROOTS_PLACE); + public static final CompatSoundEvent BLOCK_HANGING_ROOTS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_ROOTS_STEP); + public static final CompatSoundEvent BLOCK_HANGING_SIGN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_SIGN_STEP); + public static final CompatSoundEvent BLOCK_HANGING_SIGN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_SIGN_BREAK); + public static final CompatSoundEvent BLOCK_HANGING_SIGN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_SIGN_FALL); + public static final CompatSoundEvent BLOCK_HANGING_SIGN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_SIGN_HIT); + public static final CompatSoundEvent BLOCK_HANGING_SIGN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_SIGN_PLACE); + public static final CompatSoundEvent BLOCK_HEAVY_CORE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_HEAVY_CORE_BREAK); + public static final CompatSoundEvent BLOCK_HEAVY_CORE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_HEAVY_CORE_FALL); + public static final CompatSoundEvent BLOCK_HEAVY_CORE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_HEAVY_CORE_HIT); + public static final CompatSoundEvent BLOCK_HEAVY_CORE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_HEAVY_CORE_PLACE); + public static final CompatSoundEvent BLOCK_HEAVY_CORE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_HEAVY_CORE_STEP); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_HANGING_SIGN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_HANGING_SIGN_STEP); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_HANGING_SIGN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_HANGING_SIGN_BREAK); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_HANGING_SIGN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_HANGING_SIGN_FALL); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_HANGING_SIGN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_HANGING_SIGN_HIT); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_HANGING_SIGN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_HANGING_SIGN_PLACE); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_HANGING_SIGN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_HANGING_SIGN_STEP); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_HANGING_SIGN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_HANGING_SIGN_BREAK); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_HANGING_SIGN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_HANGING_SIGN_FALL); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_HANGING_SIGN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_HANGING_SIGN_HIT); + public static final CompatSoundEvent BLOCK_BAMBOO_WOOD_HANGING_SIGN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_BAMBOO_WOOD_HANGING_SIGN_PLACE); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_BREAK); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_STEP = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_STEP); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_PLACE); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_HIT = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_HIT); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_FALL = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_FALL); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_SPAWN_MOB = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_SPAWN_MOB); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_SPAWN_ITEM = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_SPAWN_ITEM); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_DETECT_PLAYER = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_DETECT_PLAYER); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_OMINOUS_ACTIVATE = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_OMINOUS_ACTIVATE); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_AMBIENT); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_AMBIENT_OMINOUS = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_AMBIENT_OMINOUS); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER); + public static final CompatSoundEvent BLOCK_TRIAL_SPAWNER_EJECT_ITEM = new CompatSoundEvent(SoundEvents.BLOCK_TRIAL_SPAWNER_EJECT_ITEM); + public static final CompatSoundEvent ITEM_HOE_TILL = new CompatSoundEvent(SoundEvents.ITEM_HOE_TILL); + public static final CompatSoundEvent ENTITY_HOGLIN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_AMBIENT); + public static final CompatSoundEvent ENTITY_HOGLIN_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_ANGRY); + public static final CompatSoundEvent ENTITY_HOGLIN_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_ATTACK); + public static final CompatSoundEvent ENTITY_HOGLIN_CONVERTED_TO_ZOMBIFIED = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_CONVERTED_TO_ZOMBIFIED); + public static final CompatSoundEvent ENTITY_HOGLIN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_DEATH); + public static final CompatSoundEvent ENTITY_HOGLIN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_HURT); + public static final CompatSoundEvent ENTITY_HOGLIN_RETREAT = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_RETREAT); + public static final CompatSoundEvent ENTITY_HOGLIN_STEP = new CompatSoundEvent(SoundEvents.ENTITY_HOGLIN_STEP); + public static final CompatSoundEvent BLOCK_HONEY_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_HONEY_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_HONEY_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_HONEY_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_HONEY_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_HONEY_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_HONEY_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_HONEY_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_HONEY_BLOCK_SLIDE = new CompatSoundEvent(SoundEvents.BLOCK_HONEY_BLOCK_SLIDE); + public static final CompatSoundEvent BLOCK_HONEY_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_HONEY_BLOCK_STEP); + public static final CompatSoundEvent ITEM_HONEYCOMB_WAX_ON = new CompatSoundEvent(SoundEvents.ITEM_HONEYCOMB_WAX_ON); + public static final CompatSoundEvent ITEM_HONEY_BOTTLE_DRINK = new CompatSoundEvent(SoundEvents.ITEM_HONEY_BOTTLE_DRINK); + public static final int GOAT_HORN_SOUNDS_COUNT = SoundEvents.GOAT_HORN_SOUND_COUNT; + public static final ImmutableList GOAT_HORN_SOUNDS; + public static final CompatSoundEvent ENTITY_HORSE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_AMBIENT); + public static final CompatSoundEvent ENTITY_HORSE_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_ANGRY); + public static final CompatSoundEvent ENTITY_HORSE_ARMOR = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_ARMOR); + public static final CompatSoundEvent ENTITY_HORSE_BREATHE = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_BREATHE); + public static final CompatSoundEvent ENTITY_HORSE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_DEATH); + public static final CompatSoundEvent ENTITY_HORSE_EAT = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_EAT); + public static final CompatSoundEvent ENTITY_HORSE_GALLOP = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_GALLOP); + public static final CompatSoundEvent ENTITY_HORSE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_HURT); + public static final CompatSoundEvent ENTITY_HORSE_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_JUMP); + public static final CompatSoundEvent ENTITY_HORSE_LAND = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_LAND); + public static final CompatSoundEvent ENTITY_HORSE_SADDLE = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_SADDLE); + public static final CompatSoundEvent ENTITY_HORSE_STEP = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_STEP); + public static final CompatSoundEvent ENTITY_HORSE_STEP_WOOD = new CompatSoundEvent(SoundEvents.ENTITY_HORSE_STEP_WOOD); + public static final CompatSoundEvent ENTITY_HOSTILE_BIG_FALL = new CompatSoundEvent(SoundEvents.ENTITY_HOSTILE_BIG_FALL); + public static final CompatSoundEvent ENTITY_HOSTILE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_HOSTILE_DEATH); + public static final CompatSoundEvent ENTITY_HOSTILE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_HOSTILE_HURT); + public static final CompatSoundEvent ENTITY_HOSTILE_SMALL_FALL = new CompatSoundEvent(SoundEvents.ENTITY_HOSTILE_SMALL_FALL); + public static final CompatSoundEvent ENTITY_HOSTILE_SPLASH = new CompatSoundEvent(SoundEvents.ENTITY_HOSTILE_SPLASH); + public static final CompatSoundEvent ENTITY_HOSTILE_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_HOSTILE_SWIM); + public static final CompatSoundEvent ENTITY_HUSK_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_HUSK_AMBIENT); + public static final CompatSoundEvent ENTITY_HUSK_CONVERTED_TO_ZOMBIE = new CompatSoundEvent(SoundEvents.ENTITY_HUSK_CONVERTED_TO_ZOMBIE); + public static final CompatSoundEvent ENTITY_HUSK_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_HUSK_DEATH); + public static final CompatSoundEvent ENTITY_HUSK_HURT = new CompatSoundEvent(SoundEvents.ENTITY_HUSK_HURT); + public static final CompatSoundEvent ENTITY_HUSK_STEP = new CompatSoundEvent(SoundEvents.ENTITY_HUSK_STEP); + public static final CompatSoundEvent ENTITY_ILLUSIONER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ILLUSIONER_AMBIENT); + public static final CompatSoundEvent ENTITY_ILLUSIONER_CAST_SPELL = new CompatSoundEvent(SoundEvents.ENTITY_ILLUSIONER_CAST_SPELL); + public static final CompatSoundEvent ENTITY_ILLUSIONER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ILLUSIONER_DEATH); + public static final CompatSoundEvent ENTITY_ILLUSIONER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ILLUSIONER_HURT); + public static final CompatSoundEvent ENTITY_ILLUSIONER_MIRROR_MOVE = new CompatSoundEvent(SoundEvents.ENTITY_ILLUSIONER_MIRROR_MOVE); + public static final CompatSoundEvent ENTITY_ILLUSIONER_PREPARE_BLINDNESS = new CompatSoundEvent(SoundEvents.ENTITY_ILLUSIONER_PREPARE_BLINDNESS); + public static final CompatSoundEvent ENTITY_ILLUSIONER_PREPARE_MIRROR = new CompatSoundEvent(SoundEvents.ENTITY_ILLUSIONER_PREPARE_MIRROR); + public static final CompatSoundEvent ITEM_INK_SAC_USE = new CompatSoundEvent(SoundEvents.ITEM_INK_SAC_USE); + public static final CompatSoundEvent BLOCK_IRON_DOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_IRON_DOOR_CLOSE); + public static final CompatSoundEvent BLOCK_IRON_DOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_IRON_DOOR_OPEN); + public static final CompatSoundEvent ENTITY_IRON_GOLEM_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_IRON_GOLEM_ATTACK); + public static final CompatSoundEvent ENTITY_IRON_GOLEM_DAMAGE = new CompatSoundEvent(SoundEvents.ENTITY_IRON_GOLEM_DAMAGE); + public static final CompatSoundEvent ENTITY_IRON_GOLEM_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_IRON_GOLEM_DEATH); + public static final CompatSoundEvent ENTITY_IRON_GOLEM_HURT = new CompatSoundEvent(SoundEvents.ENTITY_IRON_GOLEM_HURT); + public static final CompatSoundEvent ENTITY_IRON_GOLEM_REPAIR = new CompatSoundEvent(SoundEvents.ENTITY_IRON_GOLEM_REPAIR); + public static final CompatSoundEvent ENTITY_IRON_GOLEM_STEP = new CompatSoundEvent(SoundEvents.ENTITY_IRON_GOLEM_STEP); + public static final CompatSoundEvent BLOCK_IRON_TRAPDOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_IRON_TRAPDOOR_CLOSE); + public static final CompatSoundEvent BLOCK_IRON_TRAPDOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_IRON_TRAPDOOR_OPEN); + public static final CompatSoundEvent ENTITY_ITEM_FRAME_ADD_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_ITEM_FRAME_ADD_ITEM); + public static final CompatSoundEvent ENTITY_ITEM_FRAME_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_ITEM_FRAME_BREAK); + public static final CompatSoundEvent ENTITY_ITEM_FRAME_PLACE = new CompatSoundEvent(SoundEvents.ENTITY_ITEM_FRAME_PLACE); + public static final CompatSoundEvent ENTITY_ITEM_FRAME_REMOVE_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_ITEM_FRAME_REMOVE_ITEM); + public static final CompatSoundEvent ENTITY_ITEM_FRAME_ROTATE_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_ITEM_FRAME_ROTATE_ITEM); + public static final CompatSoundEvent ENTITY_ITEM_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_ITEM_BREAK); + public static final CompatSoundEvent ENTITY_ITEM_PICKUP = new CompatSoundEvent(SoundEvents.ENTITY_ITEM_PICKUP); + public static final CompatSoundEvent BLOCK_LADDER_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_LADDER_BREAK); + public static final CompatSoundEvent BLOCK_LADDER_FALL = new CompatSoundEvent(SoundEvents.BLOCK_LADDER_FALL); + public static final CompatSoundEvent BLOCK_LADDER_HIT = new CompatSoundEvent(SoundEvents.BLOCK_LADDER_HIT); + public static final CompatSoundEvent BLOCK_LADDER_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_LADDER_PLACE); + public static final CompatSoundEvent BLOCK_LADDER_STEP = new CompatSoundEvent(SoundEvents.BLOCK_LADDER_STEP); + public static final CompatSoundEvent BLOCK_LANTERN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_LANTERN_BREAK); + public static final CompatSoundEvent BLOCK_LANTERN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_LANTERN_FALL); + public static final CompatSoundEvent BLOCK_LANTERN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_LANTERN_HIT); + public static final CompatSoundEvent BLOCK_LANTERN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_LANTERN_PLACE); + public static final CompatSoundEvent BLOCK_LANTERN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_LANTERN_STEP); + public static final CompatSoundEvent BLOCK_LARGE_AMETHYST_BUD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_LARGE_AMETHYST_BUD_BREAK); + public static final CompatSoundEvent BLOCK_LARGE_AMETHYST_BUD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_LARGE_AMETHYST_BUD_PLACE); + public static final CompatSoundEvent BLOCK_LAVA_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_LAVA_AMBIENT); + public static final CompatSoundEvent BLOCK_LAVA_EXTINGUISH = new CompatSoundEvent(SoundEvents.BLOCK_LAVA_EXTINGUISH); + public static final CompatSoundEvent BLOCK_LAVA_POP = new CompatSoundEvent(SoundEvents.BLOCK_LAVA_POP); + public static final CompatSoundEvent ENTITY_LEASH_KNOT_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_LEASH_KNOT_BREAK); + public static final CompatSoundEvent ENTITY_LEASH_KNOT_PLACE = new CompatSoundEvent(SoundEvents.ENTITY_LEASH_KNOT_PLACE); + public static final CompatSoundEvent BLOCK_LEVER_CLICK = new CompatSoundEvent(SoundEvents.BLOCK_LEVER_CLICK); + public static final CompatSoundEvent ENTITY_LIGHTNING_BOLT_IMPACT = new CompatSoundEvent(SoundEvents.ENTITY_LIGHTNING_BOLT_IMPACT); + public static final CompatSoundEvent ENTITY_LIGHTNING_BOLT_THUNDER = new CompatSoundEvent(SoundEvents.ENTITY_LIGHTNING_BOLT_THUNDER); + public static final CompatSoundEvent ENTITY_LINGERING_POTION_THROW = new CompatSoundEvent(SoundEvents.ENTITY_LINGERING_POTION_THROW); + public static final CompatSoundEvent ENTITY_LLAMA_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_AMBIENT); + public static final CompatSoundEvent ENTITY_LLAMA_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_ANGRY); + public static final CompatSoundEvent ENTITY_LLAMA_CHEST = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_CHEST); + public static final CompatSoundEvent ENTITY_LLAMA_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_DEATH); + public static final CompatSoundEvent ENTITY_LLAMA_EAT = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_EAT); + public static final CompatSoundEvent ENTITY_LLAMA_HURT = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_HURT); + public static final CompatSoundEvent ENTITY_LLAMA_SPIT = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_SPIT); + public static final CompatSoundEvent ENTITY_LLAMA_STEP = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_STEP); + public static final CompatSoundEvent ENTITY_LLAMA_SWAG = new CompatSoundEvent(SoundEvents.ENTITY_LLAMA_SWAG); + public static final CompatSoundEvent ENTITY_MAGMA_CUBE_DEATH_SMALL = new CompatSoundEvent(SoundEvents.ENTITY_MAGMA_CUBE_DEATH_SMALL); + public static final CompatSoundEvent BLOCK_LODESTONE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_LODESTONE_BREAK); + public static final CompatSoundEvent BLOCK_LODESTONE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_LODESTONE_STEP); + public static final CompatSoundEvent BLOCK_LODESTONE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_LODESTONE_PLACE); + public static final CompatSoundEvent BLOCK_LODESTONE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_LODESTONE_HIT); + public static final CompatSoundEvent BLOCK_LODESTONE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_LODESTONE_FALL); + public static final CompatSoundEvent ITEM_LODESTONE_COMPASS_LOCK = new CompatSoundEvent(SoundEvents.ITEM_LODESTONE_COMPASS_LOCK); + public static final CompatSoundEvent ITEM_MACE_SMASH_AIR = new CompatSoundEvent(SoundEvents.ITEM_MACE_SMASH_AIR); + public static final CompatSoundEvent ITEM_MACE_SMASH_GROUND = new CompatSoundEvent(SoundEvents.ITEM_MACE_SMASH_GROUND); + public static final CompatSoundEvent ITEM_MACE_SMASH_GROUND_HEAVY = new CompatSoundEvent(SoundEvents.ITEM_MACE_SMASH_GROUND_HEAVY); + public static final CompatSoundEvent ENTITY_MAGMA_CUBE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_MAGMA_CUBE_DEATH); + public static final CompatSoundEvent ENTITY_MAGMA_CUBE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_MAGMA_CUBE_HURT); + public static final CompatSoundEvent ENTITY_MAGMA_CUBE_HURT_SMALL = new CompatSoundEvent(SoundEvents.ENTITY_MAGMA_CUBE_HURT_SMALL); + public static final CompatSoundEvent ENTITY_MAGMA_CUBE_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_MAGMA_CUBE_JUMP); + public static final CompatSoundEvent ENTITY_MAGMA_CUBE_SQUISH = new CompatSoundEvent(SoundEvents.ENTITY_MAGMA_CUBE_SQUISH); + public static final CompatSoundEvent ENTITY_MAGMA_CUBE_SQUISH_SMALL = new CompatSoundEvent(SoundEvents.ENTITY_MAGMA_CUBE_SQUISH_SMALL); + public static final CompatSoundEvent BLOCK_MANGROVE_ROOTS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_MANGROVE_ROOTS_BREAK); + public static final CompatSoundEvent BLOCK_MANGROVE_ROOTS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_MANGROVE_ROOTS_FALL); + public static final CompatSoundEvent BLOCK_MANGROVE_ROOTS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_MANGROVE_ROOTS_HIT); + public static final CompatSoundEvent BLOCK_MANGROVE_ROOTS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_MANGROVE_ROOTS_PLACE); + public static final CompatSoundEvent BLOCK_MANGROVE_ROOTS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_MANGROVE_ROOTS_STEP); + public static final CompatSoundEvent BLOCK_MEDIUM_AMETHYST_BUD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_MEDIUM_AMETHYST_BUD_BREAK); + public static final CompatSoundEvent BLOCK_MEDIUM_AMETHYST_BUD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_MEDIUM_AMETHYST_BUD_PLACE); + public static final CompatSoundEvent BLOCK_METAL_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_METAL_BREAK); + public static final CompatSoundEvent BLOCK_METAL_FALL = new CompatSoundEvent(SoundEvents.BLOCK_METAL_FALL); + public static final CompatSoundEvent BLOCK_METAL_HIT = new CompatSoundEvent(SoundEvents.BLOCK_METAL_HIT); + public static final CompatSoundEvent BLOCK_METAL_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_METAL_PLACE); + public static final CompatSoundEvent BLOCK_METAL_PRESSURE_PLATE_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_METAL_PRESSURE_PLATE_CLICK_OFF); + public static final CompatSoundEvent BLOCK_METAL_PRESSURE_PLATE_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_METAL_PRESSURE_PLATE_CLICK_ON); + public static final CompatSoundEvent BLOCK_METAL_STEP = new CompatSoundEvent(SoundEvents.BLOCK_METAL_STEP); + public static final CompatSoundEvent ENTITY_MINECART_INSIDE_UNDERWATER = new CompatSoundEvent(SoundEvents.ENTITY_MINECART_INSIDE_UNDERWATER); + public static final CompatSoundEvent ENTITY_MINECART_INSIDE = new CompatSoundEvent(SoundEvents.ENTITY_MINECART_INSIDE); + public static final CompatSoundEvent ENTITY_MINECART_RIDING = new CompatSoundEvent(SoundEvents.ENTITY_MINECART_RIDING); + public static final CompatSoundEvent ENTITY_MOOSHROOM_CONVERT = new CompatSoundEvent(SoundEvents.ENTITY_MOOSHROOM_CONVERT); + public static final CompatSoundEvent ENTITY_MOOSHROOM_EAT = new CompatSoundEvent(SoundEvents.ENTITY_MOOSHROOM_EAT); + public static final CompatSoundEvent ENTITY_MOOSHROOM_MILK = new CompatSoundEvent(SoundEvents.ENTITY_MOOSHROOM_MILK); + public static final CompatSoundEvent ENTITY_MOOSHROOM_SUSPICIOUS_MILK = new CompatSoundEvent(SoundEvents.ENTITY_MOOSHROOM_SUSPICIOUS_MILK); + public static final CompatSoundEvent ENTITY_MOOSHROOM_SHEAR = new CompatSoundEvent(SoundEvents.ENTITY_MOOSHROOM_SHEAR); + public static final CompatSoundEvent BLOCK_MOSS_CARPET_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_CARPET_BREAK); + public static final CompatSoundEvent BLOCK_MOSS_CARPET_FALL = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_CARPET_FALL); + public static final CompatSoundEvent BLOCK_MOSS_CARPET_HIT = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_CARPET_HIT); + public static final CompatSoundEvent BLOCK_MOSS_CARPET_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_CARPET_PLACE); + public static final CompatSoundEvent BLOCK_MOSS_CARPET_STEP = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_CARPET_STEP); + public static final CompatSoundEvent BLOCK_PINK_PETALS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_PINK_PETALS_BREAK); + public static final CompatSoundEvent BLOCK_PINK_PETALS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_PINK_PETALS_FALL); + public static final CompatSoundEvent BLOCK_PINK_PETALS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_PINK_PETALS_HIT); + public static final CompatSoundEvent BLOCK_PINK_PETALS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_PINK_PETALS_PLACE); + public static final CompatSoundEvent BLOCK_PINK_PETALS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_PINK_PETALS_STEP); + public static final CompatSoundEvent BLOCK_MOSS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_BREAK); + public static final CompatSoundEvent BLOCK_MOSS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_FALL); + public static final CompatSoundEvent BLOCK_MOSS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_HIT); + public static final CompatSoundEvent BLOCK_MOSS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_PLACE); + public static final CompatSoundEvent BLOCK_MOSS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_MOSS_STEP); + public static final CompatSoundEvent BLOCK_MUD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_MUD_BREAK); + public static final CompatSoundEvent BLOCK_MUD_FALL = new CompatSoundEvent(SoundEvents.BLOCK_MUD_FALL); + public static final CompatSoundEvent BLOCK_MUD_HIT = new CompatSoundEvent(SoundEvents.BLOCK_MUD_HIT); + public static final CompatSoundEvent BLOCK_MUD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_MUD_PLACE); + public static final CompatSoundEvent BLOCK_MUD_STEP = new CompatSoundEvent(SoundEvents.BLOCK_MUD_STEP); + public static final CompatSoundEvent BLOCK_MUD_BRICKS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_MUD_BRICKS_BREAK); + public static final CompatSoundEvent BLOCK_MUD_BRICKS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_MUD_BRICKS_FALL); + public static final CompatSoundEvent BLOCK_MUD_BRICKS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_MUD_BRICKS_HIT); + public static final CompatSoundEvent BLOCK_MUD_BRICKS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_MUD_BRICKS_PLACE); + public static final CompatSoundEvent BLOCK_MUD_BRICKS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_MUD_BRICKS_STEP); + public static final CompatSoundEvent BLOCK_MUDDY_MANGROVE_ROOTS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_MUDDY_MANGROVE_ROOTS_BREAK); + public static final CompatSoundEvent BLOCK_MUDDY_MANGROVE_ROOTS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_MUDDY_MANGROVE_ROOTS_FALL); + public static final CompatSoundEvent BLOCK_MUDDY_MANGROVE_ROOTS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_MUDDY_MANGROVE_ROOTS_HIT); + public static final CompatSoundEvent BLOCK_MUDDY_MANGROVE_ROOTS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_MUDDY_MANGROVE_ROOTS_PLACE); + public static final CompatSoundEvent BLOCK_MUDDY_MANGROVE_ROOTS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_MUDDY_MANGROVE_ROOTS_STEP); + public static final CompatSoundEvent ENTITY_MULE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_MULE_AMBIENT); + public static final CompatSoundEvent ENTITY_MULE_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_MULE_ANGRY); + public static final CompatSoundEvent ENTITY_MULE_CHEST = new CompatSoundEvent(SoundEvents.ENTITY_MULE_CHEST); + public static final CompatSoundEvent ENTITY_MULE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_MULE_DEATH); + public static final CompatSoundEvent ENTITY_MULE_EAT = new CompatSoundEvent(SoundEvents.ENTITY_MULE_EAT); + public static final CompatSoundEvent ENTITY_MULE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_MULE_HURT); + public static final CompatSoundEvent ENTITY_MULE_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_MULE_JUMP); + public static final CompatSoundEvent MUSIC_CREATIVE = new CompatSoundEvent(SoundEvents.MUSIC_CREATIVE); + public static final CompatSoundEvent MUSIC_CREDITS = new CompatSoundEvent(SoundEvents.MUSIC_CREDITS); + public static final CompatSoundEvent MUSIC_DISC_5 = new CompatSoundEvent(SoundEvents.MUSIC_DISC_5); + public static final CompatSoundEvent MUSIC_DISC_11 = new CompatSoundEvent(SoundEvents.MUSIC_DISC_11); + public static final CompatSoundEvent MUSIC_DISC_13 = new CompatSoundEvent(SoundEvents.MUSIC_DISC_13); + public static final CompatSoundEvent MUSIC_DISC_BLOCKS = new CompatSoundEvent(SoundEvents.MUSIC_DISC_BLOCKS); + public static final CompatSoundEvent MUSIC_DISC_CAT = new CompatSoundEvent(SoundEvents.MUSIC_DISC_CAT); + public static final CompatSoundEvent MUSIC_DISC_CHIRP = new CompatSoundEvent(SoundEvents.MUSIC_DISC_CHIRP); + public static final CompatSoundEvent MUSIC_DISC_FAR = new CompatSoundEvent(SoundEvents.MUSIC_DISC_FAR); + public static final CompatSoundEvent MUSIC_DISC_MALL = new CompatSoundEvent(SoundEvents.MUSIC_DISC_MALL); + public static final CompatSoundEvent MUSIC_DISC_MELLOHI = new CompatSoundEvent(SoundEvents.MUSIC_DISC_MELLOHI); + public static final CompatSoundEvent MUSIC_DISC_PIGSTEP = new CompatSoundEvent(SoundEvents.MUSIC_DISC_PIGSTEP); + public static final CompatSoundEvent MUSIC_DISC_STAL = new CompatSoundEvent(SoundEvents.MUSIC_DISC_STAL); + public static final CompatSoundEvent MUSIC_DISC_STRAD = new CompatSoundEvent(SoundEvents.MUSIC_DISC_STRAD); + public static final CompatSoundEvent MUSIC_DISC_WAIT = new CompatSoundEvent(SoundEvents.MUSIC_DISC_WAIT); + public static final CompatSoundEvent MUSIC_DISC_WARD = new CompatSoundEvent(SoundEvents.MUSIC_DISC_WARD); + public static final CompatSoundEvent MUSIC_DISC_OTHERSIDE = new CompatSoundEvent(SoundEvents.MUSIC_DISC_OTHERSIDE); + public static final CompatSoundEvent MUSIC_DISC_RELIC = new CompatSoundEvent(SoundEvents.MUSIC_DISC_RELIC); + public static final CompatSoundEvent MUSIC_DISC_CREATOR = new CompatSoundEvent(SoundEvents.MUSIC_DISC_CREATOR); + public static final CompatSoundEvent MUSIC_DISC_CREATOR_MUSIC_BOX = new CompatSoundEvent(SoundEvents.MUSIC_DISC_CREATOR_MUSIC_BOX); + public static final CompatSoundEvent MUSIC_DISC_PRECIPICE = new CompatSoundEvent(SoundEvents.MUSIC_DISC_PRECIPICE); + public static final CompatSoundEvent MUSIC_DRAGON = new CompatSoundEvent(SoundEvents.MUSIC_DRAGON); + public static final CompatSoundEvent MUSIC_END = new CompatSoundEvent(SoundEvents.MUSIC_END); + public static final CompatSoundEvent MUSIC_GAME = new CompatSoundEvent(SoundEvents.MUSIC_GAME); + public static final CompatSoundEvent MUSIC_MENU = new CompatSoundEvent(SoundEvents.MUSIC_MENU); + public static final CompatSoundEvent MUSIC_NETHER_BASALT_DELTAS = new CompatSoundEvent(SoundEvents.MUSIC_NETHER_BASALT_DELTAS); + public static final CompatSoundEvent MUSIC_NETHER_CRIMSON_FOREST = new CompatSoundEvent(SoundEvents.MUSIC_NETHER_CRIMSON_FOREST); + public static final CompatSoundEvent MUSIC_OVERWORLD_DEEP_DARK = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_DEEP_DARK); + public static final CompatSoundEvent MUSIC_OVERWORLD_DRIPSTONE_CAVES = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_DRIPSTONE_CAVES); + public static final CompatSoundEvent MUSIC_OVERWORLD_GROVE = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_GROVE); + public static final CompatSoundEvent MUSIC_OVERWORLD_JAGGED_PEAKS = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_JAGGED_PEAKS); + public static final CompatSoundEvent MUSIC_OVERWORLD_LUSH_CAVES = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_LUSH_CAVES); + public static final CompatSoundEvent MUSIC_OVERWORLD_SWAMP = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_SWAMP); + public static final CompatSoundEvent MUSIC_OVERWORLD_FOREST = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_FOREST); + public static final CompatSoundEvent MUSIC_OVERWORLD_OLD_GROWTH_TAIGA = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_OLD_GROWTH_TAIGA); + public static final CompatSoundEvent MUSIC_OVERWORLD_MEADOW = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_MEADOW); + public static final CompatSoundEvent MUSIC_OVERWORLD_CHERRY_GROVE = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_CHERRY_GROVE); + public static final CompatSoundEvent MUSIC_NETHER_NETHER_WASTES = new CompatSoundEvent(SoundEvents.MUSIC_NETHER_NETHER_WASTES); + public static final CompatSoundEvent MUSIC_OVERWORLD_FROZEN_PEAKS = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_FROZEN_PEAKS); + public static final CompatSoundEvent MUSIC_OVERWORLD_SNOWY_SLOPES = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_SNOWY_SLOPES); + public static final CompatSoundEvent MUSIC_NETHER_SOUL_SAND_VALLEY = new CompatSoundEvent(SoundEvents.MUSIC_NETHER_SOUL_SAND_VALLEY); + public static final CompatSoundEvent MUSIC_OVERWORLD_STONY_PEAKS = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_STONY_PEAKS); + public static final CompatSoundEvent MUSIC_NETHER_WARPED_FOREST = new CompatSoundEvent(SoundEvents.MUSIC_NETHER_WARPED_FOREST); + public static final CompatSoundEvent MUSIC_OVERWORLD_FLOWER_FOREST = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_FLOWER_FOREST); + public static final CompatSoundEvent MUSIC_OVERWORLD_DESERT = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_DESERT); + public static final CompatSoundEvent MUSIC_OVERWORLD_BADLANDS = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_BADLANDS); + public static final CompatSoundEvent MUSIC_OVERWORLD_JUNGLE = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_JUNGLE); + public static final CompatSoundEvent MUSIC_OVERWORLD_SPARSE_JUNGLE = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_SPARSE_JUNGLE); + public static final CompatSoundEvent MUSIC_OVERWORLD_BAMBOO_JUNGLE = new CompatSoundEvent(SoundEvents.MUSIC_OVERWORLD_BAMBOO_JUNGLE); + public static final CompatSoundEvent MUSIC_UNDER_WATER = new CompatSoundEvent(SoundEvents.MUSIC_UNDER_WATER); + public static final CompatSoundEvent BLOCK_NETHER_BRICKS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_BRICKS_BREAK); + public static final CompatSoundEvent BLOCK_NETHER_BRICKS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_BRICKS_STEP); + public static final CompatSoundEvent BLOCK_NETHER_BRICKS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_BRICKS_PLACE); + public static final CompatSoundEvent BLOCK_NETHER_BRICKS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_BRICKS_HIT); + public static final CompatSoundEvent BLOCK_NETHER_BRICKS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_BRICKS_FALL); + public static final CompatSoundEvent BLOCK_NETHER_WART_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WART_BREAK); + public static final CompatSoundEvent ITEM_NETHER_WART_PLANT = new CompatSoundEvent(SoundEvents.ITEM_NETHER_WART_PLANT); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_BREAK); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_FALL); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_HIT); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_PLACE); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_STEP); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_DOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_DOOR_CLOSE); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_DOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_DOOR_OPEN); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_TRAPDOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_TRAPDOOR_CLOSE); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_TRAPDOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_TRAPDOOR_OPEN); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_BUTTON_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_BUTTON_CLICK_OFF); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_BUTTON_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_BUTTON_CLICK_ON); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_PRESSURE_PLATE_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_PRESSURE_PLATE_CLICK_OFF); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_PRESSURE_PLATE_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_PRESSURE_PLATE_CLICK_ON); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_FENCE_GATE_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_FENCE_GATE_CLOSE); + public static final CompatSoundEvent BLOCK_NETHER_WOOD_FENCE_GATE_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_WOOD_FENCE_GATE_OPEN); + public static final CompatSoundEvent INTENTIONALLY_EMPTY = new CompatSoundEvent(SoundEvents.INTENTIONALLY_EMPTY); + public static final CompatSoundEvent BLOCK_PACKED_MUD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_PACKED_MUD_BREAK); + public static final CompatSoundEvent BLOCK_PACKED_MUD_FALL = new CompatSoundEvent(SoundEvents.BLOCK_PACKED_MUD_FALL); + public static final CompatSoundEvent BLOCK_PACKED_MUD_HIT = new CompatSoundEvent(SoundEvents.BLOCK_PACKED_MUD_HIT); + public static final CompatSoundEvent BLOCK_PACKED_MUD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_PACKED_MUD_PLACE); + public static final CompatSoundEvent BLOCK_PACKED_MUD_STEP = new CompatSoundEvent(SoundEvents.BLOCK_PACKED_MUD_STEP); + public static final CompatSoundEvent BLOCK_STEM_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_STEM_BREAK); + public static final CompatSoundEvent BLOCK_STEM_STEP = new CompatSoundEvent(SoundEvents.BLOCK_STEM_STEP); + public static final CompatSoundEvent BLOCK_STEM_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_STEM_PLACE); + public static final CompatSoundEvent BLOCK_STEM_HIT = new CompatSoundEvent(SoundEvents.BLOCK_STEM_HIT); + public static final CompatSoundEvent BLOCK_STEM_FALL = new CompatSoundEvent(SoundEvents.BLOCK_STEM_FALL); + public static final CompatSoundEvent BLOCK_NYLIUM_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NYLIUM_BREAK); + public static final CompatSoundEvent BLOCK_NYLIUM_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NYLIUM_STEP); + public static final CompatSoundEvent BLOCK_NYLIUM_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NYLIUM_PLACE); + public static final CompatSoundEvent BLOCK_NYLIUM_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NYLIUM_HIT); + public static final CompatSoundEvent BLOCK_NYLIUM_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NYLIUM_FALL); + public static final CompatSoundEvent BLOCK_NETHER_SPROUTS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_SPROUTS_BREAK); + public static final CompatSoundEvent BLOCK_NETHER_SPROUTS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_SPROUTS_STEP); + public static final CompatSoundEvent BLOCK_NETHER_SPROUTS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_SPROUTS_PLACE); + public static final CompatSoundEvent BLOCK_NETHER_SPROUTS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_SPROUTS_HIT); + public static final CompatSoundEvent BLOCK_NETHER_SPROUTS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_SPROUTS_FALL); + public static final CompatSoundEvent BLOCK_FUNGUS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_FUNGUS_BREAK); + public static final CompatSoundEvent BLOCK_FUNGUS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_FUNGUS_STEP); + public static final CompatSoundEvent BLOCK_FUNGUS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_FUNGUS_PLACE); + public static final CompatSoundEvent BLOCK_FUNGUS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_FUNGUS_HIT); + public static final CompatSoundEvent BLOCK_FUNGUS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_FUNGUS_FALL); + public static final CompatSoundEvent BLOCK_WEEPING_VINES_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_WEEPING_VINES_BREAK); + public static final CompatSoundEvent BLOCK_WEEPING_VINES_STEP = new CompatSoundEvent(SoundEvents.BLOCK_WEEPING_VINES_STEP); + public static final CompatSoundEvent BLOCK_WEEPING_VINES_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_WEEPING_VINES_PLACE); + public static final CompatSoundEvent BLOCK_WEEPING_VINES_HIT = new CompatSoundEvent(SoundEvents.BLOCK_WEEPING_VINES_HIT); + public static final CompatSoundEvent BLOCK_WEEPING_VINES_FALL = new CompatSoundEvent(SoundEvents.BLOCK_WEEPING_VINES_FALL); + public static final CompatSoundEvent BLOCK_WART_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_WART_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_WART_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_WART_BLOCK_STEP); + public static final CompatSoundEvent BLOCK_WART_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_WART_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_WART_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_WART_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_WART_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_WART_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_NETHERITE_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHERITE_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_NETHERITE_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHERITE_BLOCK_STEP); + public static final CompatSoundEvent BLOCK_NETHERITE_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHERITE_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_NETHERITE_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHERITE_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_NETHERITE_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHERITE_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_NETHERRACK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHERRACK_BREAK); + public static final CompatSoundEvent BLOCK_NETHERRACK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHERRACK_STEP); + public static final CompatSoundEvent BLOCK_NETHERRACK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHERRACK_PLACE); + public static final CompatSoundEvent BLOCK_NETHERRACK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHERRACK_HIT); + public static final CompatSoundEvent BLOCK_NETHERRACK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHERRACK_FALL); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_BASEDRUM = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_BASEDRUM); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_BASS = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_BASS); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_BELL = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_BELL); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_CHIME = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_CHIME); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_FLUTE = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_FLUTE); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_GUITAR = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_GUITAR); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_HARP = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_HARP); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_HAT = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_HAT); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_PLING = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_PLING); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_SNARE = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_SNARE); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_XYLOPHONE = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_XYLOPHONE); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_IRON_XYLOPHONE = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_IRON_XYLOPHONE); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_COW_BELL = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_COW_BELL); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_DIDGERIDOO = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_DIDGERIDOO); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_BIT = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_BIT); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_BANJO = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_BANJO); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_IMITATE_SKELETON = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_IMITATE_SKELETON); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_IMITATE_CREEPER = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_IMITATE_CREEPER); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_IMITATE_ENDER_DRAGON = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_IMITATE_ENDER_DRAGON); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_IMITATE_WITHER_SKELETON = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_IMITATE_WITHER_SKELETON); + public static final CompatSoundEvent BLOCK_NOTE_BLOCK_IMITATE_PIGLIN = new CompatSoundEvent(SoundEvents.BLOCK_NOTE_BLOCK_IMITATE_PIGLIN); + public static final CompatSoundEvent ENTITY_OCELOT_HURT = new CompatSoundEvent(SoundEvents.ENTITY_OCELOT_HURT); + public static final CompatSoundEvent ENTITY_OCELOT_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_OCELOT_AMBIENT); + public static final CompatSoundEvent ENTITY_OCELOT_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_OCELOT_DEATH); + public static final CompatSoundEvent ITEM_OMINOUS_BOTTLE_DISPOSE = new CompatSoundEvent(SoundEvents.ITEM_OMINOUS_BOTTLE_DISPOSE); + public static final CompatSoundEvent ENTITY_PAINTING_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_PAINTING_BREAK); + public static final CompatSoundEvent ENTITY_PAINTING_PLACE = new CompatSoundEvent(SoundEvents.ENTITY_PAINTING_PLACE); + public static final CompatSoundEvent ENTITY_PANDA_PRE_SNEEZE = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_PRE_SNEEZE); + public static final CompatSoundEvent ENTITY_PANDA_SNEEZE = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_SNEEZE); + public static final CompatSoundEvent ENTITY_PANDA_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_AMBIENT); + public static final CompatSoundEvent ENTITY_PANDA_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_DEATH); + public static final CompatSoundEvent ENTITY_PANDA_EAT = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_EAT); + public static final CompatSoundEvent ENTITY_PANDA_STEP = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_STEP); + public static final CompatSoundEvent ENTITY_PANDA_CANT_BREED = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_CANT_BREED); + public static final CompatSoundEvent ENTITY_PANDA_AGGRESSIVE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_AGGRESSIVE_AMBIENT); + public static final CompatSoundEvent ENTITY_PANDA_WORRIED_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_WORRIED_AMBIENT); + public static final CompatSoundEvent ENTITY_PANDA_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_HURT); + public static final CompatSoundEvent ENTITY_PANDA_BITE = new CompatSoundEvent(SoundEvents.ENTITY_PANDA_BITE); + public static final CompatSoundEvent ENTITY_PARROT_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_AMBIENT); + public static final CompatSoundEvent ENTITY_PARROT_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_DEATH); + public static final CompatSoundEvent ENTITY_PARROT_EAT = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_EAT); + public static final CompatSoundEvent ENTITY_PARROT_FLY = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_FLY); + public static final CompatSoundEvent ENTITY_PARROT_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_HURT); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_BLAZE = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_BLAZE); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_BOGGED = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_BOGGED); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_BREEZE = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_BREEZE); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_CREEPER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_CREEPER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_DROWNED = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_DROWNED); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_ELDER_GUARDIAN = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_ELDER_GUARDIAN); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_ENDER_DRAGON = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_ENDER_DRAGON); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_ENDERMITE = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_ENDERMITE); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_EVOKER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_EVOKER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_GHAST = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_GHAST); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_GUARDIAN = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_GUARDIAN); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_HOGLIN = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_HOGLIN); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_HUSK = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_HUSK); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_ILLUSIONER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_ILLUSIONER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_MAGMA_CUBE = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_MAGMA_CUBE); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_PHANTOM = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_PHANTOM); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_PIGLIN = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_PIGLIN); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_PIGLIN_BRUTE = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_PIGLIN_BRUTE); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_PILLAGER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_PILLAGER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_RAVAGER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_RAVAGER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_SHULKER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_SHULKER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_SILVERFISH = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_SILVERFISH); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_SKELETON = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_SKELETON); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_SLIME = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_SLIME); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_SPIDER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_SPIDER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_STRAY = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_STRAY); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_VEX = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_VEX); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_VINDICATOR = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_VINDICATOR); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_WARDEN = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_WARDEN); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_WITCH = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_WITCH); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_WITHER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_WITHER); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_WITHER_SKELETON = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_WITHER_SKELETON); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_ZOGLIN = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_ZOGLIN); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_ZOMBIE = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_ZOMBIE); + public static final CompatSoundEvent ENTITY_PARROT_IMITATE_ZOMBIE_VILLAGER = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_IMITATE_ZOMBIE_VILLAGER); + public static final CompatSoundEvent ENTITY_PARROT_STEP = new CompatSoundEvent(SoundEvents.ENTITY_PARROT_STEP); + public static final CompatSoundEvent ENTITY_PHANTOM_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PHANTOM_AMBIENT); + public static final CompatSoundEvent ENTITY_PHANTOM_BITE = new CompatSoundEvent(SoundEvents.ENTITY_PHANTOM_BITE); + public static final CompatSoundEvent ENTITY_PHANTOM_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PHANTOM_DEATH); + public static final CompatSoundEvent ENTITY_PHANTOM_FLAP = new CompatSoundEvent(SoundEvents.ENTITY_PHANTOM_FLAP); + public static final CompatSoundEvent ENTITY_PHANTOM_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PHANTOM_HURT); + public static final CompatSoundEvent ENTITY_PHANTOM_SWOOP = new CompatSoundEvent(SoundEvents.ENTITY_PHANTOM_SWOOP); + public static final CompatSoundEvent ENTITY_PIG_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PIG_AMBIENT); + public static final CompatSoundEvent ENTITY_PIG_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PIG_DEATH); + public static final CompatSoundEvent ENTITY_PIG_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PIG_HURT); + public static final CompatSoundEvent ENTITY_PIG_SADDLE = new CompatSoundEvent(SoundEvents.ENTITY_PIG_SADDLE); + public static final CompatSoundEvent ENTITY_PIG_STEP = new CompatSoundEvent(SoundEvents.ENTITY_PIG_STEP); + public static final CompatSoundEvent ENTITY_PIGLIN_ADMIRING_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_ADMIRING_ITEM); + public static final CompatSoundEvent ENTITY_PIGLIN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_AMBIENT); + public static final CompatSoundEvent ENTITY_PIGLIN_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_ANGRY); + public static final CompatSoundEvent ENTITY_PIGLIN_CELEBRATE = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_CELEBRATE); + public static final CompatSoundEvent ENTITY_PIGLIN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_DEATH); + public static final CompatSoundEvent ENTITY_PIGLIN_JEALOUS = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_JEALOUS); + public static final CompatSoundEvent ENTITY_PIGLIN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_HURT); + public static final CompatSoundEvent ENTITY_PIGLIN_RETREAT = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_RETREAT); + public static final CompatSoundEvent ENTITY_PIGLIN_STEP = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_STEP); + public static final CompatSoundEvent ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_CONVERTED_TO_ZOMBIFIED); + public static final CompatSoundEvent ENTITY_PIGLIN_BRUTE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_BRUTE_AMBIENT); + public static final CompatSoundEvent ENTITY_PIGLIN_BRUTE_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_BRUTE_ANGRY); + public static final CompatSoundEvent ENTITY_PIGLIN_BRUTE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_BRUTE_DEATH); + public static final CompatSoundEvent ENTITY_PIGLIN_BRUTE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_BRUTE_HURT); + public static final CompatSoundEvent ENTITY_PIGLIN_BRUTE_STEP = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_BRUTE_STEP); + public static final CompatSoundEvent ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED = new CompatSoundEvent(SoundEvents.ENTITY_PIGLIN_BRUTE_CONVERTED_TO_ZOMBIFIED); + public static final CompatSoundEvent ENTITY_PILLAGER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PILLAGER_AMBIENT); + public static final CompatSoundEvent ENTITY_PILLAGER_CELEBRATE = new CompatSoundEvent(SoundEvents.ENTITY_PILLAGER_CELEBRATE); + public static final CompatSoundEvent ENTITY_PILLAGER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PILLAGER_DEATH); + public static final CompatSoundEvent ENTITY_PILLAGER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PILLAGER_HURT); + public static final CompatSoundEvent BLOCK_PISTON_CONTRACT = new CompatSoundEvent(SoundEvents.BLOCK_PISTON_CONTRACT); + public static final CompatSoundEvent BLOCK_PISTON_EXTEND = new CompatSoundEvent(SoundEvents.BLOCK_PISTON_EXTEND); + public static final CompatSoundEvent ENTITY_PLAYER_ATTACK_CRIT = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_ATTACK_CRIT); + public static final CompatSoundEvent ENTITY_PLAYER_ATTACK_KNOCKBACK = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_ATTACK_KNOCKBACK); + public static final CompatSoundEvent ENTITY_PLAYER_ATTACK_NODAMAGE = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_ATTACK_NODAMAGE); + public static final CompatSoundEvent ENTITY_PLAYER_ATTACK_STRONG = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_ATTACK_STRONG); + public static final CompatSoundEvent ENTITY_PLAYER_ATTACK_SWEEP = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_ATTACK_SWEEP); + public static final CompatSoundEvent ENTITY_PLAYER_ATTACK_WEAK = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_ATTACK_WEAK); + public static final CompatSoundEvent ENTITY_PLAYER_BIG_FALL = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_BIG_FALL); + public static final CompatSoundEvent ENTITY_PLAYER_BREATH = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_BREATH); + public static final CompatSoundEvent ENTITY_PLAYER_BURP = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_BURP); + public static final CompatSoundEvent ENTITY_PLAYER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_DEATH); + public static final CompatSoundEvent ENTITY_PLAYER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_HURT); + public static final CompatSoundEvent ENTITY_PLAYER_HURT_DROWN = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_HURT_DROWN); + public static final CompatSoundEvent ENTITY_PLAYER_HURT_FREEZE = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_HURT_FREEZE); + public static final CompatSoundEvent ENTITY_PLAYER_HURT_ON_FIRE = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_HURT_ON_FIRE); + public static final CompatSoundEvent ENTITY_PLAYER_HURT_SWEET_BERRY_BUSH = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_HURT_SWEET_BERRY_BUSH); + public static final CompatSoundEvent ENTITY_PLAYER_LEVELUP = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_LEVELUP); + public static final CompatSoundEvent ENTITY_PLAYER_SMALL_FALL = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_SMALL_FALL); + public static final CompatSoundEvent ENTITY_PLAYER_SPLASH = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_SPLASH); + public static final CompatSoundEvent ENTITY_PLAYER_SPLASH_HIGH_SPEED = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_SPLASH_HIGH_SPEED); + public static final CompatSoundEvent ENTITY_PLAYER_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_SWIM); + public static final CompatSoundEvent ENTITY_PLAYER_TELEPORT = new CompatSoundEvent(SoundEvents.ENTITY_PLAYER_TELEPORT); + public static final CompatSoundEvent ENTITY_POLAR_BEAR_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_POLAR_BEAR_AMBIENT); + public static final CompatSoundEvent ENTITY_POLAR_BEAR_AMBIENT_BABY = new CompatSoundEvent(SoundEvents.ENTITY_POLAR_BEAR_AMBIENT_BABY); + public static final CompatSoundEvent ENTITY_POLAR_BEAR_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_POLAR_BEAR_DEATH); + public static final CompatSoundEvent ENTITY_POLAR_BEAR_HURT = new CompatSoundEvent(SoundEvents.ENTITY_POLAR_BEAR_HURT); + public static final CompatSoundEvent ENTITY_POLAR_BEAR_STEP = new CompatSoundEvent(SoundEvents.ENTITY_POLAR_BEAR_STEP); + public static final CompatSoundEvent ENTITY_POLAR_BEAR_WARNING = new CompatSoundEvent(SoundEvents.ENTITY_POLAR_BEAR_WARNING); + public static final CompatSoundEvent BLOCK_POLISHED_DEEPSLATE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_DEEPSLATE_BREAK); + public static final CompatSoundEvent BLOCK_POLISHED_DEEPSLATE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_DEEPSLATE_FALL); + public static final CompatSoundEvent BLOCK_POLISHED_DEEPSLATE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_DEEPSLATE_HIT); + public static final CompatSoundEvent BLOCK_POLISHED_DEEPSLATE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_DEEPSLATE_PLACE); + public static final CompatSoundEvent BLOCK_POLISHED_DEEPSLATE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_DEEPSLATE_STEP); + public static final CompatSoundEvent BLOCK_PORTAL_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_PORTAL_AMBIENT); + public static final CompatSoundEvent BLOCK_PORTAL_TRAVEL = new CompatSoundEvent(SoundEvents.BLOCK_PORTAL_TRAVEL); + public static final CompatSoundEvent BLOCK_PORTAL_TRIGGER = new CompatSoundEvent(SoundEvents.BLOCK_PORTAL_TRIGGER); + public static final CompatSoundEvent BLOCK_POWDER_SNOW_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_POWDER_SNOW_BREAK); + public static final CompatSoundEvent BLOCK_POWDER_SNOW_FALL = new CompatSoundEvent(SoundEvents.BLOCK_POWDER_SNOW_FALL); + public static final CompatSoundEvent BLOCK_POWDER_SNOW_HIT = new CompatSoundEvent(SoundEvents.BLOCK_POWDER_SNOW_HIT); + public static final CompatSoundEvent BLOCK_POWDER_SNOW_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_POWDER_SNOW_PLACE); + public static final CompatSoundEvent BLOCK_POWDER_SNOW_STEP = new CompatSoundEvent(SoundEvents.BLOCK_POWDER_SNOW_STEP); + public static final CompatSoundEvent ENTITY_PUFFER_FISH_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_PUFFER_FISH_AMBIENT); + public static final CompatSoundEvent ENTITY_PUFFER_FISH_BLOW_OUT = new CompatSoundEvent(SoundEvents.ENTITY_PUFFER_FISH_BLOW_OUT); + public static final CompatSoundEvent ENTITY_PUFFER_FISH_BLOW_UP = new CompatSoundEvent(SoundEvents.ENTITY_PUFFER_FISH_BLOW_UP); + public static final CompatSoundEvent ENTITY_PUFFER_FISH_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_PUFFER_FISH_DEATH); + public static final CompatSoundEvent ENTITY_PUFFER_FISH_FLOP = new CompatSoundEvent(SoundEvents.ENTITY_PUFFER_FISH_FLOP); + public static final CompatSoundEvent ENTITY_PUFFER_FISH_HURT = new CompatSoundEvent(SoundEvents.ENTITY_PUFFER_FISH_HURT); + public static final CompatSoundEvent ENTITY_PUFFER_FISH_STING = new CompatSoundEvent(SoundEvents.ENTITY_PUFFER_FISH_STING); + public static final CompatSoundEvent BLOCK_PUMPKIN_CARVE = new CompatSoundEvent(SoundEvents.BLOCK_PUMPKIN_CARVE); + public static final CompatSoundEvent ENTITY_RABBIT_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_RABBIT_AMBIENT); + public static final CompatSoundEvent ENTITY_RABBIT_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_RABBIT_ATTACK); + public static final CompatSoundEvent ENTITY_RABBIT_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_RABBIT_DEATH); + public static final CompatSoundEvent ENTITY_RABBIT_HURT = new CompatSoundEvent(SoundEvents.ENTITY_RABBIT_HURT); + public static final CompatSoundEvent ENTITY_RABBIT_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_RABBIT_JUMP); + public static final CompatSoundEvent EVENT_RAID_HORN = new CompatSoundEvent(SoundEvents.EVENT_RAID_HORN); + public static final CompatSoundEvent ENTITY_RAVAGER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_AMBIENT); + public static final CompatSoundEvent ENTITY_RAVAGER_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_ATTACK); + public static final CompatSoundEvent ENTITY_RAVAGER_CELEBRATE = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_CELEBRATE); + public static final CompatSoundEvent ENTITY_RAVAGER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_DEATH); + public static final CompatSoundEvent ENTITY_RAVAGER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_HURT); + public static final CompatSoundEvent ENTITY_RAVAGER_STEP = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_STEP); + public static final CompatSoundEvent ENTITY_RAVAGER_STUNNED = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_STUNNED); + public static final CompatSoundEvent ENTITY_RAVAGER_ROAR = new CompatSoundEvent(SoundEvents.ENTITY_RAVAGER_ROAR); + public static final CompatSoundEvent BLOCK_NETHER_GOLD_ORE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_GOLD_ORE_BREAK); + public static final CompatSoundEvent BLOCK_NETHER_GOLD_ORE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_GOLD_ORE_FALL); + public static final CompatSoundEvent BLOCK_NETHER_GOLD_ORE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_GOLD_ORE_HIT); + public static final CompatSoundEvent BLOCK_NETHER_GOLD_ORE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_GOLD_ORE_PLACE); + public static final CompatSoundEvent BLOCK_NETHER_GOLD_ORE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_GOLD_ORE_STEP); + public static final CompatSoundEvent BLOCK_NETHER_ORE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_ORE_BREAK); + public static final CompatSoundEvent BLOCK_NETHER_ORE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_ORE_FALL); + public static final CompatSoundEvent BLOCK_NETHER_ORE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_ORE_HIT); + public static final CompatSoundEvent BLOCK_NETHER_ORE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_ORE_PLACE); + public static final CompatSoundEvent BLOCK_NETHER_ORE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_NETHER_ORE_STEP); + public static final CompatSoundEvent BLOCK_REDSTONE_TORCH_BURNOUT = new CompatSoundEvent(SoundEvents.BLOCK_REDSTONE_TORCH_BURNOUT); + public static final CompatSoundEvent BLOCK_RESPAWN_ANCHOR_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_RESPAWN_ANCHOR_AMBIENT); + public static final CompatSoundEvent BLOCK_RESPAWN_ANCHOR_CHARGE = new CompatSoundEvent(SoundEvents.BLOCK_RESPAWN_ANCHOR_CHARGE); + public static final CompatSoundEvent BLOCK_RESPAWN_ANCHOR_DEPLETE = new CompatSoundEvent(SoundEvents.BLOCK_RESPAWN_ANCHOR_DEPLETE); + public static final CompatSoundEvent BLOCK_RESPAWN_ANCHOR_SET_SPAWN = new CompatSoundEvent(SoundEvents.BLOCK_RESPAWN_ANCHOR_SET_SPAWN); + public static final CompatSoundEvent BLOCK_ROOTED_DIRT_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_ROOTED_DIRT_BREAK); + public static final CompatSoundEvent BLOCK_ROOTED_DIRT_FALL = new CompatSoundEvent(SoundEvents.BLOCK_ROOTED_DIRT_FALL); + public static final CompatSoundEvent BLOCK_ROOTED_DIRT_HIT = new CompatSoundEvent(SoundEvents.BLOCK_ROOTED_DIRT_HIT); + public static final CompatSoundEvent BLOCK_ROOTED_DIRT_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_ROOTED_DIRT_PLACE); + public static final CompatSoundEvent BLOCK_ROOTED_DIRT_STEP = new CompatSoundEvent(SoundEvents.BLOCK_ROOTED_DIRT_STEP); + public static final CompatSoundEvent ENTITY_SALMON_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SALMON_AMBIENT); + public static final CompatSoundEvent ENTITY_SALMON_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SALMON_DEATH); + public static final CompatSoundEvent ENTITY_SALMON_FLOP = new CompatSoundEvent(SoundEvents.ENTITY_SALMON_FLOP); + public static final CompatSoundEvent ENTITY_SALMON_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SALMON_HURT); + public static final CompatSoundEvent BLOCK_SAND_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SAND_BREAK); + public static final CompatSoundEvent BLOCK_SAND_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SAND_FALL); + public static final CompatSoundEvent BLOCK_SAND_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SAND_HIT); + public static final CompatSoundEvent BLOCK_SAND_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SAND_PLACE); + public static final CompatSoundEvent BLOCK_SAND_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SAND_STEP); + public static final CompatSoundEvent BLOCK_SCAFFOLDING_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SCAFFOLDING_BREAK); + public static final CompatSoundEvent BLOCK_SCAFFOLDING_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SCAFFOLDING_FALL); + public static final CompatSoundEvent BLOCK_SCAFFOLDING_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SCAFFOLDING_HIT); + public static final CompatSoundEvent BLOCK_SCAFFOLDING_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SCAFFOLDING_PLACE); + public static final CompatSoundEvent BLOCK_SCAFFOLDING_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SCAFFOLDING_STEP); + public static final CompatSoundEvent BLOCK_SCULK_SPREAD = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SPREAD); + public static final CompatSoundEvent BLOCK_SCULK_CHARGE = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_CHARGE); + public static final CompatSoundEvent BLOCK_SCULK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_BREAK); + public static final CompatSoundEvent BLOCK_SCULK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_FALL); + public static final CompatSoundEvent BLOCK_SCULK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_HIT); + public static final CompatSoundEvent BLOCK_SCULK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_PLACE); + public static final CompatSoundEvent BLOCK_SCULK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_STEP); + public static final CompatSoundEvent BLOCK_SCULK_CATALYST_BLOOM = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_CATALYST_BLOOM); + public static final CompatSoundEvent BLOCK_SCULK_CATALYST_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_CATALYST_BREAK); + public static final CompatSoundEvent BLOCK_SCULK_CATALYST_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_CATALYST_FALL); + public static final CompatSoundEvent BLOCK_SCULK_CATALYST_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_CATALYST_HIT); + public static final CompatSoundEvent BLOCK_SCULK_CATALYST_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_CATALYST_PLACE); + public static final CompatSoundEvent BLOCK_SCULK_CATALYST_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_CATALYST_STEP); + public static final CompatSoundEvent BLOCK_SCULK_SENSOR_CLICKING = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SENSOR_CLICKING); + public static final CompatSoundEvent BLOCK_SCULK_SENSOR_CLICKING_STOP = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SENSOR_CLICKING_STOP); + public static final CompatSoundEvent BLOCK_SCULK_SENSOR_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SENSOR_BREAK); + public static final CompatSoundEvent BLOCK_SCULK_SENSOR_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SENSOR_FALL); + public static final CompatSoundEvent BLOCK_SCULK_SENSOR_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SENSOR_HIT); + public static final CompatSoundEvent BLOCK_SCULK_SENSOR_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SENSOR_PLACE); + public static final CompatSoundEvent BLOCK_SCULK_SENSOR_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SENSOR_STEP); + public static final CompatSoundEvent BLOCK_SCULK_SHRIEKER_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SHRIEKER_BREAK); + public static final CompatSoundEvent BLOCK_SCULK_SHRIEKER_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SHRIEKER_FALL); + public static final CompatSoundEvent BLOCK_SCULK_SHRIEKER_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SHRIEKER_HIT); + public static final CompatSoundEvent BLOCK_SCULK_SHRIEKER_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SHRIEKER_PLACE); + public static final CompatSoundEvent BLOCK_SCULK_SHRIEKER_SHRIEK = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SHRIEKER_SHRIEK); + public static final CompatSoundEvent BLOCK_SCULK_SHRIEKER_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_SHRIEKER_STEP); + public static final CompatSoundEvent BLOCK_SCULK_VEIN_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_VEIN_BREAK); + public static final CompatSoundEvent BLOCK_SCULK_VEIN_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_VEIN_FALL); + public static final CompatSoundEvent BLOCK_SCULK_VEIN_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_VEIN_HIT); + public static final CompatSoundEvent BLOCK_SCULK_VEIN_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_VEIN_PLACE); + public static final CompatSoundEvent BLOCK_SCULK_VEIN_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SCULK_VEIN_STEP); + public static final CompatSoundEvent ENTITY_SHEEP_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SHEEP_AMBIENT); + public static final CompatSoundEvent ENTITY_SHEEP_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SHEEP_DEATH); + public static final CompatSoundEvent ENTITY_SHEEP_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SHEEP_HURT); + public static final CompatSoundEvent ENTITY_SHEEP_SHEAR = new CompatSoundEvent(SoundEvents.ENTITY_SHEEP_SHEAR); + public static final CompatSoundEvent ENTITY_SHEEP_STEP = new CompatSoundEvent(SoundEvents.ENTITY_SHEEP_STEP); + public static final CompatSoundEvent ITEM_SHIELD_BLOCK = new CompatSoundEvent(SoundEvents.ITEM_SHIELD_BLOCK); + public static final CompatSoundEvent ITEM_SHIELD_BREAK = new CompatSoundEvent(SoundEvents.ITEM_SHIELD_BREAK); + public static final CompatSoundEvent BLOCK_SHROOMLIGHT_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SHROOMLIGHT_BREAK); + public static final CompatSoundEvent BLOCK_SHROOMLIGHT_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SHROOMLIGHT_STEP); + public static final CompatSoundEvent BLOCK_SHROOMLIGHT_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SHROOMLIGHT_PLACE); + public static final CompatSoundEvent BLOCK_SHROOMLIGHT_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SHROOMLIGHT_HIT); + public static final CompatSoundEvent BLOCK_SHROOMLIGHT_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SHROOMLIGHT_FALL); + public static final CompatSoundEvent ITEM_SHOVEL_FLATTEN = new CompatSoundEvent(SoundEvents.ITEM_SHOVEL_FLATTEN); + public static final CompatSoundEvent ENTITY_SHULKER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_AMBIENT); + public static final CompatSoundEvent BLOCK_SHULKER_BOX_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_SHULKER_BOX_CLOSE); + public static final CompatSoundEvent BLOCK_SHULKER_BOX_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_SHULKER_BOX_OPEN); + public static final CompatSoundEvent ENTITY_SHULKER_BULLET_HIT = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_BULLET_HIT); + public static final CompatSoundEvent ENTITY_SHULKER_BULLET_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_BULLET_HURT); + public static final CompatSoundEvent ENTITY_SHULKER_CLOSE = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_CLOSE); + public static final CompatSoundEvent ENTITY_SHULKER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_DEATH); + public static final CompatSoundEvent ENTITY_SHULKER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_HURT); + public static final CompatSoundEvent ENTITY_SHULKER_HURT_CLOSED = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_HURT_CLOSED); + public static final CompatSoundEvent ENTITY_SHULKER_OPEN = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_OPEN); + public static final CompatSoundEvent ENTITY_SHULKER_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_SHOOT); + public static final CompatSoundEvent ENTITY_SHULKER_TELEPORT = new CompatSoundEvent(SoundEvents.ENTITY_SHULKER_TELEPORT); + public static final CompatSoundEvent ENTITY_SILVERFISH_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SILVERFISH_AMBIENT); + public static final CompatSoundEvent ENTITY_SILVERFISH_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SILVERFISH_DEATH); + public static final CompatSoundEvent ENTITY_SILVERFISH_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SILVERFISH_HURT); + public static final CompatSoundEvent ENTITY_SILVERFISH_STEP = new CompatSoundEvent(SoundEvents.ENTITY_SILVERFISH_STEP); + public static final CompatSoundEvent ENTITY_SKELETON_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_AMBIENT); + public static final CompatSoundEvent ENTITY_SKELETON_CONVERTED_TO_STRAY = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_CONVERTED_TO_STRAY); + public static final CompatSoundEvent ENTITY_SKELETON_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_DEATH); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_AMBIENT); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_DEATH); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_HURT); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_SWIM); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_AMBIENT_WATER = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_AMBIENT_WATER); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_GALLOP_WATER = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_GALLOP_WATER); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_JUMP_WATER = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_JUMP_WATER); + public static final CompatSoundEvent ENTITY_SKELETON_HORSE_STEP_WATER = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HORSE_STEP_WATER); + public static final CompatSoundEvent ENTITY_SKELETON_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_HURT); + public static final CompatSoundEvent ENTITY_SKELETON_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_SHOOT); + public static final CompatSoundEvent ENTITY_SKELETON_STEP = new CompatSoundEvent(SoundEvents.ENTITY_SKELETON_STEP); + public static final CompatSoundEvent ENTITY_SLIME_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_ATTACK); + public static final CompatSoundEvent ENTITY_SLIME_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_DEATH); + public static final CompatSoundEvent ENTITY_SLIME_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_HURT); + public static final CompatSoundEvent ENTITY_SLIME_JUMP = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_JUMP); + public static final CompatSoundEvent ENTITY_SLIME_SQUISH = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_SQUISH); + public static final CompatSoundEvent BLOCK_SLIME_BLOCK_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SLIME_BLOCK_BREAK); + public static final CompatSoundEvent BLOCK_SLIME_BLOCK_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SLIME_BLOCK_FALL); + public static final CompatSoundEvent BLOCK_SLIME_BLOCK_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SLIME_BLOCK_HIT); + public static final CompatSoundEvent BLOCK_SLIME_BLOCK_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SLIME_BLOCK_PLACE); + public static final CompatSoundEvent BLOCK_SLIME_BLOCK_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SLIME_BLOCK_STEP); + public static final CompatSoundEvent BLOCK_SMALL_AMETHYST_BUD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SMALL_AMETHYST_BUD_BREAK); + public static final CompatSoundEvent BLOCK_SMALL_AMETHYST_BUD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SMALL_AMETHYST_BUD_PLACE); + public static final CompatSoundEvent BLOCK_SMALL_DRIPLEAF_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SMALL_DRIPLEAF_BREAK); + public static final CompatSoundEvent BLOCK_SMALL_DRIPLEAF_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SMALL_DRIPLEAF_FALL); + public static final CompatSoundEvent BLOCK_SMALL_DRIPLEAF_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SMALL_DRIPLEAF_HIT); + public static final CompatSoundEvent BLOCK_SMALL_DRIPLEAF_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SMALL_DRIPLEAF_PLACE); + public static final CompatSoundEvent BLOCK_SMALL_DRIPLEAF_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SMALL_DRIPLEAF_STEP); + public static final CompatSoundEvent BLOCK_SOUL_SAND_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SAND_BREAK); + public static final CompatSoundEvent BLOCK_SOUL_SAND_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SAND_STEP); + public static final CompatSoundEvent BLOCK_SOUL_SAND_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SAND_PLACE); + public static final CompatSoundEvent BLOCK_SOUL_SAND_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SAND_HIT); + public static final CompatSoundEvent BLOCK_SOUL_SAND_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SAND_FALL); + public static final CompatSoundEvent BLOCK_SOUL_SOIL_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SOIL_BREAK); + public static final CompatSoundEvent BLOCK_SOUL_SOIL_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SOIL_STEP); + public static final CompatSoundEvent BLOCK_SOUL_SOIL_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SOIL_PLACE); + public static final CompatSoundEvent BLOCK_SOUL_SOIL_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SOIL_HIT); + public static final CompatSoundEvent BLOCK_SOUL_SOIL_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SOUL_SOIL_FALL); + public static final CompatSoundEvent PARTICLE_SOUL_ESCAPE = new CompatSoundEvent(SoundEvents.PARTICLE_SOUL_ESCAPE); + public static final CompatSoundEvent BLOCK_SPORE_BLOSSOM_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SPORE_BLOSSOM_BREAK); + public static final CompatSoundEvent BLOCK_SPORE_BLOSSOM_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SPORE_BLOSSOM_FALL); + public static final CompatSoundEvent BLOCK_SPORE_BLOSSOM_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SPORE_BLOSSOM_HIT); + public static final CompatSoundEvent BLOCK_SPORE_BLOSSOM_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SPORE_BLOSSOM_PLACE); + public static final CompatSoundEvent BLOCK_SPORE_BLOSSOM_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SPORE_BLOSSOM_STEP); + public static final CompatSoundEvent ENTITY_STRIDER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_AMBIENT); + public static final CompatSoundEvent ENTITY_STRIDER_HAPPY = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_HAPPY); + public static final CompatSoundEvent ENTITY_STRIDER_RETREAT = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_RETREAT); + public static final CompatSoundEvent ENTITY_STRIDER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_DEATH); + public static final CompatSoundEvent ENTITY_STRIDER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_HURT); + public static final CompatSoundEvent ENTITY_STRIDER_STEP = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_STEP); + public static final CompatSoundEvent ENTITY_STRIDER_STEP_LAVA = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_STEP_LAVA); + public static final CompatSoundEvent ENTITY_STRIDER_EAT = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_EAT); + public static final CompatSoundEvent ENTITY_STRIDER_SADDLE = new CompatSoundEvent(SoundEvents.ENTITY_STRIDER_SADDLE); + public static final CompatSoundEvent ENTITY_SLIME_DEATH_SMALL = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_DEATH_SMALL); + public static final CompatSoundEvent ENTITY_SLIME_HURT_SMALL = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_HURT_SMALL); + public static final CompatSoundEvent ENTITY_SLIME_JUMP_SMALL = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_JUMP_SMALL); + public static final CompatSoundEvent ENTITY_SLIME_SQUISH_SMALL = new CompatSoundEvent(SoundEvents.ENTITY_SLIME_SQUISH_SMALL); + public static final CompatSoundEvent BLOCK_SMITHING_TABLE_USE = new CompatSoundEvent(SoundEvents.BLOCK_SMITHING_TABLE_USE); + public static final CompatSoundEvent BLOCK_SMOKER_SMOKE = new CompatSoundEvent(SoundEvents.BLOCK_SMOKER_SMOKE); + public static final CompatSoundEvent ENTITY_SNIFFER_STEP = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_STEP); + public static final CompatSoundEvent ENTITY_SNIFFER_EAT = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_EAT); + public static final CompatSoundEvent ENTITY_SNIFFER_IDLE = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_IDLE); + public static final CompatSoundEvent ENTITY_SNIFFER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_HURT); + public static final CompatSoundEvent ENTITY_SNIFFER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_DEATH); + public static final CompatSoundEvent ENTITY_SNIFFER_DROP_SEED = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_DROP_SEED); + public static final CompatSoundEvent ENTITY_SNIFFER_SCENTING = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_SCENTING); + public static final CompatSoundEvent ENTITY_SNIFFER_SNIFFING = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_SNIFFING); + public static final CompatSoundEvent ENTITY_SNIFFER_SEARCHING = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_SEARCHING); + public static final CompatSoundEvent ENTITY_SNIFFER_DIGGING = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_DIGGING); + public static final CompatSoundEvent ENTITY_SNIFFER_DIGGING_STOP = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_DIGGING_STOP); + public static final CompatSoundEvent ENTITY_SNIFFER_HAPPY = new CompatSoundEvent(SoundEvents.ENTITY_SNIFFER_HAPPY); + public static final CompatSoundEvent BLOCK_SNIFFER_EGG_PLOP = new CompatSoundEvent(SoundEvents.BLOCK_SNIFFER_EGG_PLOP); + public static final CompatSoundEvent BLOCK_SNIFFER_EGG_CRACK = new CompatSoundEvent(SoundEvents.BLOCK_SNIFFER_EGG_CRACK); + public static final CompatSoundEvent BLOCK_SNIFFER_EGG_HATCH = new CompatSoundEvent(SoundEvents.BLOCK_SNIFFER_EGG_HATCH); + public static final CompatSoundEvent ENTITY_SNOWBALL_THROW = new CompatSoundEvent(SoundEvents.ENTITY_SNOWBALL_THROW); + public static final CompatSoundEvent BLOCK_SNOW_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SNOW_BREAK); + public static final CompatSoundEvent BLOCK_SNOW_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SNOW_FALL); + public static final CompatSoundEvent ENTITY_SNOW_GOLEM_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SNOW_GOLEM_AMBIENT); + public static final CompatSoundEvent ENTITY_SNOW_GOLEM_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SNOW_GOLEM_DEATH); + public static final CompatSoundEvent ENTITY_SNOW_GOLEM_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SNOW_GOLEM_HURT); + public static final CompatSoundEvent ENTITY_SNOW_GOLEM_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_SNOW_GOLEM_SHOOT); + public static final CompatSoundEvent ENTITY_SNOW_GOLEM_SHEAR = new CompatSoundEvent(SoundEvents.ENTITY_SNOW_GOLEM_SHEAR); + public static final CompatSoundEvent BLOCK_SNOW_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SNOW_HIT); + public static final CompatSoundEvent BLOCK_SNOW_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SNOW_PLACE); + public static final CompatSoundEvent BLOCK_SNOW_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SNOW_STEP); + public static final CompatSoundEvent ENTITY_SPIDER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SPIDER_AMBIENT); + public static final CompatSoundEvent ENTITY_SPIDER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SPIDER_DEATH); + public static final CompatSoundEvent ENTITY_SPIDER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SPIDER_HURT); + public static final CompatSoundEvent ENTITY_SPIDER_STEP = new CompatSoundEvent(SoundEvents.ENTITY_SPIDER_STEP); + public static final CompatSoundEvent ENTITY_SPLASH_POTION_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_SPLASH_POTION_BREAK); + public static final CompatSoundEvent ENTITY_SPLASH_POTION_THROW = new CompatSoundEvent(SoundEvents.ENTITY_SPLASH_POTION_THROW); + public static final CompatSoundEvent BLOCK_SPONGE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SPONGE_BREAK); + public static final CompatSoundEvent BLOCK_SPONGE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_SPONGE_FALL); + public static final CompatSoundEvent BLOCK_SPONGE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_SPONGE_HIT); + public static final CompatSoundEvent BLOCK_SPONGE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SPONGE_PLACE); + public static final CompatSoundEvent BLOCK_SPONGE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_SPONGE_STEP); + public static final CompatSoundEvent BLOCK_SPONGE_ABSORB = new CompatSoundEvent(SoundEvents.BLOCK_SPONGE_ABSORB); + public static final CompatSoundEvent ITEM_SPYGLASS_USE = new CompatSoundEvent(SoundEvents.ITEM_SPYGLASS_USE); + public static final CompatSoundEvent ITEM_SPYGLASS_STOP_USING = new CompatSoundEvent(SoundEvents.ITEM_SPYGLASS_STOP_USING); + public static final CompatSoundEvent ENTITY_SQUID_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_SQUID_AMBIENT); + public static final CompatSoundEvent ENTITY_SQUID_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_SQUID_DEATH); + public static final CompatSoundEvent ENTITY_SQUID_HURT = new CompatSoundEvent(SoundEvents.ENTITY_SQUID_HURT); + public static final CompatSoundEvent ENTITY_SQUID_SQUIRT = new CompatSoundEvent(SoundEvents.ENTITY_SQUID_SQUIRT); + public static final CompatSoundEvent BLOCK_STONE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_STONE_BREAK); + public static final CompatSoundEvent BLOCK_STONE_BUTTON_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_STONE_BUTTON_CLICK_OFF); + public static final CompatSoundEvent BLOCK_STONE_BUTTON_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON); + public static final CompatSoundEvent BLOCK_STONE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_STONE_FALL); + public static final CompatSoundEvent BLOCK_STONE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_STONE_HIT); + public static final CompatSoundEvent BLOCK_STONE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_STONE_PLACE); + public static final CompatSoundEvent BLOCK_STONE_PRESSURE_PLATE_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_STONE_PRESSURE_PLATE_CLICK_OFF); + public static final CompatSoundEvent BLOCK_STONE_PRESSURE_PLATE_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_STONE_PRESSURE_PLATE_CLICK_ON); + public static final CompatSoundEvent BLOCK_STONE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_STONE_STEP); + public static final CompatSoundEvent ENTITY_STRAY_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_STRAY_AMBIENT); + public static final CompatSoundEvent ENTITY_STRAY_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_STRAY_DEATH); + public static final CompatSoundEvent ENTITY_STRAY_HURT = new CompatSoundEvent(SoundEvents.ENTITY_STRAY_HURT); + public static final CompatSoundEvent ENTITY_STRAY_STEP = new CompatSoundEvent(SoundEvents.ENTITY_STRAY_STEP); + public static final CompatSoundEvent BLOCK_SWEET_BERRY_BUSH_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_SWEET_BERRY_BUSH_BREAK); + public static final CompatSoundEvent BLOCK_SWEET_BERRY_BUSH_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_SWEET_BERRY_BUSH_PLACE); + public static final CompatSoundEvent BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES = new CompatSoundEvent(SoundEvents.BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES); + public static final CompatSoundEvent ENTITY_TADPOLE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_TADPOLE_DEATH); + public static final CompatSoundEvent ENTITY_TADPOLE_FLOP = new CompatSoundEvent(SoundEvents.ENTITY_TADPOLE_FLOP); + public static final CompatSoundEvent ENTITY_TADPOLE_GROW_UP = new CompatSoundEvent(SoundEvents.ENTITY_TADPOLE_GROW_UP); + public static final CompatSoundEvent ENTITY_TADPOLE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_TADPOLE_HURT); + public static final CompatSoundEvent ENCHANT_THORNS_HIT = new CompatSoundEvent(SoundEvents.ENCHANT_THORNS_HIT); + public static final CompatSoundEvent ENTITY_TNT_PRIMED = new CompatSoundEvent(SoundEvents.ENTITY_TNT_PRIMED); + public static final CompatSoundEvent ITEM_TOTEM_USE = new CompatSoundEvent(SoundEvents.ITEM_TOTEM_USE); + public static final CompatSoundEvent ITEM_TRIDENT_HIT = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_HIT); + public static final CompatSoundEvent ITEM_TRIDENT_HIT_GROUND = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_HIT_GROUND); + public static final CompatSoundEvent ITEM_TRIDENT_RETURN = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_RETURN); + public static final CompatSoundEvent ITEM_TRIDENT_RIPTIDE_1 = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_RIPTIDE_1); + public static final CompatSoundEvent ITEM_TRIDENT_RIPTIDE_2 = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_RIPTIDE_2); + public static final CompatSoundEvent ITEM_TRIDENT_RIPTIDE_3 = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_RIPTIDE_3); + public static final CompatSoundEvent ITEM_TRIDENT_THROW = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_THROW); + public static final CompatSoundEvent ITEM_TRIDENT_THUNDER = new CompatSoundEvent(SoundEvents.ITEM_TRIDENT_THUNDER); + public static final CompatSoundEvent BLOCK_TRIPWIRE_ATTACH = new CompatSoundEvent(SoundEvents.BLOCK_TRIPWIRE_ATTACH); + public static final CompatSoundEvent BLOCK_TRIPWIRE_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_TRIPWIRE_CLICK_OFF); + public static final CompatSoundEvent BLOCK_TRIPWIRE_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_TRIPWIRE_CLICK_ON); + public static final CompatSoundEvent BLOCK_TRIPWIRE_DETACH = new CompatSoundEvent(SoundEvents.BLOCK_TRIPWIRE_DETACH); + public static final CompatSoundEvent ENTITY_TROPICAL_FISH_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_TROPICAL_FISH_AMBIENT); + public static final CompatSoundEvent ENTITY_TROPICAL_FISH_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_TROPICAL_FISH_DEATH); + public static final CompatSoundEvent ENTITY_TROPICAL_FISH_FLOP = new CompatSoundEvent(SoundEvents.ENTITY_TROPICAL_FISH_FLOP); + public static final CompatSoundEvent ENTITY_TROPICAL_FISH_HURT = new CompatSoundEvent(SoundEvents.ENTITY_TROPICAL_FISH_HURT); + public static final CompatSoundEvent BLOCK_TUFF_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_BREAK); + public static final CompatSoundEvent BLOCK_TUFF_STEP = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_STEP); + public static final CompatSoundEvent BLOCK_TUFF_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_PLACE); + public static final CompatSoundEvent BLOCK_TUFF_HIT = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_HIT); + public static final CompatSoundEvent BLOCK_TUFF_FALL = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_FALL); + public static final CompatSoundEvent BLOCK_TUFF_BRICKS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_BRICKS_BREAK); + public static final CompatSoundEvent BLOCK_TUFF_BRICKS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_BRICKS_FALL); + public static final CompatSoundEvent BLOCK_TUFF_BRICKS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_BRICKS_HIT); + public static final CompatSoundEvent BLOCK_TUFF_BRICKS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_BRICKS_PLACE); + public static final CompatSoundEvent BLOCK_TUFF_BRICKS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_TUFF_BRICKS_STEP); + public static final CompatSoundEvent BLOCK_POLISHED_TUFF_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_TUFF_BREAK); + public static final CompatSoundEvent BLOCK_POLISHED_TUFF_FALL = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_TUFF_FALL); + public static final CompatSoundEvent BLOCK_POLISHED_TUFF_HIT = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_TUFF_HIT); + public static final CompatSoundEvent BLOCK_POLISHED_TUFF_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_TUFF_PLACE); + public static final CompatSoundEvent BLOCK_POLISHED_TUFF_STEP = new CompatSoundEvent(SoundEvents.BLOCK_POLISHED_TUFF_STEP); + public static final CompatSoundEvent ENTITY_TURTLE_AMBIENT_LAND = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_AMBIENT_LAND); + public static final CompatSoundEvent ENTITY_TURTLE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_DEATH); + public static final CompatSoundEvent ENTITY_TURTLE_DEATH_BABY = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_DEATH_BABY); + public static final CompatSoundEvent ENTITY_TURTLE_EGG_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_EGG_BREAK); + public static final CompatSoundEvent ENTITY_TURTLE_EGG_CRACK = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_EGG_CRACK); + public static final CompatSoundEvent ENTITY_TURTLE_EGG_HATCH = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_EGG_HATCH); + public static final CompatSoundEvent ENTITY_TURTLE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_HURT); + public static final CompatSoundEvent ENTITY_TURTLE_HURT_BABY = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_HURT_BABY); + public static final CompatSoundEvent ENTITY_TURTLE_LAY_EGG = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_LAY_EGG); + public static final CompatSoundEvent ENTITY_TURTLE_SHAMBLE = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_SHAMBLE); + public static final CompatSoundEvent ENTITY_TURTLE_SHAMBLE_BABY = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_SHAMBLE_BABY); + public static final CompatSoundEvent ENTITY_TURTLE_SWIM = new CompatSoundEvent(SoundEvents.ENTITY_TURTLE_SWIM); + public static final CompatSoundEvent UI_BUTTON_CLICK = new CompatSoundEvent(SoundEvents.UI_BUTTON_CLICK); + public static final CompatSoundEvent UI_LOOM_SELECT_PATTERN = new CompatSoundEvent(SoundEvents.UI_LOOM_SELECT_PATTERN); + public static final CompatSoundEvent UI_LOOM_TAKE_RESULT = new CompatSoundEvent(SoundEvents.UI_LOOM_TAKE_RESULT); + public static final CompatSoundEvent UI_CARTOGRAPHY_TABLE_TAKE_RESULT = new CompatSoundEvent(SoundEvents.UI_CARTOGRAPHY_TABLE_TAKE_RESULT); + public static final CompatSoundEvent UI_STONECUTTER_TAKE_RESULT = new CompatSoundEvent(SoundEvents.UI_STONECUTTER_TAKE_RESULT); + public static final CompatSoundEvent UI_STONECUTTER_SELECT_RECIPE = new CompatSoundEvent(SoundEvents.UI_STONECUTTER_SELECT_RECIPE); + public static final CompatSoundEvent UI_TOAST_CHALLENGE_COMPLETE = new CompatSoundEvent(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE); + public static final CompatSoundEvent UI_TOAST_IN = new CompatSoundEvent(SoundEvents.UI_TOAST_IN); + public static final CompatSoundEvent UI_TOAST_OUT = new CompatSoundEvent(SoundEvents.UI_TOAST_OUT); + public static final CompatSoundEvent BLOCK_VAULT_ACTIVATE = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_ACTIVATE); + public static final CompatSoundEvent BLOCK_VAULT_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_AMBIENT); + public static final CompatSoundEvent BLOCK_VAULT_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_BREAK); + public static final CompatSoundEvent BLOCK_VAULT_CLOSE_SHUTTER = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_CLOSE_SHUTTER); + public static final CompatSoundEvent BLOCK_VAULT_DEACTIVATE = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_DEACTIVATE); + public static final CompatSoundEvent BLOCK_VAULT_EJECT_ITEM = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_EJECT_ITEM); + public static final CompatSoundEvent BLOCK_VAULT_REJECT_REWARDED_PLAYER = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_REJECT_REWARDED_PLAYER); + public static final CompatSoundEvent BLOCK_VAULT_FALL = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_FALL); + public static final CompatSoundEvent BLOCK_VAULT_HIT = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_HIT); + public static final CompatSoundEvent BLOCK_VAULT_INSERT_ITEM = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_INSERT_ITEM); + public static final CompatSoundEvent BLOCK_VAULT_INSERT_ITEM_FAIL = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_INSERT_ITEM_FAIL); + public static final CompatSoundEvent BLOCK_VAULT_OPEN_SHUTTER = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_OPEN_SHUTTER); + public static final CompatSoundEvent BLOCK_VAULT_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_PLACE); + public static final CompatSoundEvent BLOCK_VAULT_STEP = new CompatSoundEvent(SoundEvents.BLOCK_VAULT_STEP); + public static final CompatSoundEvent ENTITY_VEX_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_VEX_AMBIENT); + public static final CompatSoundEvent ENTITY_VEX_CHARGE = new CompatSoundEvent(SoundEvents.ENTITY_VEX_CHARGE); + public static final CompatSoundEvent ENTITY_VEX_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_VEX_DEATH); + public static final CompatSoundEvent ENTITY_VEX_HURT = new CompatSoundEvent(SoundEvents.ENTITY_VEX_HURT); + public static final CompatSoundEvent ENTITY_VILLAGER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_AMBIENT); + public static final CompatSoundEvent ENTITY_VILLAGER_CELEBRATE = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_CELEBRATE); + public static final CompatSoundEvent ENTITY_VILLAGER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_DEATH); + public static final CompatSoundEvent ENTITY_VILLAGER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_HURT); + public static final CompatSoundEvent ENTITY_VILLAGER_NO = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_NO); + public static final CompatSoundEvent ENTITY_VILLAGER_TRADE = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_TRADE); + public static final CompatSoundEvent ENTITY_VILLAGER_YES = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_YES); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_ARMORER = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_ARMORER); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_BUTCHER = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_BUTCHER); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_CARTOGRAPHER = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_CARTOGRAPHER); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_CLERIC = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_CLERIC); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_FARMER = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_FARMER); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_FISHERMAN = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_FISHERMAN); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_FLETCHER = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_FLETCHER); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_LEATHERWORKER = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_LEATHERWORKER); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_LIBRARIAN = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_LIBRARIAN); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_MASON = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_MASON); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_SHEPHERD = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_SHEPHERD); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_TOOLSMITH = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_TOOLSMITH); + public static final CompatSoundEvent ENTITY_VILLAGER_WORK_WEAPONSMITH = new CompatSoundEvent(SoundEvents.ENTITY_VILLAGER_WORK_WEAPONSMITH); + public static final CompatSoundEvent ENTITY_VINDICATOR_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_VINDICATOR_AMBIENT); + public static final CompatSoundEvent ENTITY_VINDICATOR_CELEBRATE = new CompatSoundEvent(SoundEvents.ENTITY_VINDICATOR_CELEBRATE); + public static final CompatSoundEvent ENTITY_VINDICATOR_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_VINDICATOR_DEATH); + public static final CompatSoundEvent ENTITY_VINDICATOR_HURT = new CompatSoundEvent(SoundEvents.ENTITY_VINDICATOR_HURT); + public static final CompatSoundEvent BLOCK_VINE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_VINE_BREAK); + public static final CompatSoundEvent BLOCK_VINE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_VINE_FALL); + public static final CompatSoundEvent BLOCK_VINE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_VINE_HIT); + public static final CompatSoundEvent BLOCK_VINE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_VINE_PLACE); + public static final CompatSoundEvent BLOCK_VINE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_VINE_STEP); + public static final CompatSoundEvent BLOCK_LILY_PAD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_LILY_PAD_PLACE); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_AMBIENT); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_DEATH); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_DISAPPEARED = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_DISAPPEARED); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_DRINK_MILK = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_DRINK_MILK); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_DRINK_POTION = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_DRINK_POTION); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_HURT); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_NO = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_NO); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_REAPPEARED = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_REAPPEARED); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_TRADE = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_TRADE); + public static final CompatSoundEvent ENTITY_WANDERING_TRADER_YES = new CompatSoundEvent(SoundEvents.ENTITY_WANDERING_TRADER_YES); + public static final CompatSoundEvent ENTITY_WARDEN_AGITATED = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_AGITATED); + public static final CompatSoundEvent ENTITY_WARDEN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_AMBIENT); + public static final CompatSoundEvent ENTITY_WARDEN_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_ANGRY); + public static final CompatSoundEvent ENTITY_WARDEN_ATTACK_IMPACT = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_ATTACK_IMPACT); + public static final CompatSoundEvent ENTITY_WARDEN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_DEATH); + public static final CompatSoundEvent ENTITY_WARDEN_DIG = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_DIG); + public static final CompatSoundEvent ENTITY_WARDEN_EMERGE = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_EMERGE); + public static final CompatSoundEvent ENTITY_WARDEN_HEARTBEAT = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_HEARTBEAT); + public static final CompatSoundEvent ENTITY_WARDEN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_HURT); + public static final CompatSoundEvent ENTITY_WARDEN_LISTENING = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_LISTENING); + public static final CompatSoundEvent ENTITY_WARDEN_LISTENING_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_LISTENING_ANGRY); + public static final CompatSoundEvent ENTITY_WARDEN_NEARBY_CLOSE = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_NEARBY_CLOSE); + public static final CompatSoundEvent ENTITY_WARDEN_NEARBY_CLOSER = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_NEARBY_CLOSER); + public static final CompatSoundEvent ENTITY_WARDEN_NEARBY_CLOSEST = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_NEARBY_CLOSEST); + public static final CompatSoundEvent ENTITY_WARDEN_ROAR = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_ROAR); + public static final CompatSoundEvent ENTITY_WARDEN_SNIFF = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_SNIFF); + public static final CompatSoundEvent ENTITY_WARDEN_SONIC_BOOM = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_SONIC_BOOM); + public static final CompatSoundEvent ENTITY_WARDEN_SONIC_CHARGE = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_SONIC_CHARGE); + public static final CompatSoundEvent ENTITY_WARDEN_STEP = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_STEP); + public static final CompatSoundEvent ENTITY_WARDEN_TENDRIL_CLICKS = new CompatSoundEvent(SoundEvents.ENTITY_WARDEN_TENDRIL_CLICKS); + public static final CompatSoundEvent BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL = new CompatSoundEvent(SoundEvents.BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL); + public static final CompatSoundEvent BLOCK_SIGN_WAXED_INTERACT_FAIL = new CompatSoundEvent(SoundEvents.BLOCK_SIGN_WAXED_INTERACT_FAIL); + public static final CompatSoundEvent BLOCK_WATER_AMBIENT = new CompatSoundEvent(SoundEvents.BLOCK_WATER_AMBIENT); + public static final CompatSoundEvent WEATHER_RAIN = new CompatSoundEvent(SoundEvents.WEATHER_RAIN); + public static final CompatSoundEvent WEATHER_RAIN_ABOVE = new CompatSoundEvent(SoundEvents.WEATHER_RAIN_ABOVE); + public static final CompatSoundEvent BLOCK_WET_GRASS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_WET_GRASS_BREAK); + public static final CompatSoundEvent BLOCK_WET_GRASS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_WET_GRASS_FALL); + public static final CompatSoundEvent BLOCK_WET_GRASS_HIT = new CompatSoundEvent(SoundEvents.BLOCK_WET_GRASS_HIT); + public static final CompatSoundEvent BLOCK_WET_GRASS_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_WET_GRASS_PLACE); + public static final CompatSoundEvent BLOCK_WET_GRASS_STEP = new CompatSoundEvent(SoundEvents.BLOCK_WET_GRASS_STEP); + public static final CompatSoundEvent BLOCK_WET_SPONGE_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_WET_SPONGE_BREAK); + public static final CompatSoundEvent BLOCK_WET_SPONGE_DRIES = new CompatSoundEvent(SoundEvents.BLOCK_WET_SPONGE_DRIES); + public static final CompatSoundEvent BLOCK_WET_SPONGE_FALL = new CompatSoundEvent(SoundEvents.BLOCK_WET_SPONGE_FALL); + public static final CompatSoundEvent BLOCK_WET_SPONGE_HIT = new CompatSoundEvent(SoundEvents.BLOCK_WET_SPONGE_HIT); + public static final CompatSoundEvent BLOCK_WET_SPONGE_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_WET_SPONGE_PLACE); + public static final CompatSoundEvent BLOCK_WET_SPONGE_STEP = new CompatSoundEvent(SoundEvents.BLOCK_WET_SPONGE_STEP); + public static final CompatSoundEvent ENTITY_WIND_CHARGE_WIND_BURST = new CompatSoundEvent(SoundEvents.ENTITY_WIND_CHARGE_WIND_BURST); + public static final CompatSoundEvent ENTITY_WIND_CHARGE_THROW = new CompatSoundEvent(SoundEvents.ENTITY_WIND_CHARGE_THROW); + public static final CompatSoundEvent ENTITY_WITCH_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_WITCH_AMBIENT); + public static final CompatSoundEvent ENTITY_WITCH_CELEBRATE = new CompatSoundEvent(SoundEvents.ENTITY_WITCH_CELEBRATE); + public static final CompatSoundEvent ENTITY_WITCH_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_WITCH_DEATH); + public static final CompatSoundEvent ENTITY_WITCH_DRINK = new CompatSoundEvent(SoundEvents.ENTITY_WITCH_DRINK); + public static final CompatSoundEvent ENTITY_WITCH_HURT = new CompatSoundEvent(SoundEvents.ENTITY_WITCH_HURT); + public static final CompatSoundEvent ENTITY_WITCH_THROW = new CompatSoundEvent(SoundEvents.ENTITY_WITCH_THROW); + public static final CompatSoundEvent ENTITY_WITHER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_AMBIENT); + public static final CompatSoundEvent ENTITY_WITHER_BREAK_BLOCK = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_BREAK_BLOCK); + public static final CompatSoundEvent ENTITY_WITHER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_DEATH); + public static final CompatSoundEvent ENTITY_WITHER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_HURT); + public static final CompatSoundEvent ENTITY_WITHER_SHOOT = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_SHOOT); + public static final CompatSoundEvent ENTITY_WITHER_SKELETON_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_SKELETON_AMBIENT); + public static final CompatSoundEvent ENTITY_WITHER_SKELETON_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_SKELETON_DEATH); + public static final CompatSoundEvent ENTITY_WITHER_SKELETON_HURT = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_SKELETON_HURT); + public static final CompatSoundEvent ENTITY_WITHER_SKELETON_STEP = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_SKELETON_STEP); + public static final CompatSoundEvent ENTITY_WITHER_SPAWN = new CompatSoundEvent(SoundEvents.ENTITY_WITHER_SPAWN); + public static final CompatSoundEvent ITEM_WOLF_ARMOR_BREAK = new CompatSoundEvent(SoundEvents.ITEM_WOLF_ARMOR_BREAK); + public static final CompatSoundEvent ITEM_WOLF_ARMOR_CRACK = new CompatSoundEvent(SoundEvents.ITEM_WOLF_ARMOR_CRACK); + public static final CompatSoundEvent ITEM_WOLF_ARMOR_DAMAGE = new CompatSoundEvent(SoundEvents.ITEM_WOLF_ARMOR_DAMAGE); + public static final CompatSoundEvent ITEM_WOLF_ARMOR_REPAIR = new CompatSoundEvent(SoundEvents.ITEM_WOLF_ARMOR_REPAIR); + public static final CompatSoundEvent ENTITY_WOLF_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_AMBIENT); + public static final CompatSoundEvent ENTITY_WOLF_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_DEATH); + public static final CompatSoundEvent ENTITY_WOLF_GROWL = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_GROWL); + public static final CompatSoundEvent ENTITY_WOLF_HOWL = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_HOWL); + public static final CompatSoundEvent ENTITY_WOLF_HURT = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_HURT); + public static final CompatSoundEvent ENTITY_WOLF_PANT = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_PANT); + public static final CompatSoundEvent ENTITY_WOLF_SHAKE = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_SHAKE); + public static final CompatSoundEvent ENTITY_WOLF_STEP = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_STEP); + public static final CompatSoundEvent ENTITY_WOLF_WHINE = new CompatSoundEvent(SoundEvents.ENTITY_WOLF_WHINE); + public static final CompatSoundEvent BLOCK_WOODEN_DOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_DOOR_CLOSE); + public static final CompatSoundEvent BLOCK_WOODEN_DOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_DOOR_OPEN); + public static final CompatSoundEvent BLOCK_WOODEN_TRAPDOOR_CLOSE = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_TRAPDOOR_CLOSE); + public static final CompatSoundEvent BLOCK_WOODEN_TRAPDOOR_OPEN = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_TRAPDOOR_OPEN); + public static final CompatSoundEvent BLOCK_WOODEN_BUTTON_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_BUTTON_CLICK_OFF); + public static final CompatSoundEvent BLOCK_WOODEN_BUTTON_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_BUTTON_CLICK_ON); + public static final CompatSoundEvent BLOCK_WOODEN_PRESSURE_PLATE_CLICK_OFF = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_OFF); + public static final CompatSoundEvent BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON = new CompatSoundEvent(SoundEvents.BLOCK_WOODEN_PRESSURE_PLATE_CLICK_ON); + public static final CompatSoundEvent BLOCK_WOOD_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_WOOD_BREAK); + public static final CompatSoundEvent BLOCK_WOOD_FALL = new CompatSoundEvent(SoundEvents.BLOCK_WOOD_FALL); + public static final CompatSoundEvent BLOCK_WOOD_HIT = new CompatSoundEvent(SoundEvents.BLOCK_WOOD_HIT); + public static final CompatSoundEvent BLOCK_WOOD_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_WOOD_PLACE); + public static final CompatSoundEvent BLOCK_WOOD_STEP = new CompatSoundEvent(SoundEvents.BLOCK_WOOD_STEP); + public static final CompatSoundEvent BLOCK_WOOL_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_WOOL_BREAK); + public static final CompatSoundEvent BLOCK_WOOL_FALL = new CompatSoundEvent(SoundEvents.BLOCK_WOOL_FALL); + public static final CompatSoundEvent BLOCK_WOOL_HIT = new CompatSoundEvent(SoundEvents.BLOCK_WOOL_HIT); + public static final CompatSoundEvent BLOCK_WOOL_PLACE = new CompatSoundEvent(SoundEvents.BLOCK_WOOL_PLACE); + public static final CompatSoundEvent BLOCK_WOOL_STEP = new CompatSoundEvent(SoundEvents.BLOCK_WOOL_STEP); + public static final CompatSoundEvent ENTITY_ZOGLIN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ZOGLIN_AMBIENT); + public static final CompatSoundEvent ENTITY_ZOGLIN_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_ZOGLIN_ANGRY); + public static final CompatSoundEvent ENTITY_ZOGLIN_ATTACK = new CompatSoundEvent(SoundEvents.ENTITY_ZOGLIN_ATTACK); + public static final CompatSoundEvent ENTITY_ZOGLIN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ZOGLIN_DEATH); + public static final CompatSoundEvent ENTITY_ZOGLIN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ZOGLIN_HURT); + public static final CompatSoundEvent ENTITY_ZOGLIN_STEP = new CompatSoundEvent(SoundEvents.ENTITY_ZOGLIN_STEP); + public static final CompatSoundEvent ENTITY_ZOMBIE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_AMBIENT); + public static final CompatSoundEvent ENTITY_ZOMBIE_ATTACK_WOODEN_DOOR = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_ATTACK_WOODEN_DOOR); + public static final CompatSoundEvent ENTITY_ZOMBIE_ATTACK_IRON_DOOR = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_ATTACK_IRON_DOOR); + public static final CompatSoundEvent ENTITY_ZOMBIE_BREAK_WOODEN_DOOR = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_BREAK_WOODEN_DOOR); + public static final CompatSoundEvent ENTITY_ZOMBIE_CONVERTED_TO_DROWNED = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_CONVERTED_TO_DROWNED); + public static final CompatSoundEvent ENTITY_ZOMBIE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_DEATH); + public static final CompatSoundEvent ENTITY_ZOMBIE_DESTROY_EGG = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_DESTROY_EGG); + public static final CompatSoundEvent ENTITY_ZOMBIE_HORSE_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_HORSE_AMBIENT); + public static final CompatSoundEvent ENTITY_ZOMBIE_HORSE_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_HORSE_DEATH); + public static final CompatSoundEvent ENTITY_ZOMBIE_HORSE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_HORSE_HURT); + public static final CompatSoundEvent ENTITY_ZOMBIE_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_HURT); + public static final CompatSoundEvent ENTITY_ZOMBIE_INFECT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_INFECT); + public static final CompatSoundEvent ENTITY_ZOMBIFIED_PIGLIN_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIFIED_PIGLIN_AMBIENT); + public static final CompatSoundEvent ENTITY_ZOMBIFIED_PIGLIN_ANGRY = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIFIED_PIGLIN_ANGRY); + public static final CompatSoundEvent ENTITY_ZOMBIFIED_PIGLIN_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIFIED_PIGLIN_DEATH); + public static final CompatSoundEvent ENTITY_ZOMBIFIED_PIGLIN_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIFIED_PIGLIN_HURT); + public static final CompatSoundEvent ENTITY_ZOMBIE_STEP = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_STEP); + public static final CompatSoundEvent ENTITY_ZOMBIE_VILLAGER_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_VILLAGER_AMBIENT); + public static final CompatSoundEvent ENTITY_ZOMBIE_VILLAGER_CONVERTED = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CONVERTED); + public static final CompatSoundEvent ENTITY_ZOMBIE_VILLAGER_CURE = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE); + public static final CompatSoundEvent ENTITY_ZOMBIE_VILLAGER_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_VILLAGER_DEATH); + public static final CompatSoundEvent ENTITY_ZOMBIE_VILLAGER_HURT = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_VILLAGER_HURT); + public static final CompatSoundEvent ENTITY_ZOMBIE_VILLAGER_STEP = new CompatSoundEvent(SoundEvents.ENTITY_ZOMBIE_VILLAGER_STEP); + public static final CompatSoundEvent EVENT_MOB_EFFECT_BAD_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_BAD_OMEN); + public static final CompatSoundEvent EVENT_MOB_EFFECT_TRIAL_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_TRIAL_OMEN); + public static final CompatSoundEvent EVENT_MOB_EFFECT_RAID_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_RAID_OMEN); + + static { + GOAT_HORN_SOUNDS = SoundEvents.GOAT_HORN_SOUNDS.stream().map(CompatSoundEvent::new).collect(ImmutableList.toImmutableList()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index 5f77f9127..9844cb8f5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -393,4 +393,8 @@ public static Optional getSimpleItemStack(NbtCompound nbt, String key return Optional.of(stack); } + + public static NbtList createNbtList() { + return new NbtList(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java index 69a7bc3b7..dca5fce8d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PersistentStateUtil.java @@ -24,4 +24,8 @@ public static PersistentStateManager getManagerFromServer(MinecraftServer server public static PersistentStateManager getManagerFromWorld(ServerWorld world) { return world.getPersistentStateManager(); } + + public static void markDirty(PersistentState state) { + state.markDirty(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java index 837bb8b7f..f68dd0bfb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/VoxelShapeUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; @@ -35,4 +36,8 @@ public static VoxelShape fullCube() { public static VoxelShape blockCuboid(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { return VoxelShapes.cuboid(minX / 16.0, minY / 16.0, minZ / 16.0, maxX / 16.0, maxY / 16.0, maxZ / 16.0); } + + public static Box getBoundingBox(VoxelShape shape) { + return shape.getBoundingBox(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index db3217831..9f615b7f6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -24,6 +24,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import org.jetbrains.annotations.Nullable; import java.util.Objects; @@ -92,6 +93,14 @@ public static void playSound(World world, @Nullable Player player, BlockPos pos, world.playSound(entity, pos, sound, category, volume, pitch); } + public static void playSound(World world, @Nullable Player player, BlockPos pos, CompatSoundEvent sound, SoundCategory category, float volume, float pitch) { + playSound(world, player, pos, sound.getSoundEvent(), category, volume, pitch); + } + + public static void playSound(World world, double x, double y, double z, CompatSoundEvent sound, SoundCategory category, float volume, float pitch, boolean useDistance) { + world.playSound(x, y, z, sound.getSoundEvent(), category, volume, pitch, useDistance); + } + public static void sendEntityStatus(World world, Entity entity, byte status) { world.sendEntityStatus(entity, status); } @@ -221,6 +230,9 @@ public static boolean breakBlock(World world, BlockPos pos) { } public static boolean breakBlock(World world, BlockPos pos, boolean drop, @Nullable Player player) { + if (player == null) + return world.breakBlock(pos, drop, null); + return world.breakBlock(pos, drop, player.getPlayerEntity()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java index 695b74065..4bae9d4ab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java @@ -1,14 +1,58 @@ package net.pitan76.mcpitanlib.api.util.client; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.network.ClientPlayerEntity; +import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.texture.TextureManager; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.resource.ResourceManager; +import net.pitan76.mcpitanlib.api.entity.Player; public class ClientUtil { public static void setScreen(Screen screen) { - MinecraftClient.getInstance().setScreen(screen); + getClient().setScreen(screen); } public static Screen getScreen() { - return MinecraftClient.getInstance().currentScreen; + return getClient().currentScreen; + } + + public static Player getPlayer() { + return new Player(getClientPlayer()); + } + + public static ClientPlayerEntity getClientPlayer() { + return getClient().player; + } + + public static MinecraftClient getClient() { + return MinecraftClient.getInstance(); + } + + public static TextRenderer getTextRenderer() { + return getClient().textRenderer; + } + + public static ItemRenderer getItemRenderer() { + return getClient().getItemRenderer(); + } + + public static ResourceManager getResourceManager() { + return getClient().getResourceManager(); + } + + public static TextureManager getTextureManager() { + return getClient().getTextureManager(); + } + + public static ClientWorld getWorld() { + return getClient().world; + } + + public static GameRenderer getGameRenderer() { + return getClient().gameRenderer; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java new file mode 100644 index 000000000..bbfcb6cd5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java @@ -0,0 +1,54 @@ +package net.pitan76.mcpitanlib.core.serialization; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; + +import java.util.function.Function; + +public class CompatMapCodec { + @Deprecated + public MapCodec codec; + + @Deprecated + public CompatMapCodec(MapCodec codec) { + this.codec = codec; + } + + @Deprecated + public static CompatMapCodec of(MapCodec codec) { + return new CompatMapCodec<>(codec); + } + + public CompatMapCodec() { + + } + + public static CompatMapCodec of() { + return new CompatMapCodec<>(); + } + + @Deprecated + public MapCodec getCodec() { + return codec; + } + + public static RecordCodecBuilder createSettingsCodec() { + return AbstractBlock.Settings.CODEC.fieldOf("properties").forGetter(AbstractBlock::getSettings); + } + + public static CompatMapCodec createCodec(Function blockFromSettings) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group(createSettingsCodec()).apply(instance, blockFromSettings))); + } + + public static RecordCodecBuilder createCompatSettingsCodec() { + return CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(ExtendBlock::getCompatSettings); + } + + public static CompatMapCodec createCodecOfExtendBlock(Function blockFromSettings) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group(createCompatSettingsCodec()).apply(instance, blockFromSettings))); + } +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java new file mode 100644 index 000000000..0173477a2 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java @@ -0,0 +1,89 @@ +package net.pitan76.mcpitanlib.api.client.event.fabric; + +import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; +import net.minecraft.client.render.*; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.util.profiler.Profiler; +import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineEvent; +import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; +import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContext; +import org.jetbrains.annotations.Nullable; +import org.joml.Matrix4f; + +public class WorldRenderRegistryImpl { + public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListener listener) { + WorldRenderEvents.BEFORE_BLOCK_OUTLINE.register(((worldRenderContext, hitResult) -> listener.beforeBlockOutline(new BeforeBlockOutlineEvent( + new WorldRenderContext() { + @Override + public WorldRenderer worldRenderer() { + return worldRenderContext.worldRenderer(); + } + + @Override + public MatrixStack matrixStack() { + return worldRenderContext.matrixStack(); + } + + @Override + public float tickDelta() { + return worldRenderContext.tickCounter().getTickDelta(true); + } + + @Override + public long limitTime() { + return (long) worldRenderContext.tickCounter().getLastDuration(); + } + + @Override + public boolean blockOutlines() { + return worldRenderContext.blockOutlines(); + } + + @Override + public Camera camera() { + return worldRenderContext.camera(); + } + + @Override + public GameRenderer gameRenderer() { + return worldRenderContext.gameRenderer(); + } + + @Override + public LightmapTextureManager lightmapTextureManager() { + return worldRenderContext.lightmapTextureManager(); + } + + @Override + public Matrix4f projectionMatrix() { + return worldRenderContext.projectionMatrix(); + } + + @Override + public ClientWorld world() { + return worldRenderContext.world(); + } + + @Override + public Profiler profiler() { + return worldRenderContext.profiler(); + } + + @Override + public boolean advancedTranslucency() { + return worldRenderContext.advancedTranslucency(); + } + + @Override + public @Nullable VertexConsumerProvider consumers() { + return worldRenderContext.consumers(); + } + + @Override + public @Nullable Frustum frustum() { + return worldRenderContext.frustum(); + } + }, hitResult)))); + } +} diff --git a/info.properties b/info.properties index 65cab9385..109c811e5 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.0 +mod_version=2.4.1 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java new file mode 100644 index 000000000..15b9d7fc1 --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java @@ -0,0 +1,105 @@ +package net.pitan76.mcpitanlib.api.client.event.neoforge; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.*; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.world.ClientWorld; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.profiler.Profiler; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.neoforge.client.event.RenderHighlightEvent; +import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineEvent; +import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; +import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContext; +import org.joml.Matrix4f; + +import java.util.ArrayList; +import java.util.List; + +public class WorldRenderRegistryImpl { + + public static List beforeBlockOutlineListeners = new ArrayList<>(); + + @SubscribeEvent + public static void renderOutlineEvent(RenderHighlightEvent event) { + for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { + listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { + @Override + public WorldRenderer worldRenderer() { + return event.getLevelRenderer(); + } + + @Override + public MatrixStack matrixStack() { + return event.getPoseStack(); + } + + @Override + public float tickDelta() { + return event.getDeltaTracker().getTickDelta(true); + } + + @Override + public long limitTime() { + return (long) event.getDeltaTracker().getTickDelta(false); + } + + @Override + public boolean blockOutlines() { + return event.getTarget().getType() == HitResult.Type.BLOCK; + } + + @Override + public Camera camera() { + return event.getCamera(); + } + + @Override + public GameRenderer gameRenderer() { + return MinecraftClient.getInstance().gameRenderer; + } + + @Override + public LightmapTextureManager lightmapTextureManager() { + return MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager(); + } + + @Deprecated + @Override + public Matrix4f projectionMatrix() { + return null; + } + + @Override + public ClientWorld world() { + return MinecraftClient.getInstance().world; + } + + @Override + public Profiler profiler() { + return MinecraftClient.getInstance().getProfiler(); + } + + @Deprecated + @Override + public boolean advancedTranslucency() { + return event.getLevelRenderer().isTerrainRenderComplete(); + } + + @Override + public VertexConsumerProvider consumers() { + return event.getMultiBufferSource(); + } + + @Override + public Frustum frustum() { + return event.getLevelRenderer().getFrustum(); + } + }, event.getTarget())); + } + } + + public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListener listener) { + beforeBlockOutlineListeners.add(listener); + } +} From a50e288776b3ffec37820ed2d2dc1e698c8ef64b Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:30:56 +0900 Subject: [PATCH 376/622] fix Networking --- .../api/network/ClientNetworking.java | 29 ++++---- .../api/network/ServerNetworking.java | 45 ++++++++----- .../mcpitanlib/core/network/BufPayload.java | 67 +++++++++++++++++++ 3 files changed, 112 insertions(+), 29 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/core/network/BufPayload.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index ec7abe7c4..7f081d263 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -1,10 +1,7 @@ package net.pitan76.mcpitanlib.api.network; -import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; import dev.architectury.networking.transformers.PacketTransformer; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; @@ -13,28 +10,33 @@ import net.minecraft.network.codec.PacketCodec; import net.minecraft.network.packet.CustomPayload; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.core.network.BufPayload; import java.util.List; -import java.util.Objects; import static dev.architectury.impl.NetworkAggregator.*; public class ClientNetworking { public static void send(Identifier identifier, PacketByteBuf buf) { + /* if (!C2S_TYPE.containsKey(identifier)) { CustomPayload.Id type = new CustomPayload.Id<>(identifier); C2S_TYPE.put(identifier, type); //registerC2SType(type, NetworkAggregator.BufCustomPacketPayload.streamCodec(type), List.of()); } - CustomPayload payload = new NetworkAggregator.BufCustomPacketPayload(C2S_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + */ + + BufPayload payload = new BufPayload(buf, identifier); NetworkManager.sendToServer(payload); } public static void registerReceiver(Identifier identifier, ClientNetworkHandler handler) { - CustomPayload.Id type = new CustomPayload.Id<>(identifier); - NetworkManager.registerReceiver(NetworkManager.Side.S2C, type, BufCustomPacketPayload.streamCodec(type), List.of(), - (value, context) -> { - RegistryByteBuf buf = new RegistryByteBuf(Unpooled.wrappedBuffer(value.payload()), context.registryAccess()); + BufPayload.Id id = BufPayload.id(identifier); + + NetworkManager.registerReceiver(NetworkManager.Side.S2C, id, BufPayload.getCodec(id), List.of(), + (payload, context) -> { + PacketByteBuf buf = new PacketByteBuf(Unpooled.wrappedBuffer(payload.getData())); + ClientPlayerEntity player = null; if (context.getPlayer() instanceof ClientPlayerEntity) player = (ClientPlayerEntity) context.getPlayer(); @@ -49,10 +51,11 @@ public interface ClientNetworkHandler { void receive(MinecraftClient client, ClientPlayerEntity player, PacketByteBuf buf); } + public static void registerC2SType(CustomPayload.Id type, PacketCodec codec, List packetTransformers) { - Objects.requireNonNull(type, "Cannot register a null type!"); - packetTransformers = Objects.requireNonNullElse(packetTransformers, List.of()); - C2S_CODECS.put(type.id(), (PacketCodec) codec); - C2S_TRANSFORMERS.put(type.id(), PacketTransformer.concat(packetTransformers)); +// Objects.requireNonNull(type, "Cannot register a null type!"); +// packetTransformers = Objects.requireNonNullElse(packetTransformers, List.of()); +// C2S_CODECS.put(type.id(), (PacketCodec) codec); +// C2S_TRANSFORMERS.put(type.id(), PacketTransformer.concat(packetTransformers)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index d1a3df37d..1d4a761b3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -1,24 +1,20 @@ package net.pitan76.mcpitanlib.api.network; -import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; -import io.netty.buffer.ByteBufUtil; import io.netty.buffer.Unpooled; import net.minecraft.network.PacketByteBuf; -import net.minecraft.network.RegistryByteBuf; -import net.minecraft.network.packet.CustomPayload; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.core.network.BufPayload; +import java.util.ArrayList; import java.util.List; -import static dev.architectury.impl.NetworkAggregator.S2C_TYPE; - -import static dev.architectury.impl.NetworkAggregator.BufCustomPacketPayload; - public class ServerNetworking { public static void send(ServerPlayerEntity player, Identifier identifier, PacketByteBuf buf) { + registerS2CPayloadType(identifier); + /* if (!S2C_TYPE.containsKey(identifier)) { CustomPayload.Id type = new CustomPayload.Id<>(identifier); S2C_TYPE.put(identifier, type); @@ -26,20 +22,25 @@ public static void send(ServerPlayerEntity player, Identifier identifier, Packet //if (!NetworkAggregator.S2C_CODECS.containsKey(type)) // NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); } + */ - CustomPayload payload = new BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + BufPayload payload = new BufPayload(buf, identifier); NetworkManager.sendToPlayer(player, payload); } public static void send(Iterable players, Identifier identifier, PacketByteBuf buf) { - if (!S2C_TYPE.containsKey(identifier)) { + registerS2CPayloadType(identifier); + /*if (!S2C_TYPE.containsKey(identifier)) { CustomPayload.Id type = new CustomPayload.Id<>(identifier); S2C_TYPE.put(identifier, type); //if (!NetworkAggregator.S2C_CODECS.containsKey(type)) // NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); } - CustomPayload payload = new BufCustomPacketPayload(S2C_TYPE.get(identifier), ByteBufUtil.getBytes(buf)); + + */ + + BufPayload payload = new BufPayload(buf, identifier); NetworkManager.sendToPlayers(players, payload); } @@ -48,17 +49,29 @@ public static void sendAll(MinecraftServer server, Identifier identifier, Packet } public static void registerReceiver(Identifier identifier, ServerNetworkHandler handler) { - CustomPayload.Id type = new CustomPayload.Id<>(identifier); - NetworkManager.registerReceiver(NetworkManager.Side.C2S, type, BufCustomPacketPayload.streamCodec(type), List.of(), - (value, context) -> { - RegistryByteBuf buf = new RegistryByteBuf(Unpooled.wrappedBuffer(value.payload()), context.registryAccess()); + BufPayload.Id id = BufPayload.id(identifier); + NetworkManager.registerReceiver(NetworkManager.Side.C2S, id, BufPayload.getCodec(id), List.of(), + (payload, context) -> { + PacketByteBuf buf = new PacketByteBuf(Unpooled.wrappedBuffer(payload.getData())); + ServerPlayerEntity player = null; if (context.getPlayer() instanceof ServerPlayerEntity) player = (ServerPlayerEntity) context.getPlayer(); handler.receive(context.getPlayer().getServer(), player, buf); buf.release(); - }); + }); + } + + private static final List registeredList = new ArrayList<>(); + + public static void registerS2CPayloadType(Identifier identifier) { + if (registeredList.contains(identifier)) return; + + BufPayload.Id id = BufPayload.id(identifier); + NetworkManager.registerS2CPayloadType(id, BufPayload.getCodec(id)); + + registeredList.add(identifier); } @FunctionalInterface diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/network/BufPayload.java b/common/src/main/java/net/pitan76/mcpitanlib/core/network/BufPayload.java new file mode 100644 index 000000000..ca4b437c2 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/network/BufPayload.java @@ -0,0 +1,67 @@ +package net.pitan76.mcpitanlib.core.network; + +import io.netty.buffer.ByteBufUtil; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.network.codec.PacketCodec; +import net.minecraft.network.codec.PacketCodecs; +import net.minecraft.network.packet.CustomPayload; +import net.minecraft.util.Identifier; + +import java.util.HashMap; +import java.util.Map; + +public class BufPayload implements CustomPayload { + + public final Id ID; + + public BufPayload(byte[] data, Id id) { + this.data = data; + this.ID = id; + + createCodec(id); + } + + public BufPayload(PacketByteBuf buf, Id id) { + this(ByteBufUtil.getBytes(buf), id); + } + + public BufPayload(PacketByteBuf buf, Identifier id) { + this(ByteBufUtil.getBytes(buf), id(id)); + } + + public byte[] data; + + public byte[] getData() { + return data; + } + + private static final Map, PacketCodec> CODEC_CACHE = new HashMap<>(); + + public static PacketCodec getCodec(Id id) { + if (CODEC_CACHE.containsKey(id)) return CODEC_CACHE.get(id); + + return createCodec(id); + } + + private static PacketCodec createCodec(Id id) { + PacketCodec codec = PacketCodecs.BYTE_ARRAY.xmap((data) -> new BufPayload(data, id), BufPayload::getData).cast(); + CODEC_CACHE.put(id, codec); + return codec; + } + + @Override + public Id getId() { + return ID; + } + + public static Id id(Identifier id) { + if (CODEC_CACHE.isEmpty()) return new Id<>(id); + + for (Id key : CODEC_CACHE.keySet()) { + if (key.id().equals(id)) + return key; + } + + return new Id<>(id); + } +} From db82170922644042049a237682544599ee8e576b Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 12 Sep 2024 18:14:35 +0900 Subject: [PATCH 377/622] fix Networking --- .../pitan76/mcpitanlib/api/network/ServerNetworking.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index 1d4a761b3..d29f4733f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.network; +import dev.architectury.impl.NetworkAggregator; import dev.architectury.networking.NetworkManager; import io.netty.buffer.Unpooled; import net.minecraft.network.PacketByteBuf; @@ -67,11 +68,12 @@ public static void registerReceiver(Identifier identifier, ServerNetworkHandler public static void registerS2CPayloadType(Identifier identifier) { if (registeredList.contains(identifier)) return; + registeredList.add(identifier); + + if (NetworkAggregator.S2C_CODECS.containsKey(identifier)) return; BufPayload.Id id = BufPayload.id(identifier); NetworkManager.registerS2CPayloadType(id, BufPayload.getCodec(id)); - - registeredList.add(identifier); } @FunctionalInterface From 1f6476c8fdd17ba7a1b132c4afb0e1b967fc3ec7 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 12 Sep 2024 18:15:07 +0900 Subject: [PATCH 378/622] fix Networking --- .../api/network/ServerNetworking.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index d29f4733f..510eb4fb1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -15,15 +15,6 @@ public class ServerNetworking { public static void send(ServerPlayerEntity player, Identifier identifier, PacketByteBuf buf) { registerS2CPayloadType(identifier); - /* - if (!S2C_TYPE.containsKey(identifier)) { - CustomPayload.Id type = new CustomPayload.Id<>(identifier); - S2C_TYPE.put(identifier, type); - - //if (!NetworkAggregator.S2C_CODECS.containsKey(type)) - // NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); - } - */ BufPayload payload = new BufPayload(buf, identifier); NetworkManager.sendToPlayer(player, payload); @@ -31,15 +22,6 @@ public static void send(ServerPlayerEntity player, Identifier identifier, Packet public static void send(Iterable players, Identifier identifier, PacketByteBuf buf) { registerS2CPayloadType(identifier); - /*if (!S2C_TYPE.containsKey(identifier)) { - CustomPayload.Id type = new CustomPayload.Id<>(identifier); - S2C_TYPE.put(identifier, type); - - //if (!NetworkAggregator.S2C_CODECS.containsKey(type)) - // NetworkAggregator.registerS2CType(type, BufCustomPacketPayload.streamCodec(type), List.of()); - } - - */ BufPayload payload = new BufPayload(buf, identifier); NetworkManager.sendToPlayers(players, payload); From 5d650e18646aedb695f7e3402943381381f7c8d0 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 12 Sep 2024 18:19:16 +0900 Subject: [PATCH 379/622] fix Networking --- .../net/pitan76/mcpitanlib/api/network/ClientNetworking.java | 2 +- .../net/pitan76/mcpitanlib/api/network/ServerNetworking.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java index 7f081d263..fada6c1bf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ClientNetworking.java @@ -33,7 +33,7 @@ public static void send(Identifier identifier, PacketByteBuf buf) { public static void registerReceiver(Identifier identifier, ClientNetworkHandler handler) { BufPayload.Id id = BufPayload.id(identifier); - NetworkManager.registerReceiver(NetworkManager.Side.S2C, id, BufPayload.getCodec(id), List.of(), + NetworkManager.registerReceiver(NetworkManager.Side.S2C, id, BufPayload.getCodec(id), (payload, context) -> { PacketByteBuf buf = new PacketByteBuf(Unpooled.wrappedBuffer(payload.getData())); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java index 510eb4fb1..be46acde0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/ServerNetworking.java @@ -33,7 +33,7 @@ public static void sendAll(MinecraftServer server, Identifier identifier, Packet public static void registerReceiver(Identifier identifier, ServerNetworkHandler handler) { BufPayload.Id id = BufPayload.id(identifier); - NetworkManager.registerReceiver(NetworkManager.Side.C2S, id, BufPayload.getCodec(id), List.of(), + NetworkManager.registerReceiver(NetworkManager.Side.C2S, id, BufPayload.getCodec(id), (payload, context) -> { PacketByteBuf buf = new PacketByteBuf(Unpooled.wrappedBuffer(payload.getData())); From 0188b8f64a44dffcc946f43912b07d9c7c39c340 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 13 Sep 2024 22:36:02 +0900 Subject: [PATCH 380/622] add APIs --- .../net/pitan76/easyapi/config/Config.java | 75 +++++++++++ .../pitan76/easyapi/config/JsonConfig.java | 6 + .../pitan76/easyapi/config/YamlConfig.java | 7 + .../api/block/CompatPillarBlock.java | 5 + .../mcpitanlib/api/block/CompatSlabBlock.java | 7 + .../api/block/CompatStairsBlock.java | 26 ++++ .../api/client/SimpleHandledScreen.java | 9 ++ .../mcpitanlib/api/client/SimpleScreen.java | 9 ++ .../api/client/option/KeyCodes.java | 127 ++++++++++++++++++ .../registry/v2/KeybindingRegistry.java | 23 ++++ .../pitan76/mcpitanlib/api/entity/Player.java | 25 +++- .../api/event/item/BonusAttackDamageArgs.java | 29 ++++ .../api/event/item/EnchantabilityArgs.java | 7 + .../api/event/item/EnchantableArgs.java | 16 +++ .../api/event/item/ItemBarColorArgs.java | 16 +++ .../api/event/item/ItemBarStepArgs.java | 16 +++ .../api/event/item/ItemBarVisibleArgs.java | 16 +++ .../api/event/item/ItemUseOnBlockEvent.java | 10 ++ .../mcpitanlib/api/item/ExtendItem.java | 62 +++++++++ .../api/item/ExtendItemProvider.java | 44 ++++++ .../api/item/v2/CompatArmorMaterial.java | 2 +- .../api/item/v2/ExtendBlockItem.java | 64 +++++++++ .../api/registry/v2/CompatRegistryV2.java | 10 ++ .../api/sound/CompatSoundCategory.java | 35 +++++ .../api/sound/CompatSoundEvent.java | 21 ++- .../sound/RegistryResultCompatSoundEvent.java | 26 ++++ .../pitan76/mcpitanlib/api/util/HandUtil.java | 38 ++++++ .../mcpitanlib/api/util/IngredientUtil.java | 15 +++ .../mcpitanlib/api/util/ItemStackUtil.java | 15 +++ .../mcpitanlib/api/util/MCVersionUtil.java | 19 +++ .../mcpitanlib/api/util/PlatformUtil.java | 13 ++ .../mcpitanlib/api/util/PropertyUtil.java | 14 ++ .../mcpitanlib/api/util/WorldUtil.java | 9 +- .../core/serialization/CompatMapCodec.java | 10 ++ .../pitan76/mcpitanlib/mixin/ItemMixin.java | 79 +++++++++++ info.properties | 2 +- .../neoforge/MCPitanLibNeoForge.java | 7 + 37 files changed, 901 insertions(+), 13 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/option/KeyCodes.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v2/KeybindingRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/BonusAttackDamageArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantabilityArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantableArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarColorArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarStepArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarVisibleArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundCategory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/sound/RegistryResultCompatSoundEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/HandUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/MCVersionUtil.java diff --git a/common/src/main/java/net/pitan76/easyapi/config/Config.java b/common/src/main/java/net/pitan76/easyapi/config/Config.java index a24d9d3d1..b4718da00 100644 --- a/common/src/main/java/net/pitan76/easyapi/config/Config.java +++ b/common/src/main/java/net/pitan76/easyapi/config/Config.java @@ -209,6 +209,81 @@ public boolean getBooleanOrDefault(String key, boolean defaultValue) { return defaultValue; } + /** + * マップのキーから値を取得、存在しない場合はデフォルト値を保存して返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public Object getOrCreate(String key, Object defaultValue) { + if (has(key)) return get(key); + + set(key, defaultValue); + return defaultValue; + } + + /** + * マップのキーから値(文字列)を取得、存在しない場合はデフォルト値を保存して返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public String getStringOrCreate(String key, String defaultValue) { + if (has(key)) return getString(key); + + setString(key, defaultValue); + return defaultValue; + } + + /** + * マップのキーから値(整数)を取得、存在しない場合はデフォルト値を保存して返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public int getIntOrCreate(String key, int defaultValue) { + if (has(key)) return getInt(key); + + setInt(key, defaultValue); + return defaultValue; + } + + /** + * マップのキーから値(数値)を取得、存在しない場合はデフォルト値を保存して返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public double getDoubleOrCreate(String key, double defaultValue) { + if (has(key)) return getDouble(key); + + setDouble(key, defaultValue); + return defaultValue; + } + + /** + * マップのキーから値(真偽値)を取得、存在しない場合はデフォルト値を保存して返す + * "."でパスを区切る + * + * @param key キー + * @param defaultValue デフォルト値 + * @return 取得した値 + */ + public boolean getBooleanOrCreate(String key, boolean defaultValue) { + if (has(key)) return getBoolean(key); + + setBoolean(key, defaultValue); + return defaultValue; + } + /** * マップのキーに値をセット * "."でパスを区切る diff --git a/common/src/main/java/net/pitan76/easyapi/config/JsonConfig.java b/common/src/main/java/net/pitan76/easyapi/config/JsonConfig.java index 09662c662..c549f09da 100644 --- a/common/src/main/java/net/pitan76/easyapi/config/JsonConfig.java +++ b/common/src/main/java/net/pitan76/easyapi/config/JsonConfig.java @@ -46,6 +46,11 @@ public JsonConfig(Config config) { * @return 成功→true / 失敗→false */ public boolean load(File file) { + if (!file.exists()) { + configMap = new LinkedHashMap<>(); + return false; + } + try { String configData = FileControl.fileReadContents(file); Gson gson = new Gson(); @@ -54,6 +59,7 @@ public boolean load(File file) { configMap = gson.fromJson(configData, jsonMap); return true; } catch (Exception e) { + configMap = new LinkedHashMap<>(); return false; } } diff --git a/common/src/main/java/net/pitan76/easyapi/config/YamlConfig.java b/common/src/main/java/net/pitan76/easyapi/config/YamlConfig.java index c01e026af..cc3774746 100644 --- a/common/src/main/java/net/pitan76/easyapi/config/YamlConfig.java +++ b/common/src/main/java/net/pitan76/easyapi/config/YamlConfig.java @@ -5,6 +5,7 @@ import org.yaml.snakeyaml.Yaml; import java.io.File; +import java.util.LinkedHashMap; import java.util.Map; public class YamlConfig extends Config { @@ -57,12 +58,18 @@ public void setStyle(DumperOptions.FlowStyle flowStyle) { */ @SuppressWarnings("unchecked") public boolean load(File file) { + if (!file.exists()) { + configMap = new LinkedHashMap<>(); + return false; + } + try { String configData = FileControl.fileReadContents(file); Yaml yaml = new Yaml(); configMap = (Map) yaml.load(configData); return true; } catch (Exception e) { + configMap = new LinkedHashMap<>(); return false; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java index 7f358ac91..8f273e2b0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java @@ -6,11 +6,16 @@ import net.minecraft.block.PillarBlock; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; +import net.minecraft.state.property.EnumProperty; +import net.minecraft.util.math.Direction; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatPillarBlock extends PillarBlock implements ExtendBlockProvider { + + public static final EnumProperty AXIS = PillarBlock.AXIS; + public CompatPillarBlock(Settings settings) { super(settings); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java index 251dcda7f..8adfe296a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java @@ -5,15 +5,22 @@ import net.minecraft.block.BlockState; import net.minecraft.block.SlabBlock; import net.minecraft.block.StairsBlock; +import net.minecraft.block.enums.SlabType; import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.EnumProperty; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.CanPathfindThroughArgs; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatSlabBlock extends SlabBlock implements ExtendBlockProvider { + + public static final EnumProperty TYPE = SlabBlock.TYPE; + public static final BooleanProperty WATERLOGGED = SlabBlock.WATERLOGGED; + public CompatSlabBlock(Settings settings) { super(settings); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java index b4b37aa8b..8f6ff0337 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java @@ -2,9 +2,14 @@ import com.mojang.serialization.MapCodec; import net.minecraft.block.*; +import net.minecraft.block.enums.BlockHalf; +import net.minecraft.block.enums.StairShape; import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.DirectionProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; @@ -15,12 +20,29 @@ import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatStairsBlock extends StairsBlock implements ExtendBlockProvider { + + public static final DirectionProperty FACING = StairsBlock.FACING; + public static final EnumProperty HALF = StairsBlock.HALF; + public static final EnumProperty SHAPE = StairsBlock.SHAPE; + public static final BooleanProperty WATERLOGGED = StairsBlock.WATERLOGGED; + + public CompatibleBlockSettings compatSettings; + public CompatStairsBlock(BlockState baseBlockState, Settings settings) { super(baseBlockState, settings); } public CompatStairsBlock(BlockState baseBlockState, CompatibleBlockSettings settings) { this(baseBlockState, settings.build()); + this.compatSettings = settings; + } + + /** + * get compatible block settings + * @return CompatibleBlockSettings + */ + public CompatibleBlockSettings getCompatSettings() { + return compatSettings; } public VoxelShape getOutlineShape(OutlineShapeEvent event) { @@ -96,4 +118,8 @@ public boolean canPathfindThrough(CanPathfindThroughArgs args) { public Boolean canPathfindThrough(CanPathfindThroughArgs args, Options options) { return ExtendBlockProvider.super.canPathfindThrough(args, options); } + + public BlockState getBaseBlockState() { + return super.baseBlockState; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index f6f7d4b9d..d995cb752 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -17,6 +17,7 @@ import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; public abstract class SimpleHandledScreen extends HandledScreen { @@ -74,6 +75,10 @@ public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); } + public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { + callDrawTexture(drawObjectDM, texture.toMinecraft(), x, y, u, v, width, height); + } + @Deprecated public void callRenderBackground(DrawObjectDM drawObjectDM) { callRenderBackground(new RenderArgs(drawObjectDM, 0, 0, 0)); @@ -233,6 +238,10 @@ public void removed() { } public Identifier getBackgroundTexture() { + return getCompatBackgroundTexture().toMinecraft(); + } + + public CompatIdentifier getCompatBackgroundTexture() { return null; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index b3babddf1..7234d0259 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -14,6 +14,7 @@ import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; public abstract class SimpleScreen extends Screen { @@ -49,6 +50,10 @@ public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); } + public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { + callDrawTexture(drawObjectDM, texture.toMinecraft(), x, y, u, v, width, height); + } + @Deprecated @Override public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) { @@ -173,6 +178,10 @@ public void removed() { } public Identifier getBackgroundTexture() { + return getCompatBackgroundTexture().toMinecraft(); + } + + public CompatIdentifier getCompatBackgroundTexture() { return null; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/KeyCodes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/KeyCodes.java new file mode 100644 index 000000000..27187f69f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/KeyCodes.java @@ -0,0 +1,127 @@ +package net.pitan76.mcpitanlib.api.client.option; + +import org.lwjgl.glfw.GLFW; + +public class KeyCodes { + public static final int KEY_UNKNOWN = GLFW.GLFW_KEY_UNKNOWN, + KEY_SPACE = GLFW.GLFW_KEY_SPACE, + KEY_APOSTROPHE = GLFW.GLFW_KEY_APOSTROPHE, + KEY_COMMA = GLFW.GLFW_KEY_COMMA, + KEY_MINUS = GLFW.GLFW_KEY_MINUS, + KEY_PERIOD = GLFW.GLFW_KEY_PERIOD, + KEY_SLASH = GLFW.GLFW_KEY_SLASH, + KEY_0 = GLFW.GLFW_KEY_0, + KEY_1 = GLFW.GLFW_KEY_1, + KEY_2 = GLFW.GLFW_KEY_2, + KEY_3 = GLFW.GLFW_KEY_3, + KEY_4 = GLFW.GLFW_KEY_4, + KEY_5 = GLFW.GLFW_KEY_5, + KEY_6 = GLFW.GLFW_KEY_6, + KEY_7 = GLFW.GLFW_KEY_7, + KEY_8 = GLFW.GLFW_KEY_8, + KEY_9 = GLFW.GLFW_KEY_9, + KEY_SEMICOLON = GLFW.GLFW_KEY_SEMICOLON, + KEY_EQUAL = GLFW.GLFW_KEY_EQUAL, + KEY_A = GLFW.GLFW_KEY_A, + KEY_B = GLFW.GLFW_KEY_B, + KEY_C = GLFW.GLFW_KEY_C, + KEY_D = GLFW.GLFW_KEY_D, + KEY_E = GLFW.GLFW_KEY_E, + KEY_F = GLFW.GLFW_KEY_F, + KEY_G = GLFW.GLFW_KEY_G, + KEY_H = GLFW.GLFW_KEY_H, + KEY_I = GLFW.GLFW_KEY_I, + KEY_J = GLFW.GLFW_KEY_J, + KEY_K = GLFW.GLFW_KEY_K, + KEY_L = GLFW.GLFW_KEY_L, + KEY_M = GLFW.GLFW_KEY_M, + KEY_N = GLFW.GLFW_KEY_N, + KEY_O = GLFW.GLFW_KEY_O, + KEY_P = GLFW.GLFW_KEY_P, + KEY_Q = GLFW.GLFW_KEY_Q, + KEY_R = GLFW.GLFW_KEY_R, + KEY_S = GLFW.GLFW_KEY_S, + KEY_T = GLFW.GLFW_KEY_T, + KEY_U = GLFW.GLFW_KEY_U, + KEY_V = GLFW.GLFW_KEY_V, + KEY_W = GLFW.GLFW_KEY_W, + KEY_X = GLFW.GLFW_KEY_X, + KEY_Y = GLFW.GLFW_KEY_Y, + KEY_Z = GLFW.GLFW_KEY_Z, + KEY_LEFT_BRACKET = GLFW.GLFW_KEY_LEFT_BRACKET, + KEY_BACKSLASH = GLFW.GLFW_KEY_BACKSLASH, + KEY_RIGHT_BRACKET = GLFW.GLFW_KEY_RIGHT_BRACKET, + KEY_GRAVE_ACCENT = GLFW.GLFW_KEY_GRAVE_ACCENT, + KEY_WORLD_1 = GLFW.GLFW_KEY_WORLD_1, + KEY_WORLD_2 = GLFW.GLFW_KEY_WORLD_2, + KEY_ESCAPE = GLFW.GLFW_KEY_ESCAPE, + KEY_ENTER = GLFW.GLFW_KEY_ENTER, + KEY_TAB = GLFW.GLFW_KEY_TAB, + KEY_BACKSPACE = GLFW.GLFW_KEY_BACKSPACE, + KEY_INSERT = GLFW.GLFW_KEY_INSERT, + KEY_DELETE = GLFW.GLFW_KEY_DELETE, + KEY_RIGHT = GLFW.GLFW_KEY_RIGHT, + KEY_LEFT = GLFW.GLFW_KEY_LEFT, + KEY_DOWN = GLFW.GLFW_KEY_DOWN, + KEY_UP = GLFW.GLFW_KEY_UP, + KEY_PAGE_UP = GLFW.GLFW_KEY_PAGE_UP, + KEY_PAGE_DOWN = GLFW.GLFW_KEY_PAGE_DOWN, + KEY_HOME = GLFW.GLFW_KEY_HOME, + KEY_END = GLFW.GLFW_KEY_END, + KEY_CAPS_LOCK = GLFW.GLFW_KEY_CAPS_LOCK, + KEY_SCROLL_LOCK = GLFW.GLFW_KEY_SCROLL_LOCK, + KEY_NUM_LOCK = GLFW.GLFW_KEY_NUM_LOCK, + KEY_PRINT_SCREEN = GLFW.GLFW_KEY_PRINT_SCREEN, + KEY_PAUSE = GLFW.GLFW_KEY_PAUSE, + KEY_F1 = GLFW.GLFW_KEY_F1, + KEY_F2 = GLFW.GLFW_KEY_F2, + KEY_F3 = GLFW.GLFW_KEY_F3, + KEY_F4 = GLFW.GLFW_KEY_F4, + KEY_F5 = GLFW.GLFW_KEY_F5, + KEY_F6 = GLFW.GLFW_KEY_F6, + KEY_F7 = GLFW.GLFW_KEY_F7, + KEY_F8 = GLFW.GLFW_KEY_F8, + KEY_F9 = GLFW.GLFW_KEY_F9, + KEY_F10 = GLFW.GLFW_KEY_F10, + KEY_F11 = GLFW.GLFW_KEY_F11, + KEY_F12 = GLFW.GLFW_KEY_F12, + KEY_F13 = GLFW.GLFW_KEY_F13, + KEY_F14 = GLFW.GLFW_KEY_F14, + KEY_F15 = GLFW.GLFW_KEY_F15, + KEY_F16 = GLFW.GLFW_KEY_F16, + KEY_F17 = GLFW.GLFW_KEY_F17, + KEY_F18 = GLFW.GLFW_KEY_F18, + KEY_F19 = GLFW.GLFW_KEY_F19, + KEY_F20 = GLFW.GLFW_KEY_F20, + KEY_F21 = GLFW.GLFW_KEY_F21, + KEY_F22 = GLFW.GLFW_KEY_F22, + KEY_F23 = GLFW.GLFW_KEY_F23, + KEY_F24 = GLFW.GLFW_KEY_F24, + KEY_F25 = GLFW.GLFW_KEY_F25, + KEY_KP_0 = GLFW.GLFW_KEY_KP_0, + KEY_KP_1 = GLFW.GLFW_KEY_KP_1, + KEY_KP_2 = GLFW.GLFW_KEY_KP_2, + KEY_KP_3 = GLFW.GLFW_KEY_KP_3, + KEY_KP_4 = GLFW.GLFW_KEY_KP_4, + KEY_KP_5 = GLFW.GLFW_KEY_KP_5, + KEY_KP_6 = GLFW.GLFW_KEY_KP_6, + KEY_KP_7 = GLFW.GLFW_KEY_KP_7, + KEY_KP_8 = GLFW.GLFW_KEY_KP_8, + KEY_KP_9 = GLFW.GLFW_KEY_KP_9, + KEY_KP_DECIMAL = GLFW.GLFW_KEY_KP_DECIMAL, + KEY_KP_DIVIDE = GLFW.GLFW_KEY_KP_DIVIDE, + KEY_KP_MULTIPLY = GLFW.GLFW_KEY_KP_MULTIPLY, + KEY_KP_SUBTRACT = GLFW.GLFW_KEY_KP_SUBTRACT, + KEY_KP_ADD = GLFW.GLFW_KEY_KP_ADD, + KEY_KP_ENTER = GLFW.GLFW_KEY_KP_ENTER, + KEY_KP_EQUAL = GLFW.GLFW_KEY_KP_EQUAL, + KEY_LEFT_SHIFT = GLFW.GLFW_KEY_LEFT_SHIFT, + KEY_LEFT_CONTROL = GLFW.GLFW_KEY_LEFT_CONTROL, + KEY_LEFT_ALT = GLFW.GLFW_KEY_LEFT_ALT, + KEY_LEFT_SUPER = GLFW.GLFW_KEY_LEFT_SUPER, + KEY_RIGHT_SHIFT = GLFW.GLFW_KEY_RIGHT_SHIFT, + KEY_RIGHT_CONTROL = GLFW.GLFW_KEY_RIGHT_CONTROL, + KEY_RIGHT_ALT = GLFW.GLFW_KEY_RIGHT_ALT, + KEY_RIGHT_SUPER = GLFW.GLFW_KEY_RIGHT_SUPER, + KEY_MENU = GLFW.GLFW_KEY_MENU; +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v2/KeybindingRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v2/KeybindingRegistry.java new file mode 100644 index 000000000..80a026101 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v2/KeybindingRegistry.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.client.registry.v2; + +import net.minecraft.client.option.KeyBinding; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class KeybindingRegistry extends net.pitan76.mcpitanlib.api.client.registry.KeybindingRegistry { + + public static void registerWithNetwork(KeyBinding keyBinding, CompatIdentifier identifier) { + registerWithNetwork(keyBinding, identifier.toMinecraft()); + } + + public static void registerOnLevelWithNetwork(KeyBinding keyBinding, CompatIdentifier identifier) { + registerOnLevelWithNetwork(keyBinding, identifier.toMinecraft()); + } + + public static void registerWithNetwork(String translationKey, int code, String category, CompatIdentifier identifier) { + registerWithNetwork(new KeyBinding(translationKey, code, category), identifier); + } + + public static void registerOnLevelWithNetwork(String translationKey, int code, String category, CompatIdentifier identifier) { + registerOnLevelWithNetwork(new KeyBinding(translationKey, code, category), identifier); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 9985d0ab7..7ea799f69 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -31,6 +31,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; +import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; @@ -292,12 +293,12 @@ public void playSound(SoundEvent event, float volume, float pitch) { getEntity().playSound(event, volume, pitch); } - public void playSound(CompatSoundEvent event, SoundCategory category, float volume, float pitch) { - playSound(event.getSoundEvent(), category, volume, pitch); + public void playSound(CompatSoundEvent event, CompatSoundCategory category, float volume, float pitch) { + playSound(event.get(), category.get(), volume, pitch); } public void playSound(CompatSoundEvent event, float volume, float pitch) { - playSound(event.getSoundEvent(), volume, pitch); + playSound(event.get(), volume, pitch); } public ItemCooldown itemCooldown = new ItemCooldown(this); @@ -402,4 +403,22 @@ public boolean isSpectator() { return getEntity().isSpectator(); } + /** + * Returns the current {@link ItemStack} in the {@link Player}'s hand, or offhand if the + * main hand is empty. + * + * @return {@code ItemStack} that the {@link Player} is holding. Can be {@link null}. + */ + public Optional getCurrentHandItem() { + boolean playerIsHoldingInMainHand = !getMainHandStack().isEmpty(); + if (playerIsHoldingInMainHand) + return Optional.ofNullable(getMainHandStack()); + + boolean playerIsHoldingInOffHand = !getOffHandStack().isEmpty(); + + if (playerIsHoldingInOffHand) + return Optional.ofNullable(getOffHandStack()); + + return Optional.empty(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/BonusAttackDamageArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/BonusAttackDamageArgs.java new file mode 100644 index 000000000..769b66b63 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/BonusAttackDamageArgs.java @@ -0,0 +1,29 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.damage.DamageSource; + +public class BonusAttackDamageArgs { + + public Entity target; + public float baseAttackDamage; + public DamageSource damageSource; + + public BonusAttackDamageArgs(Entity target, float baseAttackDamage, DamageSource damageSource) { + this.target = target; + this.baseAttackDamage = baseAttackDamage; + this.damageSource = damageSource; + } + + public Entity getTarget() { + return target; + } + + public float getBaseAttackDamage() { + return baseAttackDamage; + } + + public DamageSource getDamageSource() { + return damageSource; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantabilityArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantabilityArgs.java new file mode 100644 index 000000000..17392a835 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantabilityArgs.java @@ -0,0 +1,7 @@ +package net.pitan76.mcpitanlib.api.event.item; + +public class EnchantabilityArgs { + public EnchantabilityArgs() { + + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantableArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantableArgs.java new file mode 100644 index 000000000..d466f2a51 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/EnchantableArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.item.ItemStack; + +public class EnchantableArgs { + + public ItemStack stack; + + public EnchantableArgs(ItemStack stack) { + this.stack = stack; + } + + public ItemStack getStack() { + return stack; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarColorArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarColorArgs.java new file mode 100644 index 000000000..aae12a9a0 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarColorArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.item.ItemStack; + +public class ItemBarColorArgs { + + public ItemStack stack; + + public ItemBarColorArgs(ItemStack stack) { + this.stack = stack; + } + + public ItemStack getStack() { + return stack; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarStepArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarStepArgs.java new file mode 100644 index 000000000..86742fa45 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarStepArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.item.ItemStack; + +public class ItemBarStepArgs { + + public ItemStack stack; + + public ItemBarStepArgs(ItemStack stack) { + this.stack = stack; + } + + public ItemStack getStack() { + return stack; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarVisibleArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarVisibleArgs.java new file mode 100644 index 000000000..509bb4634 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemBarVisibleArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.item.ItemStack; + +public class ItemBarVisibleArgs { + + public ItemStack stack; + + public ItemBarVisibleArgs(ItemStack stack) { + this.stack = stack; + } + + public ItemStack getStack() { + return stack; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java index 6145a0855..6db0b29f3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java @@ -9,6 +9,8 @@ import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; @@ -96,4 +98,12 @@ public boolean hasBlockEntity() { public BlockState getBlockState() { return WorldUtil.getBlockState(world, blockPos); } + + public Vec3d getPos() { + return hit.getPos(); + } + + public Direction getSide() { + return hit.getSide(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 73fbe8c6c..0e5e824cc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -1,6 +1,8 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -169,4 +171,64 @@ public boolean postMine(PostMineEvent event) { public Rarity getRarity(ItemStack stack) { return Rarity.COMMON; } + + @Deprecated + @Override + public boolean isEnchantable(ItemStack stack) { + return isEnchantable(new EnchantableArgs(stack)); + } + + public boolean isEnchantable(EnchantableArgs args) { + return super.isEnchantable(args.stack); + } + + @Deprecated + @Override + public int getEnchantability() { + return getEnchantability(new EnchantabilityArgs()); + } + + public int getEnchantability(EnchantabilityArgs args) { + return super.getEnchantability(); + } + + @Deprecated + @Override + public int getItemBarColor(ItemStack stack) { + return getItemBarColor(new ItemBarColorArgs(stack)); + } + + public int getItemBarColor(ItemBarColorArgs args) { + return super.getItemBarColor(args.stack); + } + + @Deprecated + @Override + public boolean isItemBarVisible(ItemStack stack) { + return isItemBarVisible(new ItemBarVisibleArgs(stack)); + } + + public boolean isItemBarVisible(ItemBarVisibleArgs args) { + return super.isItemBarVisible(args.stack); + } + + @Deprecated + @Override + public int getItemBarStep(ItemStack stack) { + return getItemBarStep(new ItemBarStepArgs(stack)); + } + + public int getItemBarStep(ItemBarStepArgs args) { + return super.getItemBarStep(args.stack); + } + + @Deprecated + @Override + public float getBonusAttackDamage(Entity target, float baseAttackDamage, DamageSource damageSource) { + return getBonusAttackDamage(new BonusAttackDamageArgs(target, baseAttackDamage, damageSource)); + } + + public float getBonusAttackDamage(BonusAttackDamageArgs args) { + return super.getBonusAttackDamage(args.target, args.baseAttackDamage, args.damageSource); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java index 0c7648bf0..17874b97c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java @@ -2,6 +2,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; +import net.minecraft.util.Rarity; import net.minecraft.util.TypedActionResult; import net.pitan76.mcpitanlib.api.event.item.*; @@ -86,6 +87,49 @@ default boolean postMine(PostMineEvent event, Options options) { return false; } + /** + * on craft event + * @param event CraftEvent + */ + default void onCraft(CraftEvent event, Options options) { + options.cancel = false; + } + + default Rarity getRarity(ItemStack stack, Options options) { + options.cancel = false; + return null; + } + + default boolean isEnchantable(EnchantableArgs args, Options options) { + options.cancel = false; + return false; + } + + default int getEnchantability(EnchantabilityArgs args, Options options) { + options.cancel = false; + return 0; + } + + default int getItemBarColor(ItemBarColorArgs args, Options options) { + options.cancel = false; + return 0; + } + + default boolean isItemBarVisible(ItemBarVisibleArgs args, Options options) { + options.cancel = false; + return false; + } + + default int getItemBarStep(ItemBarStepArgs args, Options options) { + options.cancel = false; + return 0; + } + + default float getBonusAttackDamage(BonusAttackDamageArgs args, Options options) { + options.cancel = false; + return 0; + } + public static class Options { public boolean cancel = true; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java index ef5dd87f6..219e3400a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java @@ -10,7 +10,7 @@ public interface CompatArmorMaterial extends CompatibleArmorMaterial { @Override default SoundEvent getEquipSound() { - return getEquipCompatSound().getSoundEvent(); + return getEquipCompatSound().get(); } CompatSoundEvent getEquipCompatSound(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java new file mode 100644 index 000000000..ecdc6d850 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java @@ -0,0 +1,64 @@ +package net.pitan76.mcpitanlib.api.item.v2; + +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.tooltip.TooltipType; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; + +import java.util.List; + +public class ExtendBlockItem extends BlockItem implements ExtendItemProvider { + public ExtendBlockItem(Block block, Settings settings) { + super(block, settings); + } + + public ExtendBlockItem(Block block, CompatibleItemSettings settings) { + this(block, settings.build()); + } + + @Deprecated + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; + return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); + } + + @Deprecated + @Override + public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event, Options options) { + return ExtendItemProvider.super.onRightClickOnBlock(event, options); + } + + public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { + return super.useOnBlock(event.toIUC()); + } + + @Deprecated + @Override + public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { + appendTooltip(new ItemAppendTooltipEvent(stack, null, tooltip, type, context)); + } + + @Deprecated + @Override + public void appendTooltip(ItemAppendTooltipEvent event, Options options) { + ExtendItemProvider.super.appendTooltip(event, options); + } + + public void appendTooltip(ItemAppendTooltipEvent event) { + super.appendTooltip(event.getStack(), event.getContext(), event.getTooltip(), event.type); + } + + @Override + public Block getBlock() { + return super.getBlock(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 20a4996e5..56928c0e6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -14,6 +14,8 @@ import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.api.sound.RegistryResultCompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import java.util.function.Supplier; @@ -91,6 +93,14 @@ public RegistryResult registerSoundEvent(CompatIdentifier id, float return cr1.registerSoundEvent(id.toMinecraft(), distanceToTravel); } + public CompatSoundEvent registerCompatSoundEvent(CompatIdentifier id) { + return RegistryResultCompatSoundEvent.of(registerSoundEvent(id)); + } + + public CompatSoundEvent registerCompatSoundEvent(CompatIdentifier id, float distanceToTravel) { + return RegistryResultCompatSoundEvent.of(registerSoundEvent(id, distanceToTravel)); + } + public RegistryResult registerFluid(CompatIdentifier id, Supplier supplier) { return cr1.registerFluid(id.toMinecraft(), supplier); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundCategory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundCategory.java new file mode 100644 index 000000000..4fdd2bd18 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundCategory.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.sound; + +import net.minecraft.sound.SoundCategory; + +public class CompatSoundCategory { + + public static final CompatSoundCategory MASTER = of(SoundCategory.MASTER); + public static final CompatSoundCategory MUSIC = of(SoundCategory.MUSIC); + public static final CompatSoundCategory RECORDS = of(SoundCategory.RECORDS); + public static final CompatSoundCategory WEATHER = of(SoundCategory.WEATHER); + public static final CompatSoundCategory BLOCKS = of(SoundCategory.BLOCKS); + public static final CompatSoundCategory HOSTILE = of(SoundCategory.HOSTILE); + public static final CompatSoundCategory NEUTRAL = of(SoundCategory.NEUTRAL); + public static final CompatSoundCategory PLAYERS = of(SoundCategory.PLAYERS); + public static final CompatSoundCategory AMBIENT = of(SoundCategory.AMBIENT); + public static final CompatSoundCategory VOICE = of(SoundCategory.VOICE); + + public SoundCategory soundCategory; + + public CompatSoundCategory(SoundCategory soundCategory) { + this.soundCategory = soundCategory; + } + + public static CompatSoundCategory of(SoundCategory soundCategory) { + return new CompatSoundCategory(soundCategory); + } + + public SoundCategory get() { + return soundCategory; + } + + public String getName() { + return soundCategory.getName(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java index df84214d5..9840c1803 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java @@ -2,11 +2,12 @@ import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.sound.SoundEvent; +import org.jetbrains.annotations.Nullable; public class CompatSoundEvent { - public SoundEvent soundEvent; - public RegistryEntry.Reference reference; - public RegistryEntry entry; + private SoundEvent soundEvent; + private RegistryEntry.Reference reference; + private RegistryEntry entry; public CompatSoundEvent(SoundEvent soundEvent) { this.soundEvent = soundEvent; @@ -24,7 +25,7 @@ public static CompatSoundEvent of(SoundEvent soundEvent) { return new CompatSoundEvent(soundEvent); } - public SoundEvent getSoundEvent() { + public SoundEvent get() { if (soundEvent == null) { if (reference != null) { soundEvent = reference.value(); @@ -35,4 +36,16 @@ public SoundEvent getSoundEvent() { return soundEvent; } + + @Nullable + @Deprecated + public RegistryEntry.Reference getReference() { + return reference; + } + + @Nullable + @Deprecated + public RegistryEntry getEntry() { + return entry; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/RegistryResultCompatSoundEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/RegistryResultCompatSoundEvent.java new file mode 100644 index 000000000..c9a68ee56 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/RegistryResultCompatSoundEvent.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.sound; + +import net.minecraft.sound.SoundEvent; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; + +public class RegistryResultCompatSoundEvent extends CompatSoundEvent { + + public RegistryResult result; + + public RegistryResultCompatSoundEvent(RegistryResult result) { + super((SoundEvent) null); + this.result = result; + } + + public static RegistryResultCompatSoundEvent of(RegistryResult result) { + return new RegistryResultCompatSoundEvent(result); + } + + @Override + public SoundEvent get() { + if ((result == null || result.getOrNull() == null) && super.get() != null) + return super.get(); + + return result.get(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/HandUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/HandUtil.java new file mode 100644 index 000000000..8690b4db9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/HandUtil.java @@ -0,0 +1,38 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.util.Hand; + +public class HandUtil { + public static Hand getOppositeHand(Hand hand) { + return hand == Hand.MAIN_HAND ? Hand.OFF_HAND : Hand.MAIN_HAND; + } + + public static EquipmentSlot getEquipmentSlot(Hand hand) { + return hand == Hand.MAIN_HAND ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND; + } + + public static Hand getHand(EquipmentSlot slot) { + return slot == EquipmentSlot.MAINHAND ? Hand.MAIN_HAND : Hand.OFF_HAND; + } + + public static Hand getHand(boolean mainHand) { + return mainHand ? Hand.MAIN_HAND : Hand.OFF_HAND; + } + + public static boolean isMainHand(Hand hand) { + return hand == Hand.MAIN_HAND; + } + + public static boolean isOffHand(Hand hand) { + return hand == Hand.OFF_HAND; + } + + public static boolean isMainHand(EquipmentSlot slot) { + return slot == EquipmentSlot.MAINHAND; + } + + public static boolean isOffHand(EquipmentSlot slot) { + return slot == EquipmentSlot.OFFHAND; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index 6bb989f24..e655b2654 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -1,12 +1,15 @@ package net.pitan76.mcpitanlib.api.util; +import it.unimi.dsi.fastutil.ints.IntList; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.Registries; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class IngredientUtil { @@ -31,4 +34,16 @@ public static List getItems(Ingredient ingredient) { } return items; } + + public IntList getMatchingStacksIds(Ingredient ingredient) { + return ingredient.getMatchingItemIds(); + } + + public List getMatchingStacksAsList(Ingredient ingredient) { + return new ArrayList<>(Arrays.asList(getMatchingStacks(ingredient))); + } + + public ItemStack[] getMatchingStacks(Ingredient ingredient) { + return ingredient.getMatchingStacks(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 3c1e63304..5ba54a735 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -139,4 +139,19 @@ public static ItemStack create(ItemConvertible item, int count) { public static boolean isEmpty(ItemStack stack) { return stack.isEmpty(); } + + public static boolean isEnchantable(ItemStack stack) { + return stack.isEnchantable(); + } + + public static boolean isDamageable(ItemStack stack) { + return stack.isDamageable(); + } + + public static boolean isBreak(ItemStack stack) { + if (isDamageable(stack)) + return getDamage(stack) >= getMaxDamage(stack); + + return false; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/MCVersionUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/MCVersionUtil.java new file mode 100644 index 000000000..7ec6e5315 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/MCVersionUtil.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.SharedConstants; +import net.pitan76.mcpitanlib.api.util.client.ClientUtil; + +public class MCVersionUtil { + + public static int getProtocolVersion() { + return SharedConstants.getProtocolVersion(); + } + + public static String getGameVersion() { + return ClientUtil.getClient().getGameVersion(); + } + + public static boolean isSupportedComponent() { + return SharedConstants.getProtocolVersion() >= 766; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java index 52032c12a..bf25068fa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlatformUtil.java @@ -5,6 +5,7 @@ import dev.architectury.utils.Env; import net.fabricmc.api.EnvType; +import java.io.File; import java.nio.file.Path; import java.util.Collection; @@ -53,6 +54,18 @@ public static Path getModsFolder() { return Platform.getModsFolder(); } + public static File getConfigFolderAsFile() { + return getConfigFolder().toFile(); + } + + public static File getGameFolderAsFile() { + return getGameFolder().toFile(); + } + + public static File getModsFolderAsFile() { + return getModsFolder().toFile(); + } + public static Collection getModIds() { return Platform.getModIds(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java index bb1d865f2..e6d3b9a58 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java @@ -1,6 +1,8 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.block.BlockState; +import net.minecraft.block.enums.BlockHalf; +import net.minecraft.block.enums.StairShape; import net.minecraft.state.property.*; import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.Direction; @@ -99,6 +101,18 @@ public static DirectionProperty horizontalFacing() { return Properties.HORIZONTAL_FACING; } + public static EnumProperty axis() { + return Properties.AXIS; + } + + public static EnumProperty blockHalf() { + return Properties.BLOCK_HALF; + } + + public static EnumProperty stairShape() { + return Properties.STAIR_SHAPE; + } + public static BooleanProperty lit() { return Properties.LIT; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 9f615b7f6..9cbf94d49 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -24,6 +24,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import org.jetbrains.annotations.Nullable; @@ -93,12 +94,12 @@ public static void playSound(World world, @Nullable Player player, BlockPos pos, world.playSound(entity, pos, sound, category, volume, pitch); } - public static void playSound(World world, @Nullable Player player, BlockPos pos, CompatSoundEvent sound, SoundCategory category, float volume, float pitch) { - playSound(world, player, pos, sound.getSoundEvent(), category, volume, pitch); + public static void playSound(World world, @Nullable Player player, BlockPos pos, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch) { + playSound(world, player, pos, sound.get(), category.get(), volume, pitch); } - public static void playSound(World world, double x, double y, double z, CompatSoundEvent sound, SoundCategory category, float volume, float pitch, boolean useDistance) { - world.playSound(x, y, z, sound.getSoundEvent(), category, volume, pitch, useDistance); + public static void playSound(World world, double x, double y, double z, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch, boolean useDistance) { + world.playSound(x, y, z, sound.get(), category.get(), volume, pitch, useDistance); } public static void sendEntityStatus(World world, Entity entity, byte status) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java index bbfcb6cd5..8406b748c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java @@ -4,9 +4,12 @@ import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.pitan76.mcpitanlib.api.block.CompatStairsBlock; import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import java.util.function.BiFunction; import java.util.function.Function; public class CompatMapCodec { @@ -51,4 +54,11 @@ public static RecordCodecBuilder CompatMapCodec createCodecOfExtendBlock(Function blockFromSettings) { return of(RecordCodecBuilder.mapCodec((instance) -> instance.group(createCompatSettingsCodec()).apply(instance, blockFromSettings))); } + + public static CompatMapCodec createCodecOfCompatStairsBlock(BiFunction createFunction) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group( + BlockState.CODEC.fieldOf("base_state").forGetter(CompatStairsBlock::getBaseBlockState), + CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatStairsBlock::getCompatSettings) + ).apply(instance, createFunction))); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 1509960ff..a795c8697 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -1,6 +1,8 @@ package net.pitan76.mcpitanlib.mixin; import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -114,4 +116,81 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } + + @Inject(method = "onCraft", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$onCraft(ItemStack stack, World world, CallbackInfo ci) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + provider.onCraft(new CraftEvent(stack, world), options); + if (options.cancel) + ci.cancel(); + } + } + + @Inject(method = "isEnchantable", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$isEnchantable(ItemStack stack, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + boolean returnValue = provider.isEnchantable(new EnchantableArgs(stack), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "getEnchantability", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getEnchantability(CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + int returnValue = provider.getEnchantability(new EnchantabilityArgs(), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "getItemBarColor", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getItemBarColor(ItemStack stack, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + int returnValue = provider.getItemBarColor(new ItemBarColorArgs(stack), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "isItemBarVisible", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$isItemBarVisible(ItemStack stack, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + boolean returnValue = provider.isItemBarVisible(new ItemBarVisibleArgs(stack), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "getItemBarStep", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getItemBarStep(ItemStack stack, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + int returnValue = provider.getItemBarStep(new ItemBarStepArgs(stack), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "getBonusAttackDamage", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getBonusAttackDamage(Entity target, float baseAttackDamage, DamageSource damageSource, CallbackInfoReturnable cir) { + if (this instanceof ExtendItemProvider) { + ExtendItemProvider provider = (ExtendItemProvider) this; + Options options = new Options(); + float returnValue = provider.getBonusAttackDamage(new BonusAttackDamageArgs(target, baseAttackDamage, damageSource), options); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } } diff --git a/info.properties b/info.properties index 109c811e5..b30d56f09 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.1 +mod_version=2.4.2 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index 5bef727f3..cc5c9c814 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -1,12 +1,19 @@ package net.pitan76.mcpitanlib.neoforge; +import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.pitan76.mcpitanlib.MCPitanLib; +import net.pitan76.mcpitanlib.api.client.event.neoforge.WorldRenderRegistryImpl; @Mod(MCPitanLib.MOD_ID) public class MCPitanLibNeoForge { public MCPitanLibNeoForge(ModContainer modContainer) { + IEventBus bus = modContainer.getEventBus(); + if (bus != null) { + bus.addListener(WorldRenderRegistryImpl::renderOutlineEvent); + } + MCPitanLib.init(); } } \ No newline at end of file From 60f1a34fd27cd20ffed4493a07a6d4f14373cc22 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:04:48 +0900 Subject: [PATCH 381/622] fix neoforge renderer --- .../event/neoforge/WorldRenderRegistryImpl.java | 15 ++++++++++++++- .../mcpitanlib/neoforge/MCPitanLibNeoForge.java | 4 ---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java index 15b9d7fc1..ae5b659a8 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java @@ -6,8 +6,11 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.util.hit.HitResult; import net.minecraft.util.profiler.Profiler; +import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.client.event.RenderHighlightEvent; +import net.pitan76.mcpitanlib.MCPitanLib; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineEvent; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContext; @@ -16,14 +19,18 @@ import java.util.ArrayList; import java.util.List; +@Mod.EventBusSubscriber(modid = MCPitanLib.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) public class WorldRenderRegistryImpl { public static List beforeBlockOutlineListeners = new ArrayList<>(); @SubscribeEvent public static void renderOutlineEvent(RenderHighlightEvent event) { + if (MinecraftClient.getInstance().world != null && MinecraftClient.getInstance().world.getTime() % 20 == 0) + System.out.println("renderOutlineEvent"); + for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { - listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { + boolean eventContinue = listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { @Override public WorldRenderer worldRenderer() { return event.getLevelRenderer(); @@ -96,6 +103,11 @@ public Frustum frustum() { return event.getLevelRenderer().getFrustum(); } }, event.getTarget())); + + if (!eventContinue) { + event.setResult(RenderHighlightEvent.Result.DENY); + break; + } } } @@ -103,3 +115,4 @@ public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListe beforeBlockOutlineListeners.add(listener); } } + diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index cc5c9c814..0052b3525 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -4,15 +4,11 @@ import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.pitan76.mcpitanlib.MCPitanLib; -import net.pitan76.mcpitanlib.api.client.event.neoforge.WorldRenderRegistryImpl; @Mod(MCPitanLib.MOD_ID) public class MCPitanLibNeoForge { public MCPitanLibNeoForge(ModContainer modContainer) { IEventBus bus = modContainer.getEventBus(); - if (bus != null) { - bus.addListener(WorldRenderRegistryImpl::renderOutlineEvent); - } MCPitanLib.init(); } From 7695af3f658b75ef800938a81175514188774931 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:11:51 +0900 Subject: [PATCH 382/622] fix neoforge renderer --- .../neoforge/WorldRenderRegistryImpl.java | 90 +++++++++++++++++-- 1 file changed, 83 insertions(+), 7 deletions(-) diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java index ae5b659a8..8c1880d0e 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java @@ -8,7 +8,7 @@ import net.minecraft.util.profiler.Profiler; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RenderHighlightEvent; import net.pitan76.mcpitanlib.MCPitanLib; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineEvent; @@ -19,16 +19,13 @@ import java.util.ArrayList; import java.util.List; -@Mod.EventBusSubscriber(modid = MCPitanLib.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) +@EventBusSubscriber(modid = MCPitanLib.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class WorldRenderRegistryImpl { public static List beforeBlockOutlineListeners = new ArrayList<>(); @SubscribeEvent - public static void renderOutlineEvent(RenderHighlightEvent event) { - if (MinecraftClient.getInstance().world != null && MinecraftClient.getInstance().world.getTime() % 20 == 0) - System.out.println("renderOutlineEvent"); - + public static void renderOutlineEventBlock(RenderHighlightEvent.Block event) { for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { boolean eventContinue = listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { @Override @@ -105,12 +102,91 @@ public Frustum frustum() { }, event.getTarget())); if (!eventContinue) { - event.setResult(RenderHighlightEvent.Result.DENY); + event.setCanceled(true); break; } } } + @SubscribeEvent + public static void renderOutlineEvent(RenderHighlightEvent.Entity event) { + for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { + listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { + @Override + public WorldRenderer worldRenderer() { + return event.getLevelRenderer(); + } + + @Override + public MatrixStack matrixStack() { + return event.getPoseStack(); + } + + @Override + public float tickDelta() { + return event.getDeltaTracker().getTickDelta(true); + } + + @Override + public long limitTime() { + return (long) event.getDeltaTracker().getTickDelta(false); + } + + @Override + public boolean blockOutlines() { + return event.getTarget().getType() == HitResult.Type.BLOCK; + } + + @Override + public Camera camera() { + return event.getCamera(); + } + + @Override + public GameRenderer gameRenderer() { + return MinecraftClient.getInstance().gameRenderer; + } + + @Override + public LightmapTextureManager lightmapTextureManager() { + return MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager(); + } + + @Deprecated + @Override + public Matrix4f projectionMatrix() { + return null; + } + + @Override + public ClientWorld world() { + return MinecraftClient.getInstance().world; + } + + @Override + public Profiler profiler() { + return MinecraftClient.getInstance().getProfiler(); + } + + @Deprecated + @Override + public boolean advancedTranslucency() { + return event.getLevelRenderer().isTerrainRenderComplete(); + } + + @Override + public VertexConsumerProvider consumers() { + return event.getMultiBufferSource(); + } + + @Override + public Frustum frustum() { + return event.getLevelRenderer().getFrustum(); + } + }, event.getTarget())); + } + } + public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListener listener) { beforeBlockOutlineListeners.add(listener); } From 2b7fdddbfe2733d82277ccae033b2208f8cec4f8 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:13:16 +0900 Subject: [PATCH 383/622] add gettime --- .../net/pitan76/mcpitanlib/api/util/client/ClientUtil.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java index 4bae9d4ab..bf2fad7cd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java @@ -11,6 +11,8 @@ import net.minecraft.resource.ResourceManager; import net.pitan76.mcpitanlib.api.entity.Player; +import java.util.Optional; + public class ClientUtil { public static void setScreen(Screen screen) { getClient().setScreen(screen); @@ -55,4 +57,9 @@ public static ClientWorld getWorld() { public static GameRenderer getGameRenderer() { return getClient().gameRenderer; } + + public static Optional getTime() { + if (getClient().world == null) return Optional.empty(); + return Optional.of(getClient().world.getTime()); + } } From 70ed16c4fab435b22ccc645ac568a795003cf6f2 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:43:42 +0900 Subject: [PATCH 384/622] add APIs-2 --- .../api/client/event/WorldRenderRegistry.java | 6 ++ .../listener/BeforeBlockOutlineEvent.java | 37 ++----- .../event/listener/WorldRenderContext.java | 97 ++++++++++++++--- .../listener/WorldRenderContextListener.java | 10 ++ .../event/fabric/WorldRenderRegistryImpl.java | 101 ++++++++++++++---- 5 files changed, 187 insertions(+), 64 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java index 5d0d0695c..6cba6e3aa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/WorldRenderRegistry.java @@ -2,6 +2,7 @@ import dev.architectury.injectables.annotations.ExpectPlatform; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; +import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContextListener; public class WorldRenderRegistry { public WorldRenderRegistry() { @@ -12,4 +13,9 @@ public WorldRenderRegistry() { public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListener listener) { throw new AssertionError(); } + + @ExpectPlatform + public static void registerWorldRenderAfterLevel(WorldRenderContextListener listener) { + throw new AssertionError(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java index 9cf86627b..27656b1ed 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java @@ -2,7 +2,6 @@ import net.minecraft.block.BlockState; import net.minecraft.client.render.Camera; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.util.math.MatrixStack; @@ -12,9 +11,7 @@ import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.World; -import net.pitan76.mcpitanlib.api.util.VoxelShapeUtil; -import java.util.Objects; import java.util.Optional; public class BeforeBlockOutlineEvent { @@ -35,7 +32,7 @@ public WorldRenderContext getContext() { } public WorldRenderer getWorldRenderer() { - return context.worldRenderer(); + return context.getWorldRenderer(); } public Optional getBlockState() { @@ -43,7 +40,7 @@ public Optional getBlockState() { } public World getWorld() { - return context.world(); + return context.getWorld(); } public Optional getBlockPos() { @@ -59,50 +56,38 @@ public HitResult.Type getHitResultType() { } public Camera getCamera() { - return context.camera(); + return context.getCamera(); } public Optional getOutlineShape() { - return getBlockState().map(blockState -> blockState.getOutlineShape(getWorld(), - getBlockPos().orElse(null))); + return context.getOutlineShape(); } public MatrixStack getMatrixStack() { - return context.matrixStack(); + return context.getMatrixStack(); } public void push() { - getMatrixStack().push(); + context.push(); } public void translate(double x, double y, double z) { - getMatrixStack().translate(x, y, z); + context.translate(x, y, z); } public void pop() { - getMatrixStack().pop(); + context.pop(); } public Optional getVertexConsumer() { - if (context.consumers() == null) - return Optional.empty(); - - return Optional.of(Objects.requireNonNull(context.consumers()).getBuffer(RenderLayer.getLines())); + return context.getVertexConsumer(); } public void drawBox(float red, float green, float blue, float alpha) { - Optional outlineShape = getOutlineShape(); - if (!outlineShape.isPresent()) return; - - drawBox(VoxelShapeUtil.getBoundingBox(outlineShape.get()), red, green, blue, alpha); + context.drawBox(red, green, blue, alpha); } public void drawBox(Box box, float red, float green, float blue, float alpha) { - Optional vertexConsumer = getVertexConsumer(); - - if (!vertexConsumer.isPresent()) - return; - - WorldRenderer.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); + context.drawBox(box, red, green, blue, alpha); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java index 70532c7f4..c4bd03d35 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java @@ -3,45 +3,50 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.*; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.Entity; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.profiler.Profiler; +import net.minecraft.util.shape.VoxelShape; +import net.pitan76.mcpitanlib.api.util.VoxelShapeUtil; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; -public interface WorldRenderContext { - - WorldRenderer worldRenderer(); +import java.util.Objects; +import java.util.Optional; - MatrixStack matrixStack(); +public interface WorldRenderContext { - float tickDelta(); + WorldRenderer getWorldRenderer(); - long limitTime(); + MatrixStack getMatrixStack(); - boolean blockOutlines(); + float getTickDelta(); - Camera camera(); + Camera getCamera(); - GameRenderer gameRenderer(); + GameRenderer getGameRenderer(); - LightmapTextureManager lightmapTextureManager(); + LightmapTextureManager getLightmapTextureManager(); @Deprecated - Matrix4f projectionMatrix(); + Matrix4f getProjectionMatrix(); - ClientWorld world(); + ClientWorld getWorld(); - Profiler profiler(); + Profiler getProfiler(); @Deprecated - boolean advancedTranslucency(); + boolean isAdvancedTranslucency(); - @Nullable VertexConsumerProvider consumers(); - @Nullable Frustum frustum(); + @Nullable VertexConsumerProvider getConsumers(); + @Nullable Frustum getFrustum(); @Environment(EnvType.CLIENT) interface BlockOutlineContext { @@ -60,4 +65,64 @@ interface BlockOutlineContext { BlockState blockState(); } + + default HitResult getHitResult() { + return MinecraftClient.getInstance().crosshairTarget; + } + + default Optional getBlockState() { + return Optional.ofNullable(getWorld().getBlockState(getBlockPos().orElse(null))); + } + + default Optional getBlockPos() { + return Optional.ofNullable(((BlockHitResult) getHitResult()).getBlockPos()); + } + + default boolean isBlockType() { + return getHitResultType() == HitResult.Type.BLOCK; + } + + default HitResult.Type getHitResultType() { + return getHitResult().getType(); + } + + default Optional getOutlineShape() { + return getBlockState().map(blockState -> blockState.getOutlineShape(getWorld(), + getBlockPos().orElse(null))); + } + + default void push() { + getMatrixStack().push(); + } + + default void translate(double x, double y, double z) { + getMatrixStack().translate(x, y, z); + } + + default void pop() { + getMatrixStack().pop(); + } + + default Optional getVertexConsumer() { + if (getConsumers() == null) + return Optional.empty(); + + return Optional.of(Objects.requireNonNull(getConsumers()).getBuffer(RenderLayer.getLines())); + } + + default void drawBox(float red, float green, float blue, float alpha) { + Optional outlineShape = getOutlineShape(); + if (!outlineShape.isPresent()) return; + + drawBox(VoxelShapeUtil.getBoundingBox(outlineShape.get()), red, green, blue, alpha); + } + + default void drawBox(Box box, float red, float green, float blue, float alpha) { + Optional vertexConsumer = getVertexConsumer(); + + if (!vertexConsumer.isPresent()) + return; + + WorldRenderer.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java new file mode 100644 index 000000000..a24c8c486 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.client.event.listener; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +@FunctionalInterface +public interface WorldRenderContextListener { + void renderer(WorldRenderContext context); +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java index 0173477a2..bc89c8a39 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java @@ -8,6 +8,7 @@ import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineEvent; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContext; +import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContextListener; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; @@ -16,74 +17,130 @@ public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListe WorldRenderEvents.BEFORE_BLOCK_OUTLINE.register(((worldRenderContext, hitResult) -> listener.beforeBlockOutline(new BeforeBlockOutlineEvent( new WorldRenderContext() { @Override - public WorldRenderer worldRenderer() { + public WorldRenderer getWorldRenderer() { return worldRenderContext.worldRenderer(); } @Override - public MatrixStack matrixStack() { + public MatrixStack getMatrixStack() { return worldRenderContext.matrixStack(); } @Override - public float tickDelta() { + public float getTickDelta() { return worldRenderContext.tickCounter().getTickDelta(true); } @Override - public long limitTime() { - return (long) worldRenderContext.tickCounter().getLastDuration(); - } - - @Override - public boolean blockOutlines() { - return worldRenderContext.blockOutlines(); - } - - @Override - public Camera camera() { + public Camera getCamera() { return worldRenderContext.camera(); } @Override - public GameRenderer gameRenderer() { + public GameRenderer getGameRenderer() { return worldRenderContext.gameRenderer(); } @Override - public LightmapTextureManager lightmapTextureManager() { + public LightmapTextureManager getLightmapTextureManager() { return worldRenderContext.lightmapTextureManager(); } @Override - public Matrix4f projectionMatrix() { + public Matrix4f getProjectionMatrix() { return worldRenderContext.projectionMatrix(); } @Override - public ClientWorld world() { + public ClientWorld getWorld() { return worldRenderContext.world(); } @Override - public Profiler profiler() { + public Profiler getProfiler() { return worldRenderContext.profiler(); } @Override - public boolean advancedTranslucency() { + public boolean isAdvancedTranslucency() { return worldRenderContext.advancedTranslucency(); } @Override - public @Nullable VertexConsumerProvider consumers() { + public @Nullable VertexConsumerProvider getConsumers() { return worldRenderContext.consumers(); } @Override - public @Nullable Frustum frustum() { + public @Nullable Frustum getFrustum() { return worldRenderContext.frustum(); } }, hitResult)))); } + + public static void registerWorldRenderAfterLevel(WorldRenderContextListener listener) { + WorldRenderEvents.END.register((context -> { + listener.renderer(new WorldRenderContext() { + @Override + public WorldRenderer getWorldRenderer() { + return context.worldRenderer(); + } + + @Override + public MatrixStack getMatrixStack() { + return context.matrixStack(); + } + + @Override + public float getTickDelta() { + return context.tickCounter().getTickDelta(true); + } + + @Override + public Camera getCamera() { + return context.camera(); + } + + @Override + public GameRenderer getGameRenderer() { + return context.gameRenderer(); + } + + @Override + public LightmapTextureManager getLightmapTextureManager() { + return context.lightmapTextureManager(); + } + + @Override + public Matrix4f getProjectionMatrix() { + return context.projectionMatrix(); + } + + @Override + public ClientWorld getWorld() { + return context.world(); + } + + @Override + public Profiler getProfiler() { + return context.profiler(); + } + + @Override + public boolean isAdvancedTranslucency() { + return context.advancedTranslucency(); + } + + @Override + public @Nullable VertexConsumerProvider getConsumers() { + return context.consumers(); + } + + @Override + public @Nullable Frustum getFrustum() { + return context.frustum(); + } + }); + })); + } } From 44eb4da287dfa10b3d1fd0e8afad1cbef7b10a13 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:43:51 +0900 Subject: [PATCH 385/622] neoforge 2 --- .../neoforge/WorldRenderRegistryImpl.java | 140 +++++++++++++----- 1 file changed, 99 insertions(+), 41 deletions(-) diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java index 8c1880d0e..54d548604 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java @@ -10,10 +10,12 @@ import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RenderHighlightEvent; +import net.neoforged.neoforge.client.event.RenderLevelStageEvent; import net.pitan76.mcpitanlib.MCPitanLib; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineEvent; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContext; +import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContextListener; import org.joml.Matrix4f; import java.util.ArrayList; @@ -23,80 +25,71 @@ public class WorldRenderRegistryImpl { public static List beforeBlockOutlineListeners = new ArrayList<>(); + public static List worldRenderAfterLevelListeners = new ArrayList<>(); @SubscribeEvent public static void renderOutlineEventBlock(RenderHighlightEvent.Block event) { for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { boolean eventContinue = listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { @Override - public WorldRenderer worldRenderer() { + public WorldRenderer getWorldRenderer() { return event.getLevelRenderer(); } @Override - public MatrixStack matrixStack() { + public MatrixStack getMatrixStack() { return event.getPoseStack(); } @Override - public float tickDelta() { + public float getTickDelta() { return event.getDeltaTracker().getTickDelta(true); } @Override - public long limitTime() { - return (long) event.getDeltaTracker().getTickDelta(false); - } - - @Override - public boolean blockOutlines() { - return event.getTarget().getType() == HitResult.Type.BLOCK; - } - - @Override - public Camera camera() { + public Camera getCamera() { return event.getCamera(); } @Override - public GameRenderer gameRenderer() { + public GameRenderer getGameRenderer() { return MinecraftClient.getInstance().gameRenderer; } @Override - public LightmapTextureManager lightmapTextureManager() { + public LightmapTextureManager getLightmapTextureManager() { return MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager(); } @Deprecated @Override - public Matrix4f projectionMatrix() { + public Matrix4f getProjectionMatrix() { return null; } @Override - public ClientWorld world() { + public ClientWorld getWorld() { return MinecraftClient.getInstance().world; } @Override - public Profiler profiler() { + public Profiler getProfiler() { return MinecraftClient.getInstance().getProfiler(); } @Deprecated @Override - public boolean advancedTranslucency() { + public boolean isAdvancedTranslucency() { return event.getLevelRenderer().isTerrainRenderComplete(); } @Override - public VertexConsumerProvider consumers() { + public VertexConsumerProvider getConsumers() { return event.getMultiBufferSource(); } @Override - public Frustum frustum() { + public Frustum getFrustum() { return event.getLevelRenderer().getFrustum(); } }, event.getTarget())); @@ -113,82 +106,147 @@ public static void renderOutlineEvent(RenderHighlightEvent.Entity event) { for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { @Override - public WorldRenderer worldRenderer() { + public WorldRenderer getWorldRenderer() { return event.getLevelRenderer(); } @Override - public MatrixStack matrixStack() { + public MatrixStack getMatrixStack() { return event.getPoseStack(); } @Override - public float tickDelta() { + public float getTickDelta() { return event.getDeltaTracker().getTickDelta(true); } @Override - public long limitTime() { - return (long) event.getDeltaTracker().getTickDelta(false); + public Camera getCamera() { + return event.getCamera(); + } + + @Override + public GameRenderer getGameRenderer() { + return MinecraftClient.getInstance().gameRenderer; + } + + @Override + public LightmapTextureManager getLightmapTextureManager() { + return MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager(); + } + + @Deprecated + @Override + public Matrix4f getProjectionMatrix() { + return null; } @Override - public boolean blockOutlines() { - return event.getTarget().getType() == HitResult.Type.BLOCK; + public ClientWorld getWorld() { + return MinecraftClient.getInstance().world; + } + + @Override + public Profiler getProfiler() { + return MinecraftClient.getInstance().getProfiler(); + } + + @Deprecated + @Override + public boolean isAdvancedTranslucency() { + return event.getLevelRenderer().isTerrainRenderComplete(); } @Override - public Camera camera() { + public VertexConsumerProvider getConsumers() { + return event.getMultiBufferSource(); + } + + @Override + public Frustum getFrustum() { + return event.getLevelRenderer().getFrustum(); + } + }, event.getTarget())); + } + } + + @SubscribeEvent + public static void registerWorldRenderAfterLevel(RenderLevelStageEvent event) { + if (!event.getStage().equals(RenderLevelStageEvent.Stage.AFTER_LEVEL)) return; + + for (WorldRenderContextListener listener : worldRenderAfterLevelListeners) { + listener.renderer(new WorldRenderContext() { + @Override + public WorldRenderer getWorldRenderer() { + return event.getLevelRenderer(); + } + + @Override + public MatrixStack getMatrixStack() { + return event.getPoseStack(); + } + + @Override + public float getTickDelta() { + return event.getPartialTick().getTickDelta(true); + } + + @Override + public Camera getCamera() { return event.getCamera(); } @Override - public GameRenderer gameRenderer() { + public GameRenderer getGameRenderer() { return MinecraftClient.getInstance().gameRenderer; } @Override - public LightmapTextureManager lightmapTextureManager() { + public LightmapTextureManager getLightmapTextureManager() { return MinecraftClient.getInstance().gameRenderer.getLightmapTextureManager(); } @Deprecated @Override - public Matrix4f projectionMatrix() { - return null; + public Matrix4f getProjectionMatrix() { + return event.getProjectionMatrix(); } @Override - public ClientWorld world() { + public ClientWorld getWorld() { return MinecraftClient.getInstance().world; } @Override - public Profiler profiler() { + public Profiler getProfiler() { return MinecraftClient.getInstance().getProfiler(); } @Deprecated @Override - public boolean advancedTranslucency() { + public boolean isAdvancedTranslucency() { return event.getLevelRenderer().isTerrainRenderComplete(); } @Override - public VertexConsumerProvider consumers() { - return event.getMultiBufferSource(); + public VertexConsumerProvider getConsumers() { + return MinecraftClient.getInstance().getBufferBuilders().getOutlineVertexConsumers(); } @Override - public Frustum frustum() { + public Frustum getFrustum() { return event.getLevelRenderer().getFrustum(); } - }, event.getTarget())); + }); } } public static void registerWorldRenderBeforeBlockOutline(BeforeBlockOutlineListener listener) { beforeBlockOutlineListeners.add(listener); } + + public static void registerWorldRenderAfterLevel(WorldRenderContextListener listener) { + worldRenderAfterLevelListeners.add(listener); + } } From 81eafb9113c12610963264f54d0030eb89d2c87d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sat, 14 Sep 2024 01:22:54 +0900 Subject: [PATCH 386/622] fix apis --- .../pitan76/mcpitanlib/api/client/SimpleHandledScreen.java | 4 ++++ .../java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index d995cb752..60fe1601a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -18,6 +18,7 @@ import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.client.RenderUtil; public abstract class SimpleHandledScreen extends HandledScreen { @@ -199,6 +200,9 @@ public boolean keyPressed(KeyEventArgs args) { public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { if (getBackgroundTexture() != null) Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), getBackgroundTexture(), x, y, 0, 0, this.width, this.height); + + RenderUtil.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + callDrawTexture(args.drawObjectDM, getBackgroundTexture(), 0, 0, 0, 0, width, height); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index 7234d0259..4b08c1c66 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -15,6 +15,7 @@ import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.client.RenderUtil; public abstract class SimpleScreen extends Screen { @@ -139,6 +140,9 @@ public boolean keyPressed(KeyEventArgs args) { public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { if (getBackgroundTexture() != null) Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), getBackgroundTexture(), 0, 0, 0, 0, this.width, this.height); + + RenderUtil.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + callDrawTexture(args.drawObjectDM, getBackgroundTexture(), 0, 0, 0, 0, width, height); } @Deprecated From fd990c7e1bf4e93115644cea5a11d8402864c8c6 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 14 Sep 2024 12:39:49 +0900 Subject: [PATCH 387/622] add APIs --- .../mcpitanlib/api/block/ExtendBlock.java | 2 +- .../listener/WorldRenderContextListener.java | 2 +- .../event/block/BlockScheduledTickEvent.java | 8 +- .../api/event/v0/LivingHurtEventRegistry.java | 21 +++ .../api/event/v0/event/LivingHurtEvent.java | 83 +++++++++++ .../api/util/CompatibleRecipeEntryUtil.java | 4 + .../mcpitanlib/api/util/IngredientUtil.java | 6 +- .../pitan76/mcpitanlib/api/util/Logger.java | 105 +++++++++++++ .../pitan76/mcpitanlib/api/util/MathUtil.java | 10 +- .../mcpitanlib/api/util/ServerUtil.java | 50 +++++++ .../mcpitanlib/api/util/WorldUtil.java | 39 +++-- .../api/util/client/ClientUtil.java | 39 +++++ .../mcpitanlib/api/util/client/MouseUtil.java | 46 ++++++ .../api/util/client/WindowUtil.java | 42 ++++++ .../api/util/math/random/CompatRandom.java | 140 ++++++++++++++++++ .../event/fabric/WorldRenderRegistryImpl.java | 2 +- info.properties | 2 +- .../neoforge/WorldRenderRegistryImpl.java | 2 +- 18 files changed, 577 insertions(+), 26 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/LivingHurtEventRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/LivingHurtEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MouseUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/WindowUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/math/random/CompatRandom.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 8563170f6..95ee0d3fa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -92,7 +92,7 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po * @param event BlockScheduledTickEvent */ public void scheduledTick(BlockScheduledTickEvent event) { - super.scheduledTick(event.state, event.world, event.pos, event.random); + super.scheduledTick(event.state, event.world, event.pos, event.random.getMcRandom()); } @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java index a24c8c486..7025eae59 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContextListener.java @@ -6,5 +6,5 @@ @Environment(EnvType.CLIENT) @FunctionalInterface public interface WorldRenderContextListener { - void renderer(WorldRenderContext context); + void render(WorldRenderContext context); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java index 6503217c1..df1f29d34 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java @@ -7,18 +7,19 @@ import net.minecraft.util.math.random.Random; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; public class BlockScheduledTickEvent extends BaseEvent { public BlockState state; public ServerWorld world; public BlockPos pos; - public Random random; + public CompatRandom random; public BlockScheduledTickEvent(BlockState state, ServerWorld world, BlockPos pos, Random random) { this.state = state; this.world = world; this.pos = pos; - this.random = random; + this.random = new CompatRandom(random); } public BlockState getState() { @@ -33,8 +34,7 @@ public ServerWorld getWorld() { return world; } - @Deprecated - public Random getRandom() { + public CompatRandom getRandom() { return random; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/LivingHurtEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/LivingHurtEventRegistry.java new file mode 100644 index 000000000..3777e195e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/LivingHurtEventRegistry.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.event.v0; + +import dev.architectury.event.EventResult; +import dev.architectury.event.events.common.EntityEvent; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.pitan76.mcpitanlib.api.event.v0.event.LivingHurtEvent; + +public class LivingHurtEventRegistry { + public static void register(LivingHurt livingHurt) { + EntityEvent.LIVING_HURT.register(livingHurt::hurt); + } + + public interface LivingHurt { + default EventResult hurt(LivingEntity var1, DamageSource var2, float var3) { + return hurt(new LivingHurtEvent(var1, var2, var3)); + } + + EventResult hurt(LivingHurtEvent event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/LivingHurtEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/LivingHurtEvent.java new file mode 100644 index 000000000..903d4c658 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/LivingHurtEvent.java @@ -0,0 +1,83 @@ +package net.pitan76.mcpitanlib.api.event.v0.event; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; + +public class LivingHurtEvent { + public LivingEntity entity; + public DamageSource damageSource; + public float damageAmount; + + public LivingHurtEvent(LivingEntity entity, DamageSource damageSource, float damageAmount) { + this.entity = entity; + this.damageSource = damageSource; + this.damageAmount = damageAmount; + } + + public LivingEntity getEntity() { + return entity; + } + + public DamageSource getDamageSource() { + return damageSource; + } + + public float getDamageAmount() { + return damageAmount; + } + + public Entity getAttacker() { + return damageSource.getAttacker(); + } + + public Entity getSource() { + return damageSource.getSource(); + } + + public boolean isDirect() { + return damageSource.isDirect(); + } + + public boolean isPlayerAttacker() { + return getAttacker() instanceof PlayerEntity; + } + + public PlayerEntity getPlayerEntityAttacker() { + return (PlayerEntity) getAttacker(); + } + + public Player getPlayerAttacker() { + return new Player(getPlayerEntityAttacker()); + } + + public World getWorld() { + return entity.getWorld(); + } + + public boolean isClient() { + return getWorld().isClient(); + } + + public ItemStack getWeaponStack() { + return getAttacker().getWeaponStack(); + } + + public Item getWeaponItem() { + return getWeaponStack().getItem(); + } + + public boolean isWeaponEmpty() { + return getWeaponStack().isEmpty(); + } + + public boolean isWeaponItemEqual(Item item) { + if (isWeaponEmpty()) return false; + return getWeaponItem() == item; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java index 18fda59b1..ab1fada7f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java @@ -10,4 +10,8 @@ public class CompatibleRecipeEntryUtil { public static CompatibleRecipeEntry createShapelessRecipe(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { return new CompatibleRecipeEntry(id, group, category, RecipeUtil.createShapelessRecipe(id, group, category, output, input)); } + + public static CompatibleRecipeEntry createShapelessRecipe(CompatIdentifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { + return createShapelessRecipe(id.toMinecraft(), group, category, output, input); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index e655b2654..9a6bcf43f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -35,15 +35,15 @@ public static List getItems(Ingredient ingredient) { return items; } - public IntList getMatchingStacksIds(Ingredient ingredient) { + public static IntList getMatchingStacksIds(Ingredient ingredient) { return ingredient.getMatchingItemIds(); } - public List getMatchingStacksAsList(Ingredient ingredient) { + public static List getMatchingStacksAsList(Ingredient ingredient) { return new ArrayList<>(Arrays.asList(getMatchingStacks(ingredient))); } - public ItemStack[] getMatchingStacks(Ingredient ingredient) { + public static ItemStack[] getMatchingStacks(Ingredient ingredient) { return ingredient.getMatchingStacks(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java index 1309ddebd..728eeab5b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java @@ -1,5 +1,8 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.client.ClientUtil; + public class Logger { public String name = ""; @@ -77,4 +80,106 @@ public void usePrefix(boolean use) { public boolean isUsingPrefix() { return usingPrefix; } + + /** + * Log message + * @param message log message + * @param isDebug if true, log as debug + */ + public void log(String message, boolean isDebug) { + if (isDebug) { + debug(message); + return; + } + info(message); + } + + public void log_onClientTick(int tick, String message, boolean isDebug) { + if (!PlatformUtil.isClient()) return; + long time = ClientUtil.getRenderTime(); + if (time % tick != 0) return; + + log(message, isDebug); + } + + public void log_onWorldTick(int tick, String message, World world, boolean isDebug) { + long time = WorldUtil.getTime(world); + if (time % tick != 0) return; + + log(message, isDebug); + } + + public void log_onSystemTick(int tick, String message, boolean isDebug) { + long millis = System.currentTimeMillis(); + long time = millis / 1000 * 60; + + if (time % tick != 0) return; + + log(message, isDebug); + } + + public void log_onClientTick(int tick, String message) { + log_onClientTick(tick, message, false); + } + + public void log_onWorldTick(int tick, String message, World world) { + log_onWorldTick(tick, message, world, false); + } + + public void log_onSystemTick(int tick, String message) { + log_onSystemTick(tick, message, false); + } + + /** + * Log message every second on ClientTick + * @param message log message + * @param isDebug if true, log as debug + */ + public void log_onClientTick(String message, boolean isDebug) { + log_onClientTick(60, message, isDebug); + } + + /** + * Log message every second on WorldTick + * @param message log message + * @param world world + * @param isDebug if true, log as debug + */ + public void log_onWorldTick(String message, World world, boolean isDebug) { + log_onWorldTick(60, message, world, isDebug); + } + + /** + * Log message every second on SystemTick + * @param message log message + * @param isDebug if true, log as debug + */ + public void log_onSystemTick(String message, boolean isDebug) { + log_onSystemTick(60, message, isDebug); + } + + /** + * Log message every second on ClientTick + * @param message log message + */ + public void log_onClientTick(String message) { + log_onClientTick(message, false); + } + + /** + * Log message every second on WorldTick + * @param message log message + * @param world world + */ + public void log_onWorldTick(String message, World world) { + log_onWorldTick(message, world, false); + } + + /** + * Log message every second on SystemTick + * @param message log message + */ + public void log_onSystemTick(String message) { + log_onSystemTick(message, false); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/MathUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/MathUtil.java index 5fdefdea6..2cb21eb12 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/MathUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/MathUtil.java @@ -1,17 +1,17 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.util.math.RotationAxis; -import net.minecraft.util.math.random.Random; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import org.joml.Quaternionf; public class MathUtil { - public static Random createRandom(long seed) { - return Random.create(seed); + public static CompatRandom createRandom(long seed) { + return CompatRandom.of(seed); } - public static Random createRandom() { - return Random.create(); + public static CompatRandom createRandom() { + return CompatRandom.of(); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java new file mode 100644 index 000000000..e4e74f1f9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java @@ -0,0 +1,50 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; + +public class ServerUtil { + public static MinecraftServer getServer(World world) { + return world.getServer(); + } + + public static String getIP(MinecraftServer server) { + return server.getServerIp(); + } + + public static int getPort(MinecraftServer server) { + return server.getServerPort(); + } + + public static String getMotd(MinecraftServer server) { + return server.getServerMotd(); + } + + public static String getServerModName(MinecraftServer server) { + return server.getServerModName(); + } + + public static int getMaxPlayerCount(MinecraftServer server) { + return server.getMaxPlayerCount(); + } + + public static int getCurrentPlayerCount(MinecraftServer server) { + return server.getCurrentPlayerCount(); + } + + public static boolean isOnlineMode(MinecraftServer server) { + return server.isOnlineMode(); + } + + public static boolean isServerRunning(MinecraftServer server) { + return server.isRunning(); + } + + public static boolean isServerDedicated(MinecraftServer server) { + return server.isDedicated(); + } + + public static boolean isSingleplayer(MinecraftServer server) { + return server.isSingleplayer(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 9cbf94d49..73ff66049 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -26,10 +26,10 @@ import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import org.jetbrains.annotations.Nullable; -import java.util.Objects; -import java.util.Optional; +import java.util.*; public class WorldUtil { public static boolean hasSkyLight(World world) { @@ -115,34 +115,34 @@ public static Optional getServer(World world) { return Optional.ofNullable(world.getServer()); } - public static World getWorld(World world, Identifier worldId) { + public static ServerWorld getWorld(World world, Identifier worldId) { Optional server = getServer(world); if (!server.isPresent()) return null; return getWorld(server.get(), worldId); } - public static Optional getWorld(World world, CompatIdentifier worldId) { + public static Optional getWorld(World world, CompatIdentifier worldId) { return Optional.ofNullable(getWorld(world, worldId.toMinecraft())); } - public static World getOverworld(MinecraftServer server) { + public static ServerWorld getOverworld(MinecraftServer server) { return server.getWorld(World.OVERWORLD); } - public static World getNether(MinecraftServer server) { + public static ServerWorld getNether(MinecraftServer server) { return server.getWorld(World.NETHER); } - public static World getEnd(MinecraftServer server) { + public static ServerWorld getEnd(MinecraftServer server) { return server.getWorld(World.END); } - public static World getWorld(MinecraftServer server, Identifier worldId) { + public static ServerWorld getWorld(MinecraftServer server, Identifier worldId) { return server.getWorld(RegistryKey.of(RegistryKeys.WORLD, worldId)); } - public static World getWorld(MinecraftServer server, CompatIdentifier worldId) { + public static ServerWorld getWorld(MinecraftServer server, CompatIdentifier worldId) { return getWorld(server, worldId.toMinecraft()); } @@ -260,4 +260,25 @@ public static boolean canSetBlock(World world, BlockPos pos) { public static void updateComparators(World world, BlockPos pos, Block block) { world.updateComparators(pos, block); } + + public static List getPlayers(World world) { + List players = new ArrayList<>(); + for (PlayerEntity player : world.getPlayers()) { + players.add(new Player(player)); + } + + return players; + } + + public static Player getPlayer(World world, UUID uuid) { + return new Player(world.getPlayerByUuid(uuid)); + } + + public static CompatRandom getRandom(World world) { + return new CompatRandom(world.getRandom()); + } + + public static long getTime(World world) { + return world.getTime(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java index bf2fad7cd..936e089c4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java @@ -1,16 +1,23 @@ package net.pitan76.mcpitanlib.api.util.client; +import com.mojang.authlib.GameProfile; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.Mouse; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.texture.TextureManager; +import net.minecraft.client.util.Window; import net.minecraft.client.world.ClientWorld; import net.minecraft.resource.ResourceManager; +import net.minecraft.util.hit.HitResult; +import net.minecraft.util.profiler.Profiler; import net.pitan76.mcpitanlib.api.entity.Player; +import java.io.File; import java.util.Optional; public class ClientUtil { @@ -62,4 +69,36 @@ public static Optional getTime() { if (getClient().world == null) return Optional.empty(); return Optional.of(getClient().world.getTime()); } + + public static long getRenderTime() { + return getClient().getRenderTime(); + } + + public static HitResult getTarget() { + return getClient().crosshairTarget; + } + + public static WorldRenderer getWorldRenderer() { + return getClient().worldRenderer; + } + + public static File getRunDirectory() { + return getClient().runDirectory; + } + + public static Profiler getProfiler() { + return getClient().getProfiler(); + } + + public static GameProfile getGameProfile() { + return getClient().getGameProfile(); + } + + public static Window getWindow() { + return getClient().getWindow(); + } + + public static Mouse getMouse() { + return getClient().mouse; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MouseUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MouseUtil.java new file mode 100644 index 000000000..898acde1d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MouseUtil.java @@ -0,0 +1,46 @@ +package net.pitan76.mcpitanlib.api.util.client; + +import net.minecraft.client.Mouse; + +public class MouseUtil { + + public static Mouse getMouse() { + return ClientUtil.getMouse(); + } + + public static double getMouseX() { + return getMouse().getX(); + } + + public static double getMouseY() { + return getMouse().getY(); + } + + public static boolean isCursorLocked() { + return getMouse().isCursorLocked(); + } + + public static void lockCursor() { + getMouse().lockCursor(); + } + + public static void unlockCursor() { + getMouse().unlockCursor(); + } + + public static void tick() { + getMouse().tick(); + } + + public static boolean wasLeftButtonClicked() { + return getMouse().wasLeftButtonClicked(); + } + + public static boolean wasRightButtonClicked() { + return getMouse().wasRightButtonClicked(); + } + + public static boolean wasMiddleButtonClicked() { + return getMouse().wasMiddleButtonClicked(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/WindowUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/WindowUtil.java new file mode 100644 index 000000000..a57e74910 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/WindowUtil.java @@ -0,0 +1,42 @@ +package net.pitan76.mcpitanlib.api.util.client; + +import net.minecraft.client.util.Window; + +public class WindowUtil { + + public static Window getWindow() { + return ClientUtil.getWindow(); + } + + public static int getWindowScaledWidth() { + return getWindow().getScaledWidth(); + } + + public static int getWindowScaledHeight() { + return getWindow().getScaledHeight(); + } + + public static int getWindowWidth() { + return getWindow().getWidth(); + } + + public static int getWindowHeight() { + return getWindow().getHeight(); + } + + public static int getWindowX() { + return getWindow().getX(); + } + + public static int getWindowY() { + return getWindow().getY(); + } + + public static void setTitle(String title) { + getWindow().setTitle(title); + } + + public static void close() { + getWindow().close(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/random/CompatRandom.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/random/CompatRandom.java new file mode 100644 index 000000000..93cd723d5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/random/CompatRandom.java @@ -0,0 +1,140 @@ +package net.pitan76.mcpitanlib.api.util.math.random; + +public class CompatRandom { + private java.util.Random javaRandom; + private net.minecraft.util.math.random.Random mcRandom; + + public CompatRandom(java.util.Random javaRandom) { + this.javaRandom = javaRandom; + } + + public CompatRandom(net.minecraft.util.math.random.Random mcRandom) { + this.mcRandom = mcRandom; + } + + @Deprecated + public CompatRandom() { + this.mcRandom = net.minecraft.util.math.random.Random.create(); + } + + @Deprecated + public CompatRandom(long seed) { + this.mcRandom = net.minecraft.util.math.random.Random.create(seed); + } + + public static CompatRandom of(long seed) { + return new CompatRandom(seed); + } + + public static CompatRandom of() { + return new CompatRandom(); + } + + public void setSeed(long seed) { + if (javaRandom != null) { + javaRandom.setSeed(seed); + } else { + mcRandom.setSeed(seed); + } + } + + public void skip(int count) { + if (javaRandom != null) { + for (int i = 0; i < count; i++) { + javaRandom.nextInt(); + } + } else { + mcRandom.skip(count); + } + } + + public void split() { + if (javaRandom != null) { + javaRandom.nextInt(); + } else { + mcRandom.split(); + } + } + + public int nextInt() { + if (javaRandom != null) { + return javaRandom.nextInt(); + } else { + return mcRandom.nextInt(); + } + } + + public int nextInt(int bound) { + if (javaRandom != null) { + return javaRandom.nextInt(bound); + } else { + return mcRandom.nextInt(bound); + } + } + + public long nextLong() { + if (javaRandom != null) { + return javaRandom.nextLong(); + } else { + return mcRandom.nextLong(); + } + } + + public double nextDouble() { + if (javaRandom != null) { + return javaRandom.nextDouble(); + } else { + return mcRandom.nextDouble(); + } + } + + public double nextGaussian() { + if (javaRandom != null) { + return javaRandom.nextGaussian(); + } else { + return mcRandom.nextGaussian(); + } + } + + public float nextFloat() { + if (javaRandom != null) { + return javaRandom.nextFloat(); + } else { + return mcRandom.nextFloat(); + } + } + + public int nextBetween(int min, int max) { + if (javaRandom != null) { + return min + javaRandom.nextInt(max - min); + } else { + return min + mcRandom.nextInt(max - min); + } + } + + public int nextBetweenExclusive(int min, int max) { + if (javaRandom != null) { + return min + javaRandom.nextInt(max - min - 1); + } else { + return min + mcRandom.nextInt(max - min - 1); + } + } + + public boolean nextBoolean() { + if (javaRandom != null) { + return javaRandom.nextBoolean(); + } else { + return mcRandom.nextBoolean(); + } + } + + @Deprecated + public java.util.Random getJavaRandom() { + return javaRandom; + } + + @Deprecated + public net.minecraft.util.math.random.Random getMcRandom() { + return mcRandom; + } +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java index bc89c8a39..2b81187c2 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java @@ -80,7 +80,7 @@ public boolean isAdvancedTranslucency() { public static void registerWorldRenderAfterLevel(WorldRenderContextListener listener) { WorldRenderEvents.END.register((context -> { - listener.renderer(new WorldRenderContext() { + listener.render(new WorldRenderContext() { @Override public WorldRenderer getWorldRenderer() { return context.worldRenderer(); diff --git a/info.properties b/info.properties index b30d56f09..834e58920 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.2 +mod_version=2.4.3 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java index 54d548604..dc6d92392 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java @@ -175,7 +175,7 @@ public static void registerWorldRenderAfterLevel(RenderLevelStageEvent event) { if (!event.getStage().equals(RenderLevelStageEvent.Stage.AFTER_LEVEL)) return; for (WorldRenderContextListener listener : worldRenderAfterLevelListeners) { - listener.renderer(new WorldRenderContext() { + listener.render(new WorldRenderContext() { @Override public WorldRenderer getWorldRenderer() { return event.getLevelRenderer(); From ae49dfe78eb284ef562edd35544fb5d169548bc3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 16 Sep 2024 19:03:18 +0900 Subject: [PATCH 388/622] add APIs --- .../api/block/CompatibleBlockSettings.java | 5 + .../api/command/argument/BlockCommand.java | 21 ++ .../api/command/argument/BooleanCommand.java | 19 ++ .../api/command/argument/ItemCommand.java | 4 +- .../api/command/argument/LongCommand.java | 19 ++ .../pitan76/mcpitanlib/api/entity/Player.java | 61 ++++- .../api/event/BlockCommandEvent.java | 11 + .../api/event/BooleanCommandEvent.java | 10 + .../api/event/LongCommandEvent.java | 10 + .../api/event/ServerCommandEvent.java | 18 ++ .../mcpitanlib/api/nbt/NbtTypeBytes.java | 20 ++ .../api/registry/CompatRegistry.java | 10 + .../api/registry/v2/CompatRegistryV2.java | 12 + .../api/sound/CompatBlockSoundGroup.java | 221 ++++++++++++++++++ .../api/util/CommandManagerUtil.java | 84 +++++++ .../mcpitanlib/api/util/CommandUtil.java | 53 +++++ .../pitan76/mcpitanlib/api/util/ItemUtil.java | 12 + .../pitan76/mcpitanlib/api/util/Logger.java | 5 + .../pitan76/mcpitanlib/api/util/NbtUtil.java | 74 +++++- .../core/command/CommandResult.java | 73 ++++++ .../core/registry/MCPLRegistry.java | 14 ++ info.properties | 2 +- 22 files changed, 750 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BlockCommand.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BooleanCommand.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/LongCommand.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/BlockCommandEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/BooleanCommandEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/LongCommandEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTypeBytes.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatBlockSoundGroup.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/core/command/CommandResult.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java index 2034f9e2d..48a18f468 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java @@ -7,6 +7,7 @@ import net.minecraft.block.MapColor; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.DyeColor; +import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; import java.util.function.Function; import java.util.function.ToIntFunction; @@ -197,6 +198,10 @@ public CompatibleBlockSettings sounds(BlockSoundGroup blockSoundGroup) { return this; } + public CompatibleBlockSettings sounds(CompatBlockSoundGroup blockSoundGroup) { + return sounds(blockSoundGroup.get()); + } + public CompatibleBlockSettings luminance(ToIntFunction luminance) { settings.luminance(luminance); return this; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BlockCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BlockCommand.java new file mode 100644 index 000000000..452c85dac --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BlockCommand.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.command.argument; + +import net.minecraft.block.Block; +import net.minecraft.command.argument.BlockStateArgumentType; +import net.pitan76.mcpitanlib.api.command.CommandRegistry; +import net.pitan76.mcpitanlib.api.event.BlockCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; + +public abstract class BlockCommand extends RequiredCommand { + @Override + public BlockStateArgumentType getArgumentType() { + return BlockStateArgumentType.blockState(CommandRegistry.latestCommandRegistryAccess); + } + + public abstract void execute(BlockCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((BlockCommandEvent) event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BooleanCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BooleanCommand.java new file mode 100644 index 000000000..32687d804 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/BooleanCommand.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.command.argument; + +import com.mojang.brigadier.arguments.BoolArgumentType; +import net.pitan76.mcpitanlib.api.event.BooleanCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; + +public abstract class BooleanCommand extends RequiredCommand { + @Override + public BoolArgumentType getArgumentType() { + return BoolArgumentType.bool(); + } + + public abstract void execute(BooleanCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((BooleanCommandEvent) event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java index d32febff3..2d24871bc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/ItemCommand.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.command.argument; import net.minecraft.command.argument.ItemStackArgumentType; -import net.minecraft.entity.Entity; +import net.minecraft.item.Item; import net.pitan76.mcpitanlib.api.command.CommandRegistry; import net.pitan76.mcpitanlib.api.event.ItemCommandEvent; import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; -public abstract class ItemCommand extends RequiredCommand { +public abstract class ItemCommand extends RequiredCommand { @Override public ItemStackArgumentType getArgumentType() { return ItemStackArgumentType.itemStack(CommandRegistry.latestCommandRegistryAccess); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/LongCommand.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/LongCommand.java new file mode 100644 index 000000000..45bd3b622 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/argument/LongCommand.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.command.argument; + +import com.mojang.brigadier.arguments.LongArgumentType; +import net.pitan76.mcpitanlib.api.event.LongCommandEvent; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; + +public abstract class LongCommand extends RequiredCommand { + @Override + public LongArgumentType getArgumentType() { + return LongArgumentType.longArg(); + } + + public abstract void execute(LongCommandEvent event); + + @Override + public void execute(ServerCommandEvent event) { + execute((LongCommandEvent) event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 7ea799f69..f708bb6a7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -6,6 +6,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.player.ItemCooldownManager; import net.minecraft.entity.player.PlayerAbilities; import net.minecraft.entity.player.PlayerEntity; @@ -29,6 +30,8 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; +import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffectInstance; import net.pitan76.mcpitanlib.api.gui.ExtendedNamedScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; @@ -37,9 +40,7 @@ import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; import net.pitan76.mcpitanlib.core.player.ItemCooldown; -import java.util.Optional; -import java.util.OptionalInt; -import java.util.UUID; +import java.util.*; import java.util.function.Consumer; /* @@ -421,4 +422,58 @@ public Optional getCurrentHandItem() { return Optional.empty(); } + + public void addStatusEffect(CompatStatusEffectInstance effect) { + getEntity().addStatusEffect(effect.getInstance()); + } + + public void removeStatusEffect(CompatStatusEffect effect) { + getEntity().removeStatusEffect(effect.getEntry(getWorld())); + } + + public List getStatusEffects() { + List compatEffects = new ArrayList<>(); + + for (StatusEffectInstance effect : getEntity().getStatusEffects()) { + compatEffects.add(new CompatStatusEffectInstance(effect)); + } + + return compatEffects; + } + + public void addExperience(int experience) { + getEntity().addExperience(experience); + } + + public int getExperienceLevel() { + return getEntity().experienceLevel; + } + + public void addExperienceLevels(int levels) { + getEntity().addExperienceLevels(levels); + } + + public void setExperienceLevel(int level) { + getEntity().experienceLevel = level; + } + + public void addScore(int score) { + getEntity().addScore(score); + } + + public int getScore() { + return getEntity().getScore(); + } + + public void setScore(int score) { + getEntity().setScore(score); + } + + public int getTotalExperience() { + return getEntity().totalExperience; + } + + public void setTotalExperience(int experience) { + getEntity().totalExperience = experience; + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/BlockCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/BlockCommandEvent.java new file mode 100644 index 000000000..b54933766 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/BlockCommandEvent.java @@ -0,0 +1,11 @@ +package net.pitan76.mcpitanlib.api.event; + +import net.minecraft.block.Block; +import net.minecraft.command.argument.BlockStateArgumentType; +import net.pitan76.mcpitanlib.api.command.argument.BlockCommand; + +public class BlockCommandEvent extends RequiredCommandEvent { + public Block getValue() { + return BlockStateArgumentType.getBlockState(context, ((BlockCommand) getCommand()).getArgumentName()).getBlockState().getBlock(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/BooleanCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/BooleanCommandEvent.java new file mode 100644 index 000000000..e465945ee --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/BooleanCommandEvent.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.event; + +import com.mojang.brigadier.arguments.BoolArgumentType; +import net.pitan76.mcpitanlib.api.command.argument.BooleanCommand; + +public class BooleanCommandEvent extends RequiredCommandEvent { + public Boolean getValue() { + return BoolArgumentType.getBool(context, ((BooleanCommand) getCommand()).getArgumentName()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/LongCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/LongCommandEvent.java new file mode 100644 index 000000000..744678f01 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/LongCommandEvent.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.event; + +import com.mojang.brigadier.arguments.LongArgumentType; +import net.pitan76.mcpitanlib.api.command.argument.LongCommand; + +public class LongCommandEvent extends RequiredCommandEvent { + public Long getValue() { + return LongArgumentType.getLong(context, ((LongCommand) getCommand()).getArgumentName()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java index 23aa41090..98366531f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java @@ -10,6 +10,8 @@ import net.minecraft.text.Text; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; public class ServerCommandEvent extends CommandEvent { @@ -64,4 +66,20 @@ public void sendSuccess(Text message, boolean broadcastToOps) { public void sendFailure(Text message) { context.getSource().sendError(message); } + + public void sendSuccess(Text message) { + sendSuccess(message, false); + } + + public void sendSuccess(String message, boolean broadcastToOps) { + sendSuccess(TextUtil.literal(message), broadcastToOps); + } + + public void sendSuccess(String message) { + sendSuccess(TextUtil.literal(message)); + } + + public boolean isClient() { + return WorldUtil.isClient(getWorld()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTypeBytes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTypeBytes.java new file mode 100644 index 000000000..6f5a9757f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/nbt/NbtTypeBytes.java @@ -0,0 +1,20 @@ +package net.pitan76.mcpitanlib.api.nbt; + +import net.minecraft.nbt.NbtElement; + +public class NbtTypeBytes { + public static final byte END = NbtElement.END_TYPE; + public static final byte BYTE = NbtElement.BYTE_TYPE; + public static final byte SHORT = NbtElement.SHORT_TYPE; + public static final byte INT = NbtElement.INT_TYPE; + public static final byte LONG = NbtElement.LONG_TYPE; + public static final byte FLOAT = NbtElement.FLOAT_TYPE; + public static final byte DOUBLE = NbtElement.DOUBLE_TYPE; + public static final byte BYTE_ARRAY = NbtElement.BYTE_ARRAY_TYPE; + public static final byte STRING = NbtElement.STRING_TYPE; + public static final byte LIST = NbtElement.LIST_TYPE; + public static final byte COMPOUND = NbtElement.COMPOUND_TYPE; + public static final byte INT_ARRAY = NbtElement.INT_ARRAY_TYPE; + public static final byte LONG_ARRAY = NbtElement.LONG_ARRAY_TYPE; + public static final byte NUMBER = NbtElement.NUMBER_TYPE; +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index 59f5383f4..8b798698d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -4,7 +4,9 @@ import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.component.ComponentType; +import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; +import net.minecraft.entity.effect.StatusEffect; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; @@ -128,6 +130,14 @@ public RegistryResult> registerParticleType(Identifier id, Suppl return new RegistryResult<>(mcplr.registryParticleType(id, supplier)); } + public RegistryResult registerEnchantment(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr.registryEnchantment(id, supplier)); + } + + public RegistryResult registerStatusEffect(Identifier id, Supplier supplier) { + return new RegistryResult<>(mcplr.registryStatusEffect(id, supplier)); + } + public RegistryResult registerItemGroup(Identifier id, Supplier supplier) { return new RegistryResult<>(mcplr1_20.registryItemGroup(id, supplier)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 56928c0e6..5e279691d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -2,7 +2,9 @@ import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; +import net.minecraft.entity.effect.StatusEffect; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; @@ -10,6 +12,8 @@ import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.enchantment.CompatEnchantment; +import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; @@ -109,6 +113,14 @@ public RegistryResult> registerParticleType(CompatIdentifier id, return cr1.registerParticleType(id.toMinecraft(), supplier); } + public RegistryResult registerEnchantment(CompatIdentifier id, Supplier supplier) { + return cr1.registerEnchantment(id.toMinecraft(), () -> supplier.get().getEnchantment(null)); + } + + public RegistryResult registryStatusEffect(CompatIdentifier id, Supplier supplier) { + return cr1.registerStatusEffect(id.toMinecraft(), () -> supplier.get().getStatusEffect(null)); + } + public RegistryResult registerItemGroup(CompatIdentifier id, Supplier supplier) { return cr1.registerItemGroup(id.toMinecraft(), supplier); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatBlockSoundGroup.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatBlockSoundGroup.java new file mode 100644 index 000000000..671dedf9e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatBlockSoundGroup.java @@ -0,0 +1,221 @@ +package net.pitan76.mcpitanlib.api.sound; + +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.sound.SoundEvent; + +public class CompatBlockSoundGroup { + public static final CompatBlockSoundGroup INTENTIONALLY_EMPTY = of(BlockSoundGroup.INTENTIONALLY_EMPTY); + public static final CompatBlockSoundGroup WOOD = of(BlockSoundGroup.WOOD); + public static final CompatBlockSoundGroup GRAVEL = of(BlockSoundGroup.GRAVEL); + public static final CompatBlockSoundGroup GRASS = of(BlockSoundGroup.GRASS); + public static final CompatBlockSoundGroup LILY_PAD = of(BlockSoundGroup.LILY_PAD); + public static final CompatBlockSoundGroup STONE = of(BlockSoundGroup.STONE); + public static final CompatBlockSoundGroup METAL = of(BlockSoundGroup.METAL); + public static final CompatBlockSoundGroup GLASS = of(BlockSoundGroup.GLASS); + public static final CompatBlockSoundGroup WOOL = of(BlockSoundGroup.WOOL); + public static final CompatBlockSoundGroup SAND = of(BlockSoundGroup.SAND); + public static final CompatBlockSoundGroup SNOW = of(BlockSoundGroup.SNOW); + public static final CompatBlockSoundGroup POWDER_SNOW = of(BlockSoundGroup.POWDER_SNOW); + public static final CompatBlockSoundGroup LADDER = of(BlockSoundGroup.LADDER); + public static final CompatBlockSoundGroup ANVIL = of(BlockSoundGroup.ANVIL); + public static final CompatBlockSoundGroup SLIME = of(BlockSoundGroup.SLIME); + public static final CompatBlockSoundGroup HONEY = of(BlockSoundGroup.HONEY); + public static final CompatBlockSoundGroup WET_GRASS = of(BlockSoundGroup.WET_GRASS); + public static final CompatBlockSoundGroup CORAL = of(BlockSoundGroup.CORAL); + public static final CompatBlockSoundGroup BAMBOO = of(BlockSoundGroup.BAMBOO); + public static final CompatBlockSoundGroup BAMBOO_SAPLING = of(BlockSoundGroup.BAMBOO_SAPLING); + public static final CompatBlockSoundGroup SCAFFOLDING = of(BlockSoundGroup.SCAFFOLDING); + public static final CompatBlockSoundGroup SWEET_BERRY_BUSH = of(BlockSoundGroup.SWEET_BERRY_BUSH); + public static final CompatBlockSoundGroup CROP = of(BlockSoundGroup.CROP); + public static final CompatBlockSoundGroup STEM = of(BlockSoundGroup.STEM); + public static final CompatBlockSoundGroup VINE = of(BlockSoundGroup.VINE); + public static final CompatBlockSoundGroup NETHER_WART = of(BlockSoundGroup.NETHER_WART); + public static final CompatBlockSoundGroup LANTERN = of(BlockSoundGroup.LANTERN); + public static final CompatBlockSoundGroup NETHER_STEM = of(BlockSoundGroup.NETHER_STEM); + public static final CompatBlockSoundGroup NYLIUM = of(BlockSoundGroup.NYLIUM); + public static final CompatBlockSoundGroup FUNGUS = of(BlockSoundGroup.FUNGUS); + public static final CompatBlockSoundGroup ROOTS = of(BlockSoundGroup.ROOTS); + public static final CompatBlockSoundGroup SHROOMLIGHT = of(BlockSoundGroup.SHROOMLIGHT); + public static final CompatBlockSoundGroup WEEPING_VINES = of(BlockSoundGroup.WEEPING_VINES); + public static final CompatBlockSoundGroup WEEPING_VINES_LOW_PITCH = of(BlockSoundGroup.WEEPING_VINES_LOW_PITCH); + public static final CompatBlockSoundGroup SOUL_SAND = of(BlockSoundGroup.SOUL_SAND); + public static final CompatBlockSoundGroup SOUL_SOIL = of(BlockSoundGroup.SOUL_SOIL); + public static final CompatBlockSoundGroup BASALT = of(BlockSoundGroup.BASALT); + public static final CompatBlockSoundGroup WART_BLOCK = of(BlockSoundGroup.WART_BLOCK); + public static final CompatBlockSoundGroup NETHERRACK = of(BlockSoundGroup.NETHERRACK); + public static final CompatBlockSoundGroup NETHER_BRICKS = of(BlockSoundGroup.NETHER_BRICKS); + public static final CompatBlockSoundGroup NETHER_SPROUTS = of(BlockSoundGroup.NETHER_SPROUTS); + public static final CompatBlockSoundGroup NETHER_ORE = of(BlockSoundGroup.NETHER_ORE); + public static final CompatBlockSoundGroup BONE = of(BlockSoundGroup.BONE); + public static final CompatBlockSoundGroup NETHERITE = of(BlockSoundGroup.NETHERITE); + public static final CompatBlockSoundGroup ANCIENT_DEBRIS = of(BlockSoundGroup.ANCIENT_DEBRIS); + public static final CompatBlockSoundGroup LODESTONE = of(BlockSoundGroup.LODESTONE); + public static final CompatBlockSoundGroup CHAIN = of(BlockSoundGroup.CHAIN); + public static final CompatBlockSoundGroup NETHER_GOLD_ORE = of(BlockSoundGroup.NETHER_GOLD_ORE); + public static final CompatBlockSoundGroup GILDED_BLACKSTONE = of(BlockSoundGroup.GILDED_BLACKSTONE); + public static final CompatBlockSoundGroup CANDLE = of(BlockSoundGroup.CANDLE); + public static final CompatBlockSoundGroup AMETHYST_BLOCK = of(BlockSoundGroup.AMETHYST_BLOCK); + public static final CompatBlockSoundGroup AMETHYST_CLUSTER = of(BlockSoundGroup.AMETHYST_CLUSTER); + public static final CompatBlockSoundGroup SMALL_AMETHYST_BUD = of(BlockSoundGroup.SMALL_AMETHYST_BUD); + public static final CompatBlockSoundGroup MEDIUM_AMETHYST_BUD = of(BlockSoundGroup.MEDIUM_AMETHYST_BUD); + public static final CompatBlockSoundGroup LARGE_AMETHYST_BUD = of(BlockSoundGroup.LARGE_AMETHYST_BUD); + public static final CompatBlockSoundGroup TUFF = of(BlockSoundGroup.TUFF); + public static final CompatBlockSoundGroup TUFF_BRICKS = of(BlockSoundGroup.TUFF_BRICKS); + public static final CompatBlockSoundGroup POLISHED_TUFF = of(BlockSoundGroup.POLISHED_TUFF); + public static final CompatBlockSoundGroup CALCITE = of(BlockSoundGroup.CALCITE); + public static final CompatBlockSoundGroup DRIPSTONE_BLOCK = of(BlockSoundGroup.DRIPSTONE_BLOCK); + public static final CompatBlockSoundGroup POINTED_DRIPSTONE = of(BlockSoundGroup.POINTED_DRIPSTONE); + public static final CompatBlockSoundGroup COPPER = of(BlockSoundGroup.COPPER); + public static final CompatBlockSoundGroup COPPER_BULB = of(BlockSoundGroup.COPPER_BULB); + public static final CompatBlockSoundGroup COPPER_GRATE = of(BlockSoundGroup.COPPER_GRATE); + public static final CompatBlockSoundGroup CAVE_VINES = of(BlockSoundGroup.CAVE_VINES); + public static final CompatBlockSoundGroup SPORE_BLOSSOM = of(BlockSoundGroup.SPORE_BLOSSOM); + public static final CompatBlockSoundGroup AZALEA = of(BlockSoundGroup.AZALEA); + public static final CompatBlockSoundGroup FLOWERING_AZALEA = of(BlockSoundGroup.FLOWERING_AZALEA); + public static final CompatBlockSoundGroup MOSS_CARPET = of(BlockSoundGroup.MOSS_CARPET); + public static final CompatBlockSoundGroup PINK_PETALS = of(BlockSoundGroup.PINK_PETALS); + public static final CompatBlockSoundGroup MOSS_BLOCK = of(BlockSoundGroup.MOSS_BLOCK); + public static final CompatBlockSoundGroup BIG_DRIPLEAF = of(BlockSoundGroup.BIG_DRIPLEAF); + public static final CompatBlockSoundGroup SMALL_DRIPLEAF = of(BlockSoundGroup.SMALL_DRIPLEAF); + public static final CompatBlockSoundGroup ROOTED_DIRT = of(BlockSoundGroup.ROOTED_DIRT); + public static final CompatBlockSoundGroup HANGING_ROOTS = of(BlockSoundGroup.HANGING_ROOTS); + public static final CompatBlockSoundGroup AZALEA_LEAVES = of(BlockSoundGroup.AZALEA_LEAVES); + public static final CompatBlockSoundGroup SCULK_SENSOR = of(BlockSoundGroup.SCULK_SENSOR); + public static final CompatBlockSoundGroup SCULK_CATALYST = of(BlockSoundGroup.SCULK_CATALYST); + public static final CompatBlockSoundGroup SCULK = of(BlockSoundGroup.SCULK); + public static final CompatBlockSoundGroup SCULK_VEIN = of(BlockSoundGroup.SCULK_VEIN); + public static final CompatBlockSoundGroup SCULK_SHRIEKER = of(BlockSoundGroup.SCULK_SHRIEKER); + public static final CompatBlockSoundGroup GLOW_LICHEN = of(BlockSoundGroup.GLOW_LICHEN); + public static final CompatBlockSoundGroup DEEPSLATE = of(BlockSoundGroup.DEEPSLATE); + public static final CompatBlockSoundGroup DEEPSLATE_BRICKS = of(BlockSoundGroup.DEEPSLATE_BRICKS); + public static final CompatBlockSoundGroup DEEPSLATE_TILES = of(BlockSoundGroup.DEEPSLATE_TILES); + public static final CompatBlockSoundGroup POLISHED_DEEPSLATE = of(BlockSoundGroup.POLISHED_DEEPSLATE); + public static final CompatBlockSoundGroup FROGLIGHT = of(BlockSoundGroup.FROGLIGHT); + public static final CompatBlockSoundGroup FROGSPAWN = of(BlockSoundGroup.FROGSPAWN); + public static final CompatBlockSoundGroup MANGROVE_ROOTS = of(BlockSoundGroup.MANGROVE_ROOTS); + public static final CompatBlockSoundGroup MUDDY_MANGROVE_ROOTS = of(BlockSoundGroup.MUDDY_MANGROVE_ROOTS); + public static final CompatBlockSoundGroup MUD = of(BlockSoundGroup.MUD); + public static final CompatBlockSoundGroup MUD_BRICKS = of(BlockSoundGroup.MUD_BRICKS); + public static final CompatBlockSoundGroup PACKED_MUD = of(BlockSoundGroup.PACKED_MUD); + public static final CompatBlockSoundGroup HANGING_SIGN = of(BlockSoundGroup.HANGING_SIGN); + public static final CompatBlockSoundGroup NETHER_WOOD_HANGING_SIGN = of(BlockSoundGroup.NETHER_WOOD_HANGING_SIGN); + public static final CompatBlockSoundGroup BAMBOO_WOOD_HANGING_SIGN = of(BlockSoundGroup.BAMBOO_WOOD_HANGING_SIGN); + public static final CompatBlockSoundGroup BAMBOO_WOOD = of(BlockSoundGroup.BAMBOO_WOOD); + public static final CompatBlockSoundGroup NETHER_WOOD = of(BlockSoundGroup.NETHER_WOOD); + public static final CompatBlockSoundGroup CHERRY_WOOD = of(BlockSoundGroup.CHERRY_WOOD); + public static final CompatBlockSoundGroup CHERRY_SAPLING = of(BlockSoundGroup.CHERRY_SAPLING); + public static final CompatBlockSoundGroup CHERRY_LEAVES = of(BlockSoundGroup.CHERRY_LEAVES); + public static final CompatBlockSoundGroup CHERRY_WOOD_HANGING_SIGN = of(BlockSoundGroup.CHERRY_WOOD_HANGING_SIGN); + public static final CompatBlockSoundGroup CHISELED_BOOKSHELF = of(BlockSoundGroup.CHISELED_BOOKSHELF); + public static final CompatBlockSoundGroup SUSPICIOUS_SAND = of(BlockSoundGroup.SUSPICIOUS_SAND); + public static final CompatBlockSoundGroup SUSPICIOUS_GRAVEL = of(BlockSoundGroup.SUSPICIOUS_GRAVEL); + public static final CompatBlockSoundGroup DECORATED_POT = of(BlockSoundGroup.DECORATED_POT); + public static final CompatBlockSoundGroup DECORATED_POT_SHATTER = of(BlockSoundGroup.DECORATED_POT_SHATTER); + public static final CompatBlockSoundGroup TRIAL_SPAWNER = of(BlockSoundGroup.TRIAL_SPAWNER); + public static final CompatBlockSoundGroup SPONGE = of(BlockSoundGroup.SPONGE); + public static final CompatBlockSoundGroup WET_SPONGE = of(BlockSoundGroup.WET_SPONGE); + public static final CompatBlockSoundGroup VAULT = of(BlockSoundGroup.VAULT); + public static final CompatBlockSoundGroup HEAVY_CORE = of(BlockSoundGroup.HEAVY_CORE); + public static final CompatBlockSoundGroup COBWEB = of(BlockSoundGroup.COBWEB); + + public BlockSoundGroup blockSoundGroup; + + private final float volume; + private final float pitch; + private final SoundEvent breakSound; + private final SoundEvent stepSound; + private final SoundEvent placeSound; + private final SoundEvent hitSound; + private final SoundEvent fallSound; + + public CompatBlockSoundGroup(BlockSoundGroup blockSoundGroup) { + this.blockSoundGroup = blockSoundGroup; + + this.volume = blockSoundGroup.getVolume(); + this.pitch = blockSoundGroup.getPitch(); + this.breakSound = blockSoundGroup.getBreakSound(); + this.stepSound = blockSoundGroup.getStepSound(); + this.placeSound = blockSoundGroup.getPlaceSound(); + this.hitSound = blockSoundGroup.getHitSound(); + this.fallSound = blockSoundGroup.getFallSound(); + } + + public CompatBlockSoundGroup(float volume, float pitch, SoundEvent breakSound, SoundEvent stepSound, SoundEvent placeSound, SoundEvent hitSound, SoundEvent fallSound) { + this.blockSoundGroup = new BlockSoundGroup(volume, pitch, breakSound, stepSound, placeSound, hitSound, fallSound); + + this.volume = volume; + this.pitch = pitch; + this.breakSound = breakSound; + this.stepSound = stepSound; + this.placeSound = placeSound; + this.hitSound = hitSound; + this.fallSound = fallSound; + } + + public BlockSoundGroup get() { + if (blockSoundGroup == null) { + return new BlockSoundGroup(volume, pitch, breakSound, stepSound, placeSound, hitSound, fallSound); + } + return blockSoundGroup; + } + + public static CompatBlockSoundGroup of(BlockSoundGroup blockSoundGroup) { + return new CompatBlockSoundGroup(blockSoundGroup); + } + + public static CompatBlockSoundGroup of(float volume, float pitch, SoundEvent breakSound, SoundEvent stepSound, SoundEvent placeSound, SoundEvent hitSound, SoundEvent fallSound) { + return new CompatBlockSoundGroup(volume, pitch, breakSound, stepSound, placeSound, hitSound, fallSound); + } + + public static CompatBlockSoundGroup of(float volume, float pitch, CompatSoundEvent breakSound, CompatSoundEvent stepSound, CompatSoundEvent placeSound, CompatSoundEvent hitSound, CompatSoundEvent fallSound) { + return new CompatBlockSoundGroup(volume, pitch, breakSound.get(), stepSound.get(), placeSound.get(), hitSound.get(), fallSound.get()); + } + + public float getVolume() { + return volume; + } + + public float getPitch() { + return pitch; + } + + public SoundEvent getRawBreakSound() { + return breakSound; + } + + public SoundEvent getRawStepSound() { + return stepSound; + } + + public SoundEvent getRawPlaceSound() { + return placeSound; + } + + public SoundEvent getRawHitSound() { + return hitSound; + } + + public SoundEvent getRawFallSound() { + return fallSound; + } + + public CompatSoundEvent getBreakSound() { + return CompatSoundEvent.of(breakSound); + } + + public CompatSoundEvent getStepSound() { + return CompatSoundEvent.of(stepSound); + } + + public CompatSoundEvent getPlaceSound() { + return CompatSoundEvent.of(placeSound); + } + + public CompatSoundEvent getHitSound() { + return CompatSoundEvent.of(hitSound); + } + + public CompatSoundEvent getFallSound() { + return CompatSoundEvent.of(fallSound); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java new file mode 100644 index 000000000..30ef31a72 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java @@ -0,0 +1,84 @@ +package net.pitan76.mcpitanlib.api.util; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.CommandManager; +import net.minecraft.server.command.ServerCommandSource; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.core.command.CommandResult; + +public class CommandManagerUtil { + public static CommandManager getCommandManager(MinecraftServer server) { + return server.getCommandManager(); + } + + public static CommandResult execute(MinecraftServer server, String command) { + CommandDispatcher dispatcher = getCommandManager(server).getDispatcher(); + ServerCommandSource source = server.getCommandSource(); + + if (command.startsWith("/")) { + command = command.substring(1); + } + + CommandResult cr = new CommandResult(); + cr.setSuccess(false); + cr.setSource(source); + + try { + int result = dispatcher.execute(command, source); + cr.setResult(result); + cr.setSuccess(true); + } catch (CommandSyntaxException e) { + cr.setMessage(e.getMessage()); + cr.setErrorType(CommandResult.ErrorType.COMMAND_SYNTAX_ERROR); + } catch (RuntimeException e) { + cr.setMessage(e.getMessage()); + cr.setErrorType(CommandResult.ErrorType.RUNTIME_ERROR); + } + + return cr; + } + + public static CommandResult execute(ServerCommandSource source, String command) { + CommandDispatcher dispatcher = source.getServer().getCommandManager().getDispatcher(); + + if (command.startsWith("/")) { + command = command.substring(1); + } + + CommandResult cr = new CommandResult(); + cr.setSuccess(false); + cr.setSource(source); + + try { + int result = dispatcher.execute(command, source); + cr.setResult(result); + cr.setSuccess(true); + } catch (CommandSyntaxException e) { + cr.setMessage(e.getMessage()); + cr.setErrorType(CommandResult.ErrorType.COMMAND_SYNTAX_ERROR); + } catch (RuntimeException e) { + cr.setMessage(e.getMessage()); + cr.setErrorType(CommandResult.ErrorType.RUNTIME_ERROR); + } + + return cr; + } + + public static CommandResult execute(Player player, String command) { + return execute(getCommandSource(player), command); + } + + public static ServerCommandSource getCommandSource(MinecraftServer server) { + return server.getCommandSource(); + } + + public static ServerCommandSource getCommandSource(Player player) { + return player.getEntity().getCommandSource(); + } + + public static ServerCommandSource withLevel(ServerCommandSource source, int level) { + return source.withLevel(level); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandUtil.java new file mode 100644 index 000000000..8ba934d53 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandUtil.java @@ -0,0 +1,53 @@ +package net.pitan76.mcpitanlib.api.util; + +import com.mojang.brigadier.arguments.*; +import com.mojang.brigadier.exceptions.CommandSyntaxException; +import net.minecraft.block.Block; +import net.minecraft.command.argument.BlockStateArgumentType; +import net.minecraft.command.argument.EntityArgumentType; +import net.minecraft.command.argument.ItemStackArgumentType; +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.event.ServerCommandEvent; + +public class CommandUtil { + public static Item getItemArgument(String name, ServerCommandEvent e) { + return ItemStackArgumentType.getItemStackArgument(e.getContext(), name).getItem(); + } + + public static Block getBlockArgument(String name, ServerCommandEvent e) { + return BlockStateArgumentType.getBlockState(e.getContext(), name).getBlockState().getBlock(); + } + + public static Integer getIntegerArgument(String name, ServerCommandEvent e) { + return IntegerArgumentType.getInteger(e.getContext(), name); + } + + public static Double getDoubleArgument(String name, ServerCommandEvent e) { + return DoubleArgumentType.getDouble(e.getContext(), name); + } + + public static Float getFloatArgument(String name, ServerCommandEvent e) { + return FloatArgumentType.getFloat(e.getContext(), name); + } + + public static Long getLongArgument(String name, ServerCommandEvent e) { + return LongArgumentType.getLong(e.getContext(), name); + } + + public static Boolean getBooleanArgument(String name, ServerCommandEvent e) { + return BoolArgumentType.getBool(e.getContext(), name); + } + + public static String getStringArgument(String name, ServerCommandEvent e) { + return StringArgumentType.getString(e.getContext(), name); + } + + public static Entity getEntityArgument(String name, ServerCommandEvent e) { + try { + return EntityArgumentType.getEntity(e.getContext(), name); + } catch (CommandSyntaxException ex) { + return null; + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java index 9d0ebc80a..a1a46fe28 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java @@ -221,6 +221,14 @@ public static List getItems(Identifier identifier, List items) { return ItemUtilV2.getItems(identifier, items); } + public static List getItems(CompatIdentifier identifier) { + return getItems(identifier.toMinecraft()); + } + + public static List getItems(CompatIdentifier identifier, List items) { + return getItems(identifier.toMinecraft(), items); + } + /** * Get all items in the tag. * @param id String of the tag. @@ -250,6 +258,10 @@ public static boolean isItemInTag(Item item, Identifier identifier) { return ItemUtilV2.isItemInTag(item, identifier); } + public static boolean isItemInTag(Item item, CompatIdentifier identifier) { + return isItemInTag(item, identifier.toMinecraft()); + } + /** * Check if the item is in the tag. * @param item Item to check. diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java index 728eeab5b..00967c3cb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/Logger.java @@ -48,6 +48,11 @@ public void debug(String message) { LoggerUtil.debug(logger, message); } + public void infoIfDev(String message) { + if (!PlatformUtil.isDevelopmentEnvironment()) return; + LoggerUtil.debug(logger, message); + } + public void trace(String message) { LoggerUtil.trace(logger, message); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index 9844cb8f5..065cb3659 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -106,7 +106,7 @@ public static T get(NbtCompound nbt, String key, Class clazz) { return (T) nbt.getCompound(key); } if (clazz == NbtList.class) { - return (T) nbt.getList(key, 9); + return (T) nbt.get(key); } if (clazz == Byte.class) { return (T) Byte.valueOf(nbt.getByte(key)); @@ -187,7 +187,23 @@ public static Set getKeys(NbtCompound nbt) { * @return NbtList */ public static NbtList getList(NbtCompound nbt, String key) { - return nbt.getList(key, 9); + return (NbtList) nbt.get(key); + } + + /** + * NbtListを取得する。 + * @return NbtList + */ + public static NbtList getList(NbtCompound nbt, String key, int type) { + return nbt.getList(key, type); + } + + /** + * NbtCompoundのリストを取得する。 + * @return NbtList + */ + public static NbtList getNbtCompoundList(NbtCompound nbt, String key) { + return nbt.getList(key, NbtElement.COMPOUND_TYPE); } /** @@ -397,4 +413,58 @@ public static Optional getSimpleItemStack(NbtCompound nbt, String key public static NbtList createNbtList() { return new NbtList(); } + + public static int getIntOrDefault(NbtCompound nbt, String key, int defaultValue) { + if (has(nbt, key)) + return getInt(nbt, key); + return defaultValue; + } + + public static String getStringOrDefault(NbtCompound nbt, String key, String defaultValue) { + if (has(nbt, key)) + return getString(nbt, key); + return defaultValue; + } + + public static boolean getBooleanOrDefault(NbtCompound nbt, String key, boolean defaultValue) { + if (has(nbt, key)) + return getBoolean(nbt, key); + return defaultValue; + } + + public static float getFloatOrDefault(NbtCompound nbt, String key, float defaultValue) { + if (has(nbt, key)) + return getFloat(nbt, key); + return defaultValue; + } + + public static double getDoubleOrDefault(NbtCompound nbt, String key, double defaultValue) { + if (has(nbt, key)) + return getDouble(nbt, key); + return defaultValue; + } + + public static long getLongOrDefault(NbtCompound nbt, String key, long defaultValue) { + if (has(nbt, key)) + return getLong(nbt, key); + return defaultValue; + } + + public static byte getByteOrDefault(NbtCompound nbt, String key, byte defaultValue) { + if (has(nbt, key)) + return getByte(nbt, key); + return defaultValue; + } + + public static short getShortOrDefault(NbtCompound nbt, String key, short defaultValue) { + if (has(nbt, key)) + return getShort(nbt, key); + return defaultValue; + } + + public static UUID getUuidOrDefault(NbtCompound nbt, String key, UUID defaultValue) { + if (has(nbt, key)) + return getUuid(nbt, key); + return defaultValue; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/command/CommandResult.java b/common/src/main/java/net/pitan76/mcpitanlib/core/command/CommandResult.java new file mode 100644 index 000000000..c93a48bcd --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/command/CommandResult.java @@ -0,0 +1,73 @@ +package net.pitan76.mcpitanlib.core.command; + +import net.minecraft.server.command.ServerCommandSource; + +public class CommandResult { + private boolean isSuccess = false; + private String message = ""; + private int result = 0; + private ErrorType errorType = ErrorType.NONE; + private ServerCommandSource source; + + public CommandResult() { + + } + + public CommandResult(boolean isSuccess, String message) { + this.isSuccess = isSuccess; + this.message = message; + } + + public void setResult(int result) { + this.result = result; + } + + public void setMessage(String message) { + this.message = message; + } + + public void setSuccess(boolean success) { + isSuccess = success; + } + + public boolean isSuccess() { + return isSuccess; + } + + public String getMessage() { + return message; + } + + public int getResult() { + return result; + } + + public void setErrorType(ErrorType errorType) { + this.errorType = errorType; + } + + public ErrorType getErrorType() { + return errorType; + } + + public void setSource(ServerCommandSource source) { + this.source = source; + } + + public ServerCommandSource getSource() { + return source; + } + + public boolean hasError() { + return errorType != ErrorType.NONE; + } + + public enum ErrorType { + NONE, + COMMAND_SYNTAX_ERROR, + COMMAND_NOT_FOUND, + COMMAND_PERMISSION_ERROR, + COMMAND_UNKNOWN_ERROR, + RUNTIME_ERROR + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java index dd0bf7cb5..f9dc92e7c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java @@ -6,7 +6,9 @@ import dev.architectury.registry.registries.RegistrySupplier; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; +import net.minecraft.entity.effect.StatusEffect; import net.minecraft.fluid.Fluid; import net.minecraft.item.Item; import net.minecraft.particle.ParticleType; @@ -30,6 +32,8 @@ public class MCPLRegistry { public Registrar SOUND_EVENT; public Registrar FLUID; public Registrar> PARTICLE_TYPE; + public Registrar ENCHANTMENT; + public Registrar STATUS_EFFECT; public MCPLRegistry(String MOD_ID) { REGISTRIES = Suppliers.memoize(() -> RegistrarManager.get(MOD_ID)); @@ -42,6 +46,8 @@ public MCPLRegistry(String MOD_ID) { SOUND_EVENT = REGISTRIES.get().get(RegistryKeys.SOUND_EVENT); FLUID = REGISTRIES.get().get(RegistryKeys.FLUID); PARTICLE_TYPE = REGISTRIES.get().get(RegistryKeys.PARTICLE_TYPE); + ENCHANTMENT = REGISTRIES.get().get(RegistryKeys.ENCHANTMENT); + STATUS_EFFECT = REGISTRIES.get().get(RegistryKeys.STATUS_EFFECT); } public RegistrySupplier registryItem(Identifier id, Supplier supplier) { @@ -76,6 +82,14 @@ public RegistrySupplier> registryParticleType(Identifier id, Sup return PARTICLE_TYPE.register(id, supplier); } + public RegistrySupplier registryEnchantment(Identifier id, Supplier supplier) { + return ENCHANTMENT.register(id, supplier); + } + + public RegistrySupplier registryStatusEffect(Identifier id, Supplier supplier) { + return STATUS_EFFECT.register(id, supplier); + } + public void allRegister1_16() { } diff --git a/info.properties b/info.properties index 834e58920..f66fb9aaf 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.3 +mod_version=2.4.4 maven_group=net.pitan76 \ No newline at end of file From aa4671872eedf79e39675c2456f557334770cfde Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:17:48 +0900 Subject: [PATCH 389/622] add APIs --- .../mcpitanlib/api/block/ExtendBlock.java | 40 +++++++ .../api/client/SimpleHandledScreen.java | 6 +- .../entity/CompatBlockEntityRenderer.java | 17 +++ .../entity/event/BlockEntityRenderEvent.java | 85 ++++++++++++++ .../pitan76/mcpitanlib/api/entity/Player.java | 24 ++++ .../api/event/block/FluidStateArgs.java | 15 +++ .../api/event/block/ShapesForStatesArgs.java | 22 ++++ .../block/StateForNeighborUpdateArgs.java | 61 ++++++++++ .../mcpitanlib/api/util/BlockEntityUtil.java | 5 + .../mcpitanlib/api/util/BlockStateUtil.java | 20 ++++ .../mcpitanlib/api/util/EntityUtil.java | 109 ++++++++++++++++++ .../mcpitanlib/api/util/FluidUtil.java | 78 +++++++++++++ .../api/util/PlayerManagerUtil.java | 45 ++++++++ .../mcpitanlib/api/util/PropertyUtil.java | 4 + .../mcpitanlib/api/util/ServerUtil.java | 5 + .../mcpitanlib/api/util/StateManagerUtil.java | 5 + .../api/util/client/MatrixStackUtil.java | 16 +++ .../api/util/entity/LivingEntityUtil.java | 35 ++++++ .../mcpitanlib/api/util/math/PosUtil.java | 8 ++ .../api/util/world/WorldAccessUtil.java | 17 +++ .../api/util/world/WorldViewUtil.java | 70 +++++++++++ info.properties | 2 +- 22 files changed, 687 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ShapesForStatesArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 95ee0d3fa..56795ff2a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.block; +import com.google.common.collect.ImmutableMap; import com.mojang.serialization.MapCodec; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -8,6 +9,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.FluidState; import net.minecraft.item.Item; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; @@ -22,20 +24,24 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; +import net.pitan76.mcpitanlib.api.event.block.StateForNeighborUpdateArgs; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.util.TextUtil; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; import org.jetbrains.annotations.Nullable; import java.util.List; +import java.util.function.Function; public class ExtendBlock extends Block { public CompatibleBlockSettings compatSettings; @@ -330,4 +336,38 @@ protected MapCodec getCodec() { public CompatMapCodec getCompatCodec() { return CompatMapCodec.of(super.getCodec()); } + + @Deprecated + @Override + protected FluidState getFluidState(BlockState state) { + return getFluidState(new FluidStateArgs(state)); + } + + public FluidState getFluidState(FluidStateArgs args) { + return super.getFluidState(args.getState()); + } + + @Deprecated + @Override + protected BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos)); + } + + public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { + return super.getStateForNeighborUpdate(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos); + } + + @Deprecated + @Override + protected ImmutableMap getShapesForStates(Function stateToShape) { + return getShapesForStates(new ShapesForStatesArgs(stateToShape)); + } + + public ImmutableMap getShapesForStates(ShapesForStatesArgs args) { + return super.getShapesForStates(args.stateToShape); + } + + public StateManager callGetStateManager() { + return super.getStateManager(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 60fe1601a..90eb1e0e3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -18,6 +18,7 @@ import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; public abstract class SimpleHandledScreen extends HandledScreen { @@ -263,7 +264,10 @@ public void setTitlePos(int x, int y) { } public void setTitleXCenter() { - setTitleX(width / 2 - textRenderer.getWidth(title) / 2); + if (textRenderer == null) + textRenderer = ClientUtil.getTextRenderer(); + + setTitleX(backgroundWidth / 2 - textRenderer.getWidth(title) / 2); } public int getTitleX() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java new file mode 100644 index 000000000..ac24bdd4e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.client.render.block.entity; + +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.pitan76.mcpitanlib.api.client.render.block.entity.event.BlockEntityRenderEvent; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; + +public interface CompatBlockEntityRenderer extends BlockEntityRenderer { + void render(BlockEntityRenderEvent event); + + @Override + default void render(T entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + render(new BlockEntityRenderEvent<>(entity, tickDelta, matrices, vertexConsumers, light, overlay)); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java new file mode 100644 index 000000000..5d7536490 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java @@ -0,0 +1,85 @@ +package net.pitan76.mcpitanlib.api.client.render.block.entity.event; + +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.client.util.math.MatrixStack; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; +import net.pitan76.mcpitanlib.api.util.MathUtil; +import net.pitan76.mcpitanlib.api.util.client.ClientUtil; +import net.pitan76.mcpitanlib.api.util.client.MatrixStackUtil; + +public class BlockEntityRenderEvent { + public T blockEntity; + public float tickDelta; + public MatrixStack matrices; + public VertexConsumerProvider vertexConsumers; + int light; + int overlay; + + public BlockEntityRenderEvent(T blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + this.blockEntity = blockEntity; + this.tickDelta = tickDelta; + this.matrices = matrices; + this.vertexConsumers = vertexConsumers; + this.light = light; + this.overlay = overlay; + } + + public T getBlockEntity() { + return blockEntity; + } + + public MatrixStack getMatrices() { + return matrices; + } + + public float getTickDelta() { + return tickDelta; + } + + public int getLight() { + return light; + } + + public int getOverlay() { + return overlay; + } + + public VertexConsumer getVertexConsumer(RenderLayer layer) { + return vertexConsumers.getBuffer(layer); + } + + public VertexConsumerProvider getVertexConsumers() { + return vertexConsumers; + } + + public void push() { + MatrixStackUtil.push(matrices); + } + + public void translate(double x, double y, double z) { + MatrixStackUtil.translate(matrices, x, y, z); + } + + public void pop() { + MatrixStackUtil.pop(matrices); + } + + public void multiply(MathUtil.RotationAxisType type, float deg) { + MatrixStackUtil.multiply(matrices, type, deg); + } + + public void scale(float x, float y, float z) { + MatrixStackUtil.scale(matrices, x, y, z); + } + + public ItemRenderer getItemRenderer() { + return ClientUtil.getItemRenderer(); + } + + public boolean isRemoved() { + return blockEntity.isRemoved(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index f708bb6a7..0f49d48f4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -476,4 +476,28 @@ public int getTotalExperience() { public void setTotalExperience(int experience) { getEntity().totalExperience = experience; } + + public boolean isFallFlying() { + return getEntity().isFallFlying(); + } + + public boolean isSwimming() { + return getEntity().isSwimming(); + } + + public void startFallFlying() { + getEntity().startFallFlying(); + } + + public void stopFallFlying() { + getEntity().stopFallFlying(); + } + + public int getFallFlyingTicks() { + return getEntity().getFallFlyingTicks(); + } + + public boolean checkFallFlying() { + return getEntity().checkFallFlying(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java new file mode 100644 index 000000000..12482458a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java @@ -0,0 +1,15 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; + +public class FluidStateArgs { + public BlockState state; + + public FluidStateArgs(BlockState state) { + this.state = state; + } + + public BlockState getState() { + return state; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ShapesForStatesArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ShapesForStatesArgs.java new file mode 100644 index 000000000..75cacef6a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ShapesForStatesArgs.java @@ -0,0 +1,22 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.util.shape.VoxelShape; + +import java.util.function.Function; + +public class ShapesForStatesArgs { + public Function stateToShape; + + public ShapesForStatesArgs(Function stateToShape) { + this.stateToShape = stateToShape; + } + + public Function getStateToShape() { + return stateToShape; + } + + public VoxelShape getShape(BlockState state) { + return stateToShape.apply(state); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java new file mode 100644 index 000000000..b48adc4d9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java @@ -0,0 +1,61 @@ +package net.pitan76.mcpitanlib.api.event.block; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.WorldAccess; + +public class StateForNeighborUpdateArgs { + public BlockState state; + public Direction direction; + public BlockState neighborState; + public WorldAccess world; + public BlockPos pos; + public BlockPos neighborPos; + + public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + this.state = state; + this.direction = direction; + this.neighborState = neighborState; + this.world = world; + this.pos = pos; + this.neighborPos = neighborPos; + } + + public BlockState getState() { + return state; + } + + public BlockEntity getBlockEntity() { + return world.getBlockEntity(pos); + } + + public BlockState getBlockState(BlockPos pos) { + return world.getBlockState(pos); + } + + public BlockEntity getBlockEntity(BlockPos pos) { + return world.getBlockEntity(pos); + } + + public Direction getDirection() { + return direction; + } + + public BlockState getNeighborState() { + return neighborState; + } + + public WorldAccess getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public BlockPos getNeighborPos() { + return neighborPos; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index e2347401b..a00283d4a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -3,6 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.nbt.NbtCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -58,4 +59,8 @@ public static void markRemoved(BlockEntity blockEntity) { public static void markDirty(BlockEntity blockEntity) { blockEntity.markDirty(); } + + public static BlockEntityType getType(BlockEntity blockEntity) { + return blockEntity.getType(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index 53209c900..8d60dbd0c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -2,9 +2,13 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.Property; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; public class BlockStateUtil { public static Block getBlock(BlockState state) { @@ -34,4 +38,20 @@ public static StateManager getStateManager(Block block) { public static , V extends T> BlockState with(BlockState state, Property property, V value) { return state.with(property, value); } + + public static void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean notify) { + state.neighborUpdate(world, pos, block, fromPos, notify); + } + + public static void updateNeighbors(BlockState state, WorldAccess world, BlockPos pos, int flags) { + state.updateNeighbors(world, pos, flags); + } + + public static boolean hasRandomTicks(BlockState state) { + return state.hasRandomTicks(); + } + + public static void randomTick(BlockState state, ServerWorld world, BlockPos pos) { + state.randomTick(world, pos, world.random); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 647f74c2d..2edc19edc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -3,6 +3,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; @@ -38,4 +39,112 @@ public static void discard(Entity entity) { public static void kill(Entity entity) { entity.kill(); } + + public static void setVelocity(Entity entity, double x, double y, double z) { + entity.setVelocity(x, y, z); + } + + public static Vec3d getVelocity(Entity entity) { + return entity.getVelocity(); + } + + public static void setNoGravity(Entity entity, boolean noGravity) { + entity.setNoGravity(noGravity); + } + + public static boolean hasNoGravity(Entity entity) { + return entity.hasNoGravity(); + } + + public static void setInvulnerable(Entity entity, boolean invulnerable) { + entity.setInvulnerable(invulnerable); + } + + public static boolean isInvulnerable(Entity entity) { + return entity.isInvulnerable(); + } + + public static void setSilent(Entity entity, boolean silent) { + entity.setSilent(silent); + } + + public static boolean isSilent(Entity entity) { + return entity.isSilent(); + } + + public static void setGlowing(Entity entity, boolean glowing) { + entity.setGlowing(glowing); + } + + public static boolean isGlowing(Entity entity) { + return entity.isGlowing(); + } + + public static void setFire(Entity entity, int seconds) { + entity.setOnFireFor(seconds); + } + + public static void extinguish(Entity entity) { + entity.extinguish(); + } + + public static boolean isOnFire(Entity entity) { + return entity.isOnFire(); + } + + public static void setInvisible(Entity entity, boolean invisible) { + entity.setInvisible(invisible); + } + + public static boolean isInvisible(Entity entity) { + return entity.isInvisible(); + } + + public static void setSneaking(Entity entity, boolean sneaking) { + entity.setSneaking(sneaking); + } + + public static boolean isSneaking(Entity entity) { + return entity.isSneaking(); + } + + public static void setSprinting(Entity entity, boolean sprinting) { + entity.setSprinting(sprinting); + } + + public static boolean isSprinting(Entity entity) { + return entity.isSprinting(); + } + + public static void setSwimming(Entity entity, boolean swimming) { + entity.setSwimming(swimming); + } + + public static boolean isSwimming(Entity entity) { + return entity.isSwimming(); + } + + public static void detach(Entity entity) { + entity.detach(); + } + + public static void attach(Entity entity, Entity vehicle) { + entity.startRiding(vehicle, true); + } + + public static void detachFromVehicle(Entity entity) { + entity.stopRiding(); + } + + public static boolean isRiding(Entity entity) { + return entity.hasVehicle(); + } + + public static Entity getVehicle(Entity entity) { + return entity.getVehicle(); + } + + public static void setVehicle(Entity entity, Entity vehicle) { + entity.startRiding(vehicle, true); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java index ed93efd18..b2a0aa1b5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java @@ -1,8 +1,12 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.fluid.FlowableFluid; import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; +import net.minecraft.world.WorldView; public class FluidUtil { public static Identifier toID(Fluid fluid) { @@ -20,4 +24,78 @@ public static int getRawId(Fluid fluid) { public static Fluid fromIndex(int index) { return Registries.FLUID.get(index); } + + public static boolean isExist(CompatIdentifier id) { + return Registries.FLUID.containsId(id.toMinecraft()); + } + + public static CompatIdentifier toCompatId(Fluid fluid) { + return CompatIdentifier.fromMinecraft(toID(fluid)); + } + + public static Fluid fromCompatId(CompatIdentifier id) { + return fromId(id.toMinecraft()); + } + + public static FlowableFluid water() { + return Fluids.WATER; + } + + public static FlowableFluid lava() { + return Fluids.LAVA; + } + + public static Fluid empty() { + return Fluids.EMPTY; + } + + public static FlowableFluid flowingWater() { + return Fluids.FLOWING_WATER; + } + + public static FlowableFluid flowingLava() { + return Fluids.FLOWING_LAVA; + } + + public static boolean isStill(Fluid fluid) { + return fluid == water() || fluid == lava(); + } + + public static boolean isStill(FluidState state) { + return state.isStill(); + } + + public static FluidState getStill(FlowableFluid fluid, boolean falling) { + return fluid.getStill(falling); + } + + public static FluidState getFlowing(FlowableFluid fluid, int level, boolean falling) { + return fluid.getFlowing(level, falling); + } + + public static FluidState getStill(FlowableFluid fluid) { + return getStill(fluid, false); + } + + public static FluidState getStillWater() { + return getStill(water()); + } + + public static FluidState getStillLava() { + return getStill(lava()); + } + + public static boolean isFlowing(Fluid fluid) { + return fluid == flowingWater() || fluid == flowingLava(); + } + + public static int getTickRate(Fluid fluid, WorldView world) { + return fluid.getTickRate(world); + } + + public static FluidState getDefaultState(Fluid fluid) { + return fluid.getDefaultState(); + } + + } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java index 2dbcfa02d..ae2e7ecc5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PlayerManagerUtil.java @@ -2,6 +2,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.PlayerManager; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; @@ -82,4 +83,48 @@ public static Player getPlayerByUUID(World world, UUID uuid) { public static Player getPlayerByName(World world, String name) { return PlayerUtil.getPlayerByName(world, name); } + + public static PlayerManager getPlayerManager(MinecraftServer server) { + return ServerUtil.getPlayerManager(server); + } + + public static PlayerManager getPlayerManager(World world) { + return getPlayerManager(world.getServer()); + } + + public static boolean hasPlayerByUUID(PlayerManager playerManager, UUID uuid) { + return playerManager.getPlayer(uuid) != null; + } + + public static boolean hasPlayerByName(PlayerManager playerManager, String name) { + return playerManager.getPlayer(name) != null; + } + + public static boolean hasPlayerByIP(PlayerManager playerManager, String ip) { + return !playerManager.getPlayersByIp(ip).isEmpty(); + } + + public static boolean hasPlayerByUUID(MinecraftServer server, UUID uuid) { + return hasPlayerByUUID(getPlayerManager(server), uuid); + } + + public static boolean hasPlayerByName(MinecraftServer server, String name) { + return hasPlayerByName(getPlayerManager(server), name); + } + + public static boolean hasPlayerByIP(MinecraftServer server, String ip) { + return hasPlayerByIP(getPlayerManager(server), ip); + } + + public static boolean hasPlayerByUUID(World world, UUID uuid) { + return hasPlayerByUUID(getPlayerManager(world), uuid); + } + + public static boolean hasPlayerByName(World world, String name) { + return hasPlayerByName(getPlayerManager(world), name); + } + + public static boolean hasPlayerByIP(World world, String ip) { + return hasPlayerByIP(getPlayerManager(world), ip); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java index e6d3b9a58..6209a1587 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java @@ -148,4 +148,8 @@ public static BooleanProperty open() { public static BooleanProperty occupied() { return Properties.OCCUPIED; } + + public static boolean contains(BlockState state, Property property) { + return state.contains(property); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java index e4e74f1f9..f19efd9b3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.PlayerManager; import net.minecraft.world.World; public class ServerUtil { @@ -47,4 +48,8 @@ public static boolean isServerDedicated(MinecraftServer server) { public static boolean isSingleplayer(MinecraftServer server) { return server.isSingleplayer(); } + + public static PlayerManager getPlayerManager(MinecraftServer server) { + return server.getPlayerManager(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java index 9591bbdb9..a51ef0e36 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StateManagerUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util; +import com.google.common.collect.ImmutableList; import net.minecraft.state.State; import net.minecraft.state.StateManager; @@ -7,4 +8,8 @@ public class StateManagerUtil { public static > S getDefaultState(StateManager manager) { return manager.getDefaultState(); } + + public > ImmutableList getStates(StateManager manager) { + return manager.getStates(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java index e9a7aecc2..cb3c46d85 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java @@ -9,4 +9,20 @@ public class MatrixStackUtil { public static void multiply(MatrixStack matrixStack, MathUtil.RotationAxisType type, float deg) { matrixStack.multiply(getRotationDegrees(type, deg)); } + + public static void push(MatrixStack matrices) { + matrices.push(); + } + + public static void pop(MatrixStack matrices) { + matrices.pop(); + } + + public static void translate(MatrixStack matrices, double x, double y, double z) { + matrices.translate(x, y, z); + } + + public static void scale(MatrixStack matrices, float x, float y, float z) { + matrices.scale(x, y, z); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java new file mode 100644 index 000000000..55cf2a9b1 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; +import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffectInstance; +import net.pitan76.mcpitanlib.api.util.EntityUtil; + +import java.util.ArrayList; +import java.util.List; + +public class LivingEntityUtil extends EntityUtil { + public static void addStatusEffect(LivingEntity entity, CompatStatusEffectInstance effect) { + entity.addStatusEffect(effect.getInstance()); + } + + public static void removeStatusEffect(LivingEntity entity, CompatStatusEffectInstance effect) { + entity.removeStatusEffect(effect.getInstance().getEffectType()); + } + + public static void removeStatusEffect(LivingEntity entity, CompatStatusEffect effect, World world) { + entity.removeStatusEffect(effect.getEntry(world)); + } + + public List getStatusEffects(LivingEntity entity) { + List compatEffects = new ArrayList<>(); + + for (StatusEffectInstance effect : entity.getStatusEffects()) { + compatEffects.add(new CompatStatusEffectInstance(effect)); + } + + return compatEffects; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java index f02122af9..7da5f2870 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java @@ -23,4 +23,12 @@ public static double getSquaredDistance(BlockPos pos1, BlockPos pos2) { public static double getSquaredDistance(BlockPos pos1, double x, double y, double z) { return pos1.getSquaredDistance(x, y, z); } + + public static Iterable iterate(BlockPos start, BlockPos end) { + return BlockPos.iterate(start, end); + } + + public static BlockPos[] getNeighborPoses(BlockPos pos) { + return new BlockPos[]{pos.north(), pos.south(), pos.east(), pos.west(), pos.up(), pos.down()}; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java new file mode 100644 index 000000000..8bf0816ab --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.util.world; + +import net.minecraft.block.Block; +import net.minecraft.fluid.Fluid; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldAccess; + +public class WorldAccessUtil extends WorldViewUtil { + + public static void scheduleBlockTick(WorldAccess world, BlockPos pos, Block block, int delay) { + world.scheduleBlockTick(pos, block, delay); + } + + public static void scheduleFluidTick(WorldAccess world, BlockPos pos, Fluid fluid, int delay) { + world.scheduleFluidTick(pos, fluid, delay); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java new file mode 100644 index 000000000..abe0d816e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java @@ -0,0 +1,70 @@ +package net.pitan76.mcpitanlib.api.util.world; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; +import net.minecraft.registry.tag.FluidTags; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldView; +import net.minecraft.world.dimension.DimensionType; + +public class WorldViewUtil { + + public static boolean isClient(WorldView world) { + return world.isClient(); + } + + public static BlockState getBlockState(WorldView world, BlockPos pos) { + return world.getBlockState(pos); + } + + public static Block getBlock(WorldView world, BlockPos pos) { + return getBlockState(world, pos).getBlock(); + } + + public static BlockEntity getBlockEntity(WorldView world, BlockPos pos) { + return world.getBlockEntity(pos); + } + + public static FluidState getFluidState(WorldView world, BlockPos pos) { + return getBlockState(world, pos).getFluidState(); + } + + public static Fluid getFluid(WorldView world, BlockPos pos) { + return getFluidState(world, pos).getFluid(); + } + + public static int getBottomY(WorldView world) { + return world.getBottomY(); + } + + public static int getTopY(WorldView world) { + return world.getTopY(); + } + + public static boolean isChunkLoaded(WorldView world, BlockPos pos) { + return world.isChunkLoaded(pos); + } + + public static boolean isRegionLoaded(WorldView world, BlockPos min, BlockPos max) { + return world.isRegionLoaded(min, max); + } + + public static DimensionType getDimensionType(WorldView world) { + return world.getDimension(); + } + + public static boolean isAirBlock(WorldView world, BlockPos pos) { + return getBlockState(world, pos).isAir(); + } + + public static boolean isOpaqueBlock(WorldView world, BlockPos pos) { + return getBlockState(world, pos).isOpaque(); + } + + public static boolean isWater(WorldView world, BlockPos pos) { + return getFluidState(world, pos).isIn(FluidTags.WATER); + } +} diff --git a/info.properties b/info.properties index f66fb9aaf..f95acddb6 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.4 +mod_version=2.4.5 maven_group=net.pitan76 \ No newline at end of file From 67a604ebb14c042bcd4acb9fd9dfc5eb664434c8 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 19 Sep 2024 18:23:55 +0900 Subject: [PATCH 390/622] remove enchant register --- .../net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java | 5 ++--- info.properties | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java index f9dc92e7c..526c44366 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry.java @@ -32,7 +32,6 @@ public class MCPLRegistry { public Registrar SOUND_EVENT; public Registrar FLUID; public Registrar> PARTICLE_TYPE; - public Registrar ENCHANTMENT; public Registrar STATUS_EFFECT; public MCPLRegistry(String MOD_ID) { @@ -46,7 +45,6 @@ public MCPLRegistry(String MOD_ID) { SOUND_EVENT = REGISTRIES.get().get(RegistryKeys.SOUND_EVENT); FLUID = REGISTRIES.get().get(RegistryKeys.FLUID); PARTICLE_TYPE = REGISTRIES.get().get(RegistryKeys.PARTICLE_TYPE); - ENCHANTMENT = REGISTRIES.get().get(RegistryKeys.ENCHANTMENT); STATUS_EFFECT = REGISTRIES.get().get(RegistryKeys.STATUS_EFFECT); } @@ -83,7 +81,8 @@ public RegistrySupplier> registryParticleType(Identifier id, Sup } public RegistrySupplier registryEnchantment(Identifier id, Supplier supplier) { - return ENCHANTMENT.register(id, supplier); + return null; + //return ENCHANTMENT.register(id, supplier); } public RegistrySupplier registryStatusEffect(Identifier id, Supplier supplier) { diff --git a/info.properties b/info.properties index f95acddb6..10fdaf1ee 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.5 +mod_version=2.4.5-fix.1 maven_group=net.pitan76 \ No newline at end of file From d5aa5bc1e0d95ebed030515c7f0f095c8f39c85e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 27 Sep 2024 23:18:32 +0900 Subject: [PATCH 391/622] add APIs --- .../client/registry/CompatRegistryClient.java | 6 ++ .../entity/CompatBlockEntityRenderer.java | 1 + ...ompatBlockEntityRendererConstructArgs.java | 16 ++++ .../entity/v2/CompatBlockEntityRenderer.java | 15 ++++ .../pitan76/mcpitanlib/api/entity/Player.java | 4 + .../api/event/item/CanMineArgs.java | 46 ++++++++++ .../api/event/item/CanRepairArgs.java | 22 +++++ .../api/event/result/EventResult.java | 43 ++++++++++ .../api/event/result/TypedEventResult.java | 42 ++++++++++ .../event/v0/InteractionEventRegistry.java | 84 +++++++++++++++++++ .../api/event/v0/event/ClickBlockEvent.java | 78 +++++++++++++++++ .../api/event/v1/LivingHurtEventRegistry.java | 23 +++++ .../api/gui/ExtendedScreenHandlerFactory.java | 1 + .../api/gui/args/CreateMenuEvent.java | 46 ++++++++++ .../gui/v2/ExtendedScreenHandlerFactory.java | 17 ++++ .../gui/v2/SimpleScreenHandlerFactory.java | 25 ++++++ .../mcpitanlib/api/item/ExtendItem.java | 20 +++++ .../api/registry/CompatRegistry.java | 4 + .../mcpitanlib/api/registry/FuelRegistry.java | 27 ++++++ .../api/registry/v2/CompatRegistryV2.java | 5 ++ .../mcpitanlib/api/text/TextComponent.java | 12 +++ .../mcpitanlib/api/util/BlockStateUtil.java | 25 ++++++ .../mcpitanlib/api/util/CompatIdentifier.java | 19 +++++ .../mcpitanlib/api/util/IngredientUtil.java | 4 + .../mcpitanlib/api/util/InventoryUtil.java | 13 +++ .../api/util/RegistryLookupUtil.java | 5 ++ .../mcpitanlib/api/util/StyleUtil.java | 60 +++++++++++++ .../pitan76/mcpitanlib/api/util/TextUtil.java | 29 +++++++ .../mcpitanlib/api/util/WorldUtil.java | 27 ++++-- .../api/util/block/BlockHitResultUtil.java | 33 ++++++++ .../util/collection/DefaultedListUtil.java | 15 ++++ .../api/util/collection/ItemStackList.java | 64 ++++++++++++++ .../api/util/inventory/CompatInventory.java | 45 ++++++++++ .../util/inventory/ContainerInventory.java | 17 ++++ .../util/inventory/PlayerInventoryUtil.java | 18 ++++ .../api/util/math/DirectionUtil.java | 34 ++++++++ info.properties | 2 +- 37 files changed, 938 insertions(+), 9 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/CompatBlockEntityRendererConstructArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanRepairArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ClickBlockEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/LivingHurtEventRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/ExtendedScreenHandlerFactory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/SimpleScreenHandlerFactory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/StyleUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockHitResultUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/DefaultedListUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ContainerInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/math/DirectionUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index beb2656f8..2e1a25f6c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -194,4 +194,10 @@ public static void registerRenderTypeFluid(RenderLayer layer, Fluid fluid) { public static void registerCutoutBlock(Block block) { registerRenderTypeBlock(RenderLayer.getCutout(), block); } + + public static void registerCompatBlockEntityRenderer(BlockEntityType type, BlockEntityRendererFactory provider) { + BlockEntityRendererRegistry.register(type, ctx -> provider.create(new BlockEntityRendererFactory.Context( + ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer() + ))); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java index ac24bdd4e..bdb78967b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java @@ -6,6 +6,7 @@ import net.pitan76.mcpitanlib.api.client.render.block.entity.event.BlockEntityRenderEvent; import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; +@Deprecated public interface CompatBlockEntityRenderer extends BlockEntityRenderer { void render(BlockEntityRenderEvent event); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/CompatBlockEntityRendererConstructArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/CompatBlockEntityRendererConstructArgs.java new file mode 100644 index 000000000..d0dc58e39 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/CompatBlockEntityRendererConstructArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.client.render.block.entity.event; + +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.pitan76.mcpitanlib.api.util.client.ClientUtil; + +public class CompatBlockEntityRendererConstructArgs { + public final BlockEntityRenderDispatcher dispatcher; + + public CompatBlockEntityRendererConstructArgs(BlockEntityRenderDispatcher dispatcher) { + this.dispatcher = dispatcher; + } + + public CompatBlockEntityRendererConstructArgs() { + this(ClientUtil.getClient().getBlockEntityRenderDispatcher()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java new file mode 100644 index 000000000..cec057a47 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java @@ -0,0 +1,15 @@ +package net.pitan76.mcpitanlib.api.client.render.block.entity.v2; + +import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; +import net.pitan76.mcpitanlib.api.client.render.block.entity.event.CompatBlockEntityRendererConstructArgs; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; + +public abstract class CompatBlockEntityRenderer implements net.pitan76.mcpitanlib.api.client.render.block.entity.CompatBlockEntityRenderer { + public CompatBlockEntityRenderer(CompatBlockEntityRendererConstructArgs args) { + + } + + public CompatBlockEntityRenderer(CompatRegistryClient.BlockEntityRendererFactory.Context ctx) { + + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 0f49d48f4..8e374fc24 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -500,4 +500,8 @@ public int getFallFlyingTicks() { public boolean checkFallFlying() { return getEntity().checkFallFlying(); } + + public void setStackInHand(Hand hand, ItemStack stack) { + getEntity().setStackInHand(hand, stack); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java new file mode 100644 index 000000000..5ab21de8b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java @@ -0,0 +1,46 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +public class CanMineArgs { + public BlockState state; + public World world; + public BlockPos pos; + public Player miner; + + public CanMineArgs(BlockState state, World world, BlockPos pos, PlayerEntity miner) { + this.state = state; + this.world = world; + this.pos = pos; + this.miner = new Player(miner); + } + + public BlockState getState() { + return state; + } + + public World getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public Player getMiner() { + return miner; + } + + public boolean isExistMiner() { + return miner.getEntity() != null; + } + + public boolean isClient() { + return WorldUtil.isClient(world); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanRepairArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanRepairArgs.java new file mode 100644 index 000000000..2bd98d890 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanRepairArgs.java @@ -0,0 +1,22 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.event.BaseEvent; + +public class CanRepairArgs extends BaseEvent { + public ItemStack stack; + public ItemStack ingredient; + + public CanRepairArgs(ItemStack stack, ItemStack ingredient) { + this.stack = stack; + this.ingredient = ingredient; + } + + public ItemStack getStack() { + return stack; + } + + public ItemStack getIngredient() { + return ingredient; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java new file mode 100644 index 000000000..eefce4ca1 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java @@ -0,0 +1,43 @@ +package net.pitan76.mcpitanlib.api.event.result; + +import net.minecraft.util.ActionResult; + +public class EventResult { + + protected final dev.architectury.event.EventResult result; + + private static final EventResult TRUE = new EventResult(dev.architectury.event.EventResult.interruptTrue()); + private static final EventResult STOP = new EventResult(dev.architectury.event.EventResult.interruptDefault()); + private static final EventResult PASS = new EventResult(dev.architectury.event.EventResult.pass()); + private static final EventResult FALSE = new EventResult(dev.architectury.event.EventResult.interruptFalse()); + + + protected EventResult(dev.architectury.event.EventResult result) { + this.result = result; + } + + public static EventResult success() { + return TRUE; + } + + public static EventResult stop() { + return STOP; + } + + public static EventResult pass() { + return PASS; + } + + public static EventResult fail() { + return FALSE; + } + + @Deprecated + public dev.architectury.event.EventResult getResult() { + return result; + } + + public ActionResult toActionResult() { + return result.asMinecraft(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java new file mode 100644 index 000000000..971177e9b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java @@ -0,0 +1,42 @@ +package net.pitan76.mcpitanlib.api.event.result; + +import dev.architectury.event.CompoundEventResult; +import net.minecraft.util.ActionResult; +import net.minecraft.util.TypedActionResult; + +public class TypedEventResult { + protected final dev.architectury.event.CompoundEventResult result; + + protected TypedEventResult(dev.architectury.event.CompoundEventResult result) { + this.result = result; + } + + public static TypedEventResult success(T value) { + return new TypedEventResult<>(CompoundEventResult.interruptTrue(value)); + } + + public static TypedEventResult stop(T value) { + return new TypedEventResult<>(CompoundEventResult.interruptDefault(value)); + } + + public static TypedEventResult pass() { + return new TypedEventResult<>(CompoundEventResult.pass()); + } + + public static TypedEventResult fail(T value) { + return new TypedEventResult<>(CompoundEventResult.interruptFalse(value)); + } + + @Deprecated + public dev.architectury.event.CompoundEventResult getResult() { + return result; + } + + public TypedActionResult toTypedActionResult() { + return result.asMinecraft(); + } + + public ActionResult toActionResult() { + return result.asMinecraft().getResult(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java new file mode 100644 index 000000000..d31cf54c5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java @@ -0,0 +1,84 @@ +package net.pitan76.mcpitanlib.api.event.v0; + +import dev.architectury.event.CompoundEventResult; +import dev.architectury.event.events.common.InteractionEvent; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Hand; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.result.EventResult; +import net.pitan76.mcpitanlib.api.event.result.TypedEventResult; +import net.pitan76.mcpitanlib.api.event.v0.event.ClickBlockEvent; + +public class InteractionEventRegistry { + @SuppressWarnings("deprecation") + public static void registerRightClickBlock(RightClickBlock rightClickBlock) { + InteractionEvent.RIGHT_CLICK_BLOCK.register((player, hand, pos, direction) -> rightClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).getResult()); + } + + @SuppressWarnings("deprecation") + public static void registerLeftClickBlock(LeftClickBlock leftClickBlock) { + InteractionEvent.LEFT_CLICK_BLOCK.register((player, hand, pos, direction) -> leftClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).getResult()); + } + + public static void registerRightClickItem(RightClickItem rightClickItem) { + InteractionEvent.RIGHT_CLICK_ITEM.register(rightClickItem::click); + } + + public static void registerClientLeftClickAir(ClientLeftClickAir clientLeftClickAir) { + InteractionEvent.CLIENT_LEFT_CLICK_AIR.register(clientLeftClickAir::click); + } + + public static void registerClientRightClickAir(ClientRightClickAir clientRightClickAir) { + InteractionEvent.CLIENT_RIGHT_CLICK_AIR.register(clientRightClickAir::click); + } + + public static void registerInteractEntity(InteractEntity interactEntity) { + InteractionEvent.INTERACT_ENTITY.register(interactEntity::interact); + } + + // ---- + + public interface LeftClickBlock { + EventResult click(ClickBlockEvent event); + } + + public interface RightClickBlock { + EventResult click(ClickBlockEvent event); + } + + public interface RightClickItem { + @SuppressWarnings("deprecation") + default CompoundEventResult click(PlayerEntity var1, Hand var2) { + return click(new Player(var1), var2).getResult(); + } + + TypedEventResult click(Player player, Hand hand); + } + + public interface ClientLeftClickAir { + default void click(PlayerEntity var1, Hand var2) { + click(new Player(var1), var2); + } + + void click(Player player, Hand hand); + } + + public interface ClientRightClickAir { + default void click(PlayerEntity var1, Hand var2) { + click(new Player(var1), var2); + } + + void click(Player player, Hand hand); + } + + public interface InteractEntity { + @SuppressWarnings("deprecation") + default dev.architectury.event.EventResult interact(PlayerEntity var1, Entity var2, Hand var3) { + return interact(new Player(var1), var2, var3).getResult(); + } + + EventResult interact(Player player, Entity entity, Hand hand); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ClickBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ClickBlockEvent.java new file mode 100644 index 000000000..231235154 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/ClickBlockEvent.java @@ -0,0 +1,78 @@ +package net.pitan76.mcpitanlib.api.event.v0.event; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Hand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.util.BlockStateUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +public class ClickBlockEvent { + public Player player; + public Hand hand; + public BlockPos pos; + public Direction direction; + + public ClickBlockEvent(Player player, Hand hand, BlockPos pos, Direction direction) { + this.player = player; + this.hand = hand; + this.pos = pos; + this.direction = direction; + } + + public ClickBlockEvent(PlayerEntity player, Hand hand, BlockPos pos, Direction direction) { + this.player = new Player(player); + this.hand = hand; + this.pos = pos; + this.direction = direction; + } + + public Player getPlayer() { + return player; + } + + public Hand getHand() { + return hand; + } + + public BlockPos getPos() { + return pos; + } + + public Direction getDirection() { + return direction; + } + + public boolean isExistPlayer() { + return player.getEntity() != null; + } + + public ItemStack getStackInHand() { + return player.getStackInHand(hand); + } + + public boolean isEmptyStackInHand() { + return getStackInHand().isEmpty(); + } + + public World getWorld() { + return player.getWorld(); + } + + public BlockState getBlockState() { + return WorldUtil.getBlockState(getWorld(), getPos()); + } + + public Block getBlock() { + return BlockStateUtil.getBlock(getBlockState()); + } + + + + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/LivingHurtEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/LivingHurtEventRegistry.java new file mode 100644 index 000000000..a95a7e9be --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/LivingHurtEventRegistry.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.event.v1; + +import dev.architectury.event.EventResult; +import dev.architectury.event.events.common.EntityEvent; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.damage.DamageSource; +import net.pitan76.mcpitanlib.api.event.v0.event.LivingHurtEvent; + +public class LivingHurtEventRegistry { + public static void register(LivingHurt livingHurt) { + EntityEvent.LIVING_HURT.register(livingHurt::hurt); + } + + public interface LivingHurt { + + @SuppressWarnings("deprecation") + default EventResult hurt(LivingEntity var1, DamageSource var2, float var3) { + return hurt(new LivingHurtEvent(var1, var2, var3)).getResult(); + } + + net.pitan76.mcpitanlib.api.event.result.EventResult hurt(LivingHurtEvent event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java index 1bb6de4a8..17d6586b0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerFactory.java @@ -6,6 +6,7 @@ import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; import net.pitan76.mcpitanlib.api.event.container.factory.ExtraDataArgs; +@Deprecated public interface ExtendedScreenHandlerFactory extends ExtendedMenuProvider { @Override default Text getDisplayName() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java new file mode 100644 index 000000000..144c963f5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java @@ -0,0 +1,46 @@ +package net.pitan76.mcpitanlib.api.gui.args; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; + +public class CreateMenuEvent { + public int syncId; + public PlayerInventory playerInventory; + public PlayerEntity player; + + public CreateMenuEvent(int syncId, PlayerInventory playerInventory, PlayerEntity player) { + this.syncId = syncId; + this.playerInventory = playerInventory; + this.player = player; + } + + public int getSyncId() { + return syncId; + } + + public PlayerInventory getPlayerInventory() { + return playerInventory; + } + + public PlayerEntity getPlayerEntity() { + return player; + } + + public Player getPlayer() { + return new Player(player); + } + + public boolean isExistPlayer() { + return player != null; + } + + public boolean isClient() { + return getPlayer().isClient(); + } + + public World getWorld() { + return getPlayer().getWorld(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/ExtendedScreenHandlerFactory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/ExtendedScreenHandlerFactory.java new file mode 100644 index 000000000..b26d1915f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/ExtendedScreenHandlerFactory.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.gui.v2; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; + +@SuppressWarnings("deprecation") +public interface ExtendedScreenHandlerFactory extends net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerFactory { + + @Override + default ScreenHandler createMenu(int syncId, PlayerInventory playerInventory, PlayerEntity player) { + return createMenu(new CreateMenuEvent(syncId, playerInventory, player)); + } + + ScreenHandler createMenu(CreateMenuEvent event); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/SimpleScreenHandlerFactory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/SimpleScreenHandlerFactory.java new file mode 100644 index 000000000..8d447ebb3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/v2/SimpleScreenHandlerFactory.java @@ -0,0 +1,25 @@ +package net.pitan76.mcpitanlib.api.gui.v2; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.NamedScreenHandlerFactory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; + +public interface SimpleScreenHandlerFactory extends NamedScreenHandlerFactory { + @Override + default Text getDisplayName() { + return getDisplayName(new DisplayNameArgs()); + } + + Text getDisplayName(DisplayNameArgs args); + + @Override + default ScreenHandler createMenu(int syncId, PlayerInventory playerInventory, PlayerEntity player) { + return createMenu(new CreateMenuEvent(syncId, playerInventory, player)); + } + + ScreenHandler createMenu(CreateMenuEvent event); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 0e5e824cc..a6ba3bb03 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -231,4 +231,24 @@ public float getBonusAttackDamage(Entity target, float baseAttackDamage, DamageS public float getBonusAttackDamage(BonusAttackDamageArgs args) { return super.getBonusAttackDamage(args.target, args.baseAttackDamage, args.damageSource); } + + @Deprecated + @Override + public boolean canRepair(ItemStack stack, ItemStack ingredient) { + return canRepair(new CanRepairArgs(stack, ingredient)); + } + + public boolean canRepair(CanRepairArgs args) { + return super.canRepair(args.stack, args.ingredient); + } + + @Deprecated + @Override + public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner) { + return canMine(new CanMineArgs(state, world, pos, miner)); + } + + public boolean canMine(CanMineArgs args) { + return super.canMine(args.state, args.world, args.pos, args.miner.getEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index 8b798698d..b1f4b3130 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -183,4 +183,8 @@ public MCPLRegistry1_20 getMcplr1_20() { public MCPLRegistry1_21 getMcplr1_21() { return mcplr1_21; } + + public String getNamespace() { + return MOD_ID; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java new file mode 100644 index 000000000..66873fc56 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.registry; + +import net.minecraft.item.ItemConvertible; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; + +public class FuelRegistry { + + private static final Map, Integer>> FUEL_MAP = new HashMap<>(); + + public static void register(Supplier itemSupplier, int time, String namespace) { + Map, Integer> map = new HashMap<>(); + map.put(itemSupplier, time); + + FUEL_MAP.put(namespace, map); + } + + @Deprecated + public static void allRegister(String namespace) { + Map, Integer> map = FUEL_MAP.get(namespace); + for (Map.Entry, Integer> entry : map.entrySet()) { + net.pitan76.mcpitanlib.core.registry.FuelRegistry.register(entry.getValue(), entry.getKey().get()); + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 5e279691d..7c022c61e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -17,6 +17,7 @@ import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; +import net.pitan76.mcpitanlib.api.registry.FuelRegistry; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.sound.RegistryResultCompatSoundEvent; @@ -133,6 +134,10 @@ public RegistryResult registerItemGroup(CreativeTabBuilder builder) { return cr1.registerItemGroup(builder.getIdentifier(), builder); } + public void registerFuel(Supplier itemSupplier, int time) { + FuelRegistry.register(itemSupplier::get, time, cr1.getNamespace()); + } + public void allRegister() { cr1.allRegister(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java index 042977e26..c0c91314b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.text; import net.minecraft.text.MutableText; +import net.minecraft.text.Style; import net.minecraft.text.Text; import net.pitan76.mcpitanlib.api.util.TextUtil; import org.jetbrains.annotations.Nullable; @@ -77,4 +78,15 @@ public String superToString() { public TextComponent copy() { return new TextComponent(getText()); } + + public Style getStyle() { + return text.getStyle(); + } + + public TextComponent setStyle(Style style) { + if (text instanceof MutableText) + TextUtil.setStyle((MutableText) text, style); + + return this; + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index 8d60dbd0c..f414848e0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -2,13 +2,22 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.Property; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.ItemActionResult; +import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.util.block.BlockHitResultUtil; public class BlockStateUtil { public static Block getBlock(BlockState state) { @@ -54,4 +63,20 @@ public static boolean hasRandomTicks(BlockState state) { public static void randomTick(BlockState state, ServerWorld world, BlockPos pos) { state.randomTick(world, pos, world.random); } + + public static ActionResult onUse(BlockState state, World world, Player player, BlockHitResult hitResult) { + return state.onUse(world, player.getEntity(), hitResult); + } + + public static ActionResult onUse(BlockState state, World world, Player player, Direction dir, BlockPos blockPos) { + return onUse(state, world, player, BlockHitResultUtil.create(player.getPos(), dir, blockPos)); + } + + public static ItemActionResult onUseWithItem(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { + return state.onUseWithItem(stack, world, player, hand, hit); + } + + public static ActionResult onUseWithItem_actionResult(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { + return onUseWithItem(state, stack, world, player, hand, hit).toActionResult(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java index 1d786c02e..4a40880dd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java @@ -2,6 +2,8 @@ import net.minecraft.util.Identifier; +import java.util.Objects; + /** * This is the Identifier class unique to MCPitanLib. * It is different from Minecraft's Identifier class. @@ -105,6 +107,23 @@ public static boolean equals(CompatIdentifier id1, CompatIdentifier id2) { return id1.namespace.equals(id2.namespace) && id1.path.equals(id2.path); } + public static boolean equals(CompatIdentifier id1, Identifier id2) { + return id1.toString().equals(id2.toString()); + } + + public static boolean equals(Identifier id1, CompatIdentifier id2) { + return id1.toString().equals(id2.toString()); + } + + public static boolean equals(Identifier id1, Identifier id2) { + return id1.toString().equals(id2.toString()); + } + + @Override + public int hashCode() { + return 31 * this.namespace.hashCode() + this.path.hashCode(); + } + // ---- /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index 9a6bcf43f..bec9f4348 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -46,4 +46,8 @@ public static List getMatchingStacksAsList(Ingredient ingredient) { public static ItemStack[] getMatchingStacks(Ingredient ingredient) { return ingredient.getMatchingStacks(); } + + public static Ingredient empty() { + return Ingredient.EMPTY; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java index 44a5f7298..204f85f40 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.inventory.Inventories; +import net.minecraft.inventory.Inventory; import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; @@ -107,4 +108,16 @@ public static void readNbt(World world, NbtCompound nbt, DefaultedList from, Inventory to) { + for (int i = 0; i < from.size(); i++) { + to.setStack(i, from.get(i)); + } + } + + public static void copyToList(Inventory from, DefaultedList to) { + for (int i = 0; i < from.size(); i++) { + to.set(i, from.getStack(i)); + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java index 16e0fe5e6..b507e75ee 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RegistryLookupUtil.java @@ -2,6 +2,7 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; +import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.CompatEntity; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; @@ -32,4 +33,8 @@ public static CompatRegistryLookup getRegistryLookup(BlockEntity entity) { public static CompatRegistryLookup getRegistryLookup(NbtRWArgs args) { return args.getRegistryLookup(); } + + public static CompatRegistryLookup getRegistryLookup(World world) { + return new CompatRegistryLookup(world.getRegistryManager()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StyleUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StyleUtil.java new file mode 100644 index 000000000..6bbaac18b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StyleUtil.java @@ -0,0 +1,60 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.text.ClickEvent; +import net.minecraft.text.HoverEvent; +import net.minecraft.text.Style; +import net.minecraft.util.Formatting; + +public class StyleUtil { + public static Style emptyStyle() { + return Style.EMPTY; + } + + public static Style withColor(Style style, int color) { + return style.withColor(color); + } + + public static Style withBold(Style style, boolean bold) { + return style.withBold(bold); + } + + public static Style withItalic(Style style, boolean italic) { + return style.withItalic(italic); + } + + public static Style withUnderline(Style style, boolean underline) { + return style.withUnderline(underline); + } + + public static Style withStrikethrough(Style style, boolean strikethrough) { + return style.withStrikethrough(strikethrough); + } + + public static Style withObfuscated(Style style, boolean obfuscated) { + return style.withObfuscated(obfuscated); + } + + public static Style withInsertion(Style style, String insertion) { + return style.withInsertion(insertion); + } + + public static Style withClickEvent(Style style, ClickEvent clickEvent) { + return style.withClickEvent(clickEvent); + } + + public static Style withHoverEvent(Style style, HoverEvent hoverEvent) { + return style.withHoverEvent(hoverEvent); + } + + public static Style withFont(Style style, CompatIdentifier font) { + return style.withFont(font.toMinecraft()); + } + + public static Style withFormatting(Style style, Formatting formatting) { + return style.withFormatting(formatting); + } + + public static Style withExclusiveFormatting(Style style, Formatting formatting) { + return style.withExclusiveFormatting(formatting); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java index d94f66568..1e18cfa78 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.text.MutableText; +import net.minecraft.text.Style; import net.minecraft.text.Text; public class TextUtil { @@ -27,4 +28,32 @@ public static MutableText keybind(String string) { public static String txt2str(Text text) { return text.getString(); } + + public static MutableText setStyle(MutableText text, Style style) { + return text.setStyle(style); + } + + public static Style getStyle(MutableText text) { + return text.getStyle(); + } + + public static MutableText withColor(MutableText text, int color) { + return setStyle(text, StyleUtil.withColor(text.getStyle(), color)); + } + + public static MutableText withBold(MutableText text, boolean bold) { + return setStyle(text, StyleUtil.withBold(text.getStyle(), bold)); + } + + public static MutableText append(MutableText text, Text sibling) { + return text.append(sibling); + } + + public static MutableText append(MutableText text, String string) { + return text.append(string); + } + + public static MutableText of(String string) { + return literal(string); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 73ff66049..927b68990 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -19,7 +19,9 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; +import net.minecraft.util.TypeFilter; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -30,6 +32,7 @@ import org.jetbrains.annotations.Nullable; import java.util.*; +import java.util.function.Predicate; public class WorldUtil { public static boolean hasSkyLight(World world) { @@ -206,20 +209,20 @@ public static boolean isAir(World world, BlockPos pos) { return getBlockState(world, pos).isAir(); } - public static void setBlockState(World world, BlockPos pos, BlockState state, int flags) { - world.setBlockState(pos, state, flags); + public static boolean setBlockState(World world, BlockPos pos, BlockState state, int flags) { + return world.setBlockState(pos, state, flags); } - public static void setBlockState(World world, BlockPos pos, BlockState state) { - setBlockState(world, pos, state, 3); + public static boolean setBlockState(World world, BlockPos pos, BlockState state) { + return setBlockState(world, pos, state, 3); } - public static void setBlockState(World world, BlockPos pos, Block block, int flags) { - setBlockState(world, pos, block.getDefaultState(), flags); + public static boolean setBlockState(World world, BlockPos pos, Block block, int flags) { + return setBlockState(world, pos, block.getDefaultState(), flags); } - public static void setBlockState(World world, BlockPos pos, Block block) { - setBlockState(world, pos, block, 3); + public static boolean setBlockState(World world, BlockPos pos, Block block) { + return setBlockState(world, pos, block, 3); } public static boolean breakBlock(World world, BlockPos pos, boolean drop) { @@ -281,4 +284,12 @@ public static CompatRandom getRandom(World world) { public static long getTime(World world) { return world.getTime(); } + + public static List getEntitiesByType(World world, TypeFilter filter, Box box, Predicate predicate) { + return world.getEntitiesByType(filter, box, predicate); + } + + public static List getEntitiesByClass(World world, Class entityClass, Box box, Predicate predicate) { + return world.getEntitiesByClass(entityClass, box, predicate); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockHitResultUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockHitResultUtil.java new file mode 100644 index 000000000..4c42a10e8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockHitResultUtil.java @@ -0,0 +1,33 @@ +package net.pitan76.mcpitanlib.api.util.block; + +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; + +public class BlockHitResultUtil { + + public static BlockHitResult create(Vec3d pos, Direction direction, BlockPos blockPos, boolean insideBlock) { + return new BlockHitResult(pos, direction, blockPos, insideBlock); + } + + public static BlockHitResult create(Vec3d pos, Direction direction, BlockPos blockPos) { + return new BlockHitResult(pos, direction, blockPos, false); + } + + public static Vec3d getPos(BlockHitResult blockHitResult) { + return blockHitResult.getPos(); + } + + public static Direction getSide(BlockHitResult blockHitResult) { + return blockHitResult.getSide(); + } + + public static BlockPos getBlockPos(BlockHitResult blockHitResult) { + return blockHitResult.getBlockPos(); + } + + public static boolean isInsideBlock(BlockHitResult blockHitResult) { + return blockHitResult.isInsideBlock(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/DefaultedListUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/DefaultedListUtil.java new file mode 100644 index 000000000..5db1133ae --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/DefaultedListUtil.java @@ -0,0 +1,15 @@ +package net.pitan76.mcpitanlib.api.util.collection; + +import net.minecraft.util.collection.DefaultedList; + +public class DefaultedListUtil { + + public static DefaultedList of() { + return DefaultedList.of(); + } + + public static DefaultedList ofSize(int size, E defaultElement) { + return DefaultedList.ofSize(size, defaultElement); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java new file mode 100644 index 000000000..06123d5e9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java @@ -0,0 +1,64 @@ +package net.pitan76.mcpitanlib.api.util.collection; + +import com.google.common.collect.Lists; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.gui.inventory.IInventory; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import org.apache.commons.lang3.Validate; +import org.jetbrains.annotations.Nullable; + +import java.util.Arrays; +import java.util.List; + +public class ItemStackList extends DefaultedList { + + public ItemStackList(List delegate, @Nullable ItemStack initialElement) { + super(delegate, initialElement); + } + + public static ItemStackList of() { + return new ItemStackList(Lists.newArrayList(), ItemStackUtil.empty()); + } + + public static ItemStackList ofSize(int size) { + return new ItemStackList(Lists.newArrayListWithCapacity(size), ItemStackUtil.empty()); + } + + public static ItemStackList ofSize(int size, ItemStack defaultStack) { + Validate.notNull(defaultStack); + ItemStack[] objects = new ItemStack[size]; + Arrays.fill(objects, defaultStack); + return new ItemStackList(Arrays.asList(objects), defaultStack); + } + + public static ItemStackList copyOf(ItemStack defaultStack, ItemStack... stacks) { + return new ItemStackList(Arrays.asList(stacks), defaultStack); + } + + public static Inventory toInventory(DefaultedList list) { + return IInventory.of(list); + } + + public static DefaultedList toDefaultedList(Inventory inventory) { + DefaultedList list = DefaultedList.ofSize(inventory.size(), ItemStackUtil.empty()); + for (int i = 0; i < inventory.size(); i++) { + list.set(i, inventory.getStack(i)); + } + + return list; + } + + public static ItemStackList fromInventory(Inventory inventory) { + return new ItemStackList(toDefaultedList(inventory), ItemStackUtil.empty()); + } + + public Inventory toInventory() { + return toInventory(this); + } + + public DefaultedList defaultedList() { + return this; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java new file mode 100644 index 000000000..9d9261455 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java @@ -0,0 +1,45 @@ +package net.pitan76.mcpitanlib.api.util.inventory; + +import net.minecraft.inventory.SimpleInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class CompatInventory extends SimpleInventory { + public CompatInventory(int size) { + super(size); + } + + @Override + public void setStack(int slot, ItemStack stack) { + super.setStack(slot, stack); + } + + /** + * super method of setStack(slot, stack) + */ + public final void superSetStack(int slot, ItemStack stack) { + super.setStack(slot, stack); + } + + /** + * super method of removeStack(slot, amount) + */ + public final ItemStack superRemoveStack(int slot, int amount) { + return super.removeStack(slot, amount); + } + + @Override + public ItemStack removeStack(int slot, int amount) { + return super.removeStack(slot, amount); + } + + @Override + public ItemStack removeStack(int slot) { + return super.removeStack(slot); + } + + @Override + public ItemStack removeItem(Item item, int count) { + return super.removeItem(item, count); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ContainerInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ContainerInventory.java new file mode 100644 index 000000000..b4be9a037 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ContainerInventory.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.util.inventory; + +import net.minecraft.screen.ScreenHandler; + +public class ContainerInventory extends CompatInventory { + + public final T screenHandler; + + public ContainerInventory(T screenHandler, int size) { + super(size); + this.screenHandler = screenHandler; + } + + public T getScreenHandler() { + return screenHandler; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java new file mode 100644 index 000000000..689d156d4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java @@ -0,0 +1,18 @@ +package net.pitan76.mcpitanlib.api.util.inventory; + +import net.minecraft.entity.player.PlayerInventory; +import net.pitan76.mcpitanlib.api.entity.Player; + +public class PlayerInventoryUtil { + public static Player getPlayer(PlayerInventory playerInventory) { + return new Player(playerInventory.player); + } + + public static int getSelectedSlot(PlayerInventory playerInventory) { + return playerInventory.selectedSlot; + } + + public static void setSelectedSlot(PlayerInventory playerInventory, int slot) { + playerInventory.selectedSlot = slot; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/DirectionUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/DirectionUtil.java new file mode 100644 index 000000000..08ac22244 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/DirectionUtil.java @@ -0,0 +1,34 @@ +package net.pitan76.mcpitanlib.api.util.math; + +import net.minecraft.util.math.Direction; + +public class DirectionUtil { + + public static Direction north() { + return Direction.NORTH; + } + + public static Direction south() { + return Direction.SOUTH; + } + + public static Direction east() { + return Direction.EAST; + } + + public static Direction west() { + return Direction.WEST; + } + + public static Direction up() { + return Direction.UP; + } + + public static Direction down() { + return Direction.DOWN; + } + + public static Direction getOpposite(Direction direction) { + return direction.getOpposite(); + } +} diff --git a/info.properties b/info.properties index 10fdaf1ee..3aeb94b5b 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.5-fix.1 +mod_version=2.4.6 maven_group=net.pitan76 \ No newline at end of file From b60e8047e2d1011bf7f54e894612a61d0072a455 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:43:09 +0900 Subject: [PATCH 392/622] add APIs --- .../net/pitan76/mcpitanlib/MCPitanLib.java | 7 + .../mcpitanlib/api/block/CompatBlocks.java | 90 +++++++++++ .../api/registry/CompatRegistryLookup.java | 5 + .../mcpitanlib/api/registry/FuelRegistry.java | 4 + .../api/registry/v2/CompatRegistryV2.java | 1 + .../pitan76/mcpitanlib/api/util/NbtUtil.java | 8 + .../mcpitanlib/midohra/MidohraAPI.java | 13 ++ .../mcpitanlib/midohra/item/ItemStack.java | 108 +++++++++++++ .../midohra/nbt/ElementConvertible.java | 9 ++ .../mcpitanlib/midohra/nbt/NbtCompound.java | 147 ++++++++++++++++++ .../mcpitanlib/midohra/nbt/NbtElement.java | 46 ++++++ .../mcpitanlib/midohra/nbt/NbtList.java | 111 +++++++++++++ info.properties | 2 +- 13 files changed, 550 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/MidohraAPI.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/ElementConvertible.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index 678bccd3f..a937ba2cf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -1,3 +1,10 @@ +/* +Copyright (C) 2022-2024 Pitan + +MCPitanLib is under the MIT license. For more information, please refer to the LICENSE file at the root of the repository. +MCPitanLibはMITライセンスです。ライセンスについてはリポジトリ直下のLICENSEファイルを参照してください。 + */ + package net.pitan76.mcpitanlib; import net.minecraft.util.Identifier; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java new file mode 100644 index 000000000..293cb29c4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java @@ -0,0 +1,90 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; + +public class CompatBlocks { + public static final Block AIR = Blocks.AIR; + public static final Block STONE = Blocks.STONE; + public static final Block COBBLESTONE = Blocks.COBBLESTONE; + public static final Block GRASS_BLOCK = Blocks.GRASS_BLOCK; + public static final Block DIRT = Blocks.DIRT; + public static final Block SAND = Blocks.SAND; + public static final Block RED_SAND = Blocks.RED_SAND; + public static final Block GRANITE = Blocks.GRANITE; + public static final Block POLISHED_GRANITE = Blocks.POLISHED_GRANITE; + public static final Block DIORITE = Blocks.DIORITE; + public static final Block POLISHED_DIORITE = Blocks.POLISHED_DIORITE; + public static final Block ANDESITE = Blocks.ANDESITE; + public static final Block POLISHED_ANDESITE = Blocks.POLISHED_ANDESITE; + public static final Block COARSE_DIRT = Blocks.COARSE_DIRT; + public static final Block PODZOL = Blocks.PODZOL; + + public static final Block OAK_LOG = Blocks.OAK_LOG; + public static final Block SPRUCE_LOG = Blocks.SPRUCE_LOG; + public static final Block BIRCH_LOG = Blocks.BIRCH_LOG; + public static final Block JUNGLE_LOG = Blocks.JUNGLE_LOG; + public static final Block ACACIA_LOG = Blocks.ACACIA_LOG; + public static final Block DARK_OAK_LOG = Blocks.DARK_OAK_LOG; + public static final Block OAK_PLANKS = Blocks.OAK_PLANKS; + public static final Block SPRUCE_PLANKS = Blocks.SPRUCE_PLANKS; + public static final Block BIRCH_PLANKS = Blocks.BIRCH_PLANKS; + public static final Block JUNGLE_PLANKS = Blocks.JUNGLE_PLANKS; + public static final Block ACACIA_PLANKS = Blocks.ACACIA_PLANKS; + public static final Block DARK_OAK_PLANKS = Blocks.DARK_OAK_PLANKS; + public static final Block OAK_SAPLING = Blocks.OAK_SAPLING; + public static final Block SPRUCE_SAPLING = Blocks.SPRUCE_SAPLING; + public static final Block BIRCH_SAPLING = Blocks.BIRCH_SAPLING; + public static final Block JUNGLE_SAPLING = Blocks.JUNGLE_SAPLING; + public static final Block ACACIA_SAPLING = Blocks.ACACIA_SAPLING; + public static final Block DARK_OAK_SAPLING = Blocks.DARK_OAK_SAPLING; + + public static final Block SANDSTONE = Blocks.SANDSTONE; + public static final Block CHISELED_SANDSTONE = Blocks.CHISELED_SANDSTONE; + public static final Block CUT_SANDSTONE = Blocks.CUT_SANDSTONE; + public static final Block NOTE_BLOCK = Blocks.NOTE_BLOCK; + public static final Block POWERED_RAIL = Blocks.POWERED_RAIL; + public static final Block DETECTOR_RAIL = Blocks.DETECTOR_RAIL; + public static final Block PISTON = Blocks.PISTON; + public static final Block STICKY_PISTON = Blocks.STICKY_PISTON; + public static final Block COBWEB = Blocks.COBWEB; + public static final Block GRAVEL = Blocks.GRAVEL; + public static final Block GLASS = Blocks.GLASS; + public static final Block DISPENSER = Blocks.DISPENSER; + + public static final Block COAL_ORE = Blocks.COAL_ORE; + public static final Block IRON_ORE = Blocks.IRON_ORE; + public static final Block COPPER_ORE = Blocks.COPPER_ORE; + public static final Block GOLD_ORE = Blocks.GOLD_ORE; + public static final Block DIAMOND_ORE = Blocks.DIAMOND_ORE; + public static final Block REDSTONE_ORE = Blocks.REDSTONE_ORE; + public static final Block EMERALD_ORE = Blocks.EMERALD_ORE; + public static final Block LAPIS_ORE = Blocks.LAPIS_ORE; + public static final Block NETHER_QUARTZ_ORE = Blocks.NETHER_QUARTZ_ORE; + + public static final Block COAL_BLOCK = Blocks.COAL_BLOCK; + public static final Block IRON_BLOCK = Blocks.IRON_BLOCK; + public static final Block COPPER_BLOCK = Blocks.COPPER_BLOCK; + public static final Block GOLD_BLOCK = Blocks.GOLD_BLOCK; + public static final Block DIAMOND_BLOCK = Blocks.DIAMOND_BLOCK; + public static final Block REDSTONE_BLOCK = Blocks.REDSTONE_BLOCK; + public static final Block EMERALD_BLOCK = Blocks.EMERALD_BLOCK; + public static final Block LAPIS_BLOCK = Blocks.LAPIS_BLOCK; + public static final Block QUARTZ_BLOCK = Blocks.QUARTZ_BLOCK; + + public static final Block TNT = Blocks.TNT; + public static final Block BOOKSHELF = Blocks.BOOKSHELF; + public static final Block OBSIDIAN = Blocks.OBSIDIAN; + public static final Block TORCH = Blocks.TORCH; + public static final Block WALL_TORCH = Blocks.WALL_TORCH; + public static final Block FIRE = Blocks.FIRE; + public static final Block SOUL_FIRE = Blocks.SOUL_FIRE; + public static final Block SPAWNER = Blocks.SPAWNER; + public static final Block OAK_STAIRS = Blocks.OAK_STAIRS; + public static final Block CHEST = Blocks.CHEST; + public static final Block REDSTONE_WIRE = Blocks.REDSTONE_WIRE; + + public static final Block WATER = Blocks.WATER; + public static final Block LAVA = Blocks.LAVA; + public static final Block BEDROCK = Blocks.BEDROCK; +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java index 943a3665e..f2525aed6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.registry; import net.minecraft.nbt.NbtCompound; +import net.minecraft.registry.BuiltinRegistries; import net.minecraft.registry.RegistryWrapper; import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; @@ -13,6 +14,10 @@ public CompatRegistryLookup(RegistryWrapper.WrapperLookup registryLookup) { this.registryLookup = registryLookup; } + public CompatRegistryLookup() { + this.registryLookup = BuiltinRegistries.createWrapperLookup(); + } + @Deprecated public RegistryWrapper.WrapperLookup getRegistryLookup() { return registryLookup; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java index 66873fc56..f5dc51bb4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/FuelRegistry.java @@ -19,9 +19,13 @@ public static void register(Supplier itemSupplier, int time, St @Deprecated public static void allRegister(String namespace) { + if (!FUEL_MAP.containsKey(namespace)) return; + Map, Integer> map = FUEL_MAP.get(namespace); for (Map.Entry, Integer> entry : map.entrySet()) { net.pitan76.mcpitanlib.core.registry.FuelRegistry.register(entry.getValue(), entry.getKey().get()); } + + FUEL_MAP.remove(namespace); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 7c022c61e..9502171ba 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -140,5 +140,6 @@ public void registerFuel(Supplier itemSupplier, int time) { public void allRegister() { cr1.allRegister(); + FuelRegistry.allRegister(cr1.getNamespace()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index 065cb3659..91ddbd793 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -467,4 +467,12 @@ public static UUID getUuidOrDefault(NbtCompound nbt, String key, UUID defaultVal return getUuid(nbt, key); return defaultValue; } + + public static NbtElement getElement(NbtCompound nbt, String key) { + return nbt.get(key); + } + + public static void putElement(NbtCompound nbt, String key, NbtElement element) { + nbt.put(key, element); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/MidohraAPI.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/MidohraAPI.java new file mode 100644 index 000000000..d27730312 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/MidohraAPI.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.midohra; + +/** + * MidohraAPI + * Experimental API of MCPitanLib + * + * @author Pitan + * @version 0.0.1 + * @since 2024.09.28 + */ +public class MidohraAPI { + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java new file mode 100644 index 000000000..3d2bb8fe8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java @@ -0,0 +1,108 @@ +package net.pitan76.mcpitanlib.midohra.item; + +import net.minecraft.item.ItemConvertible; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.enchantment.CompatEnchantment; +import net.pitan76.mcpitanlib.api.util.*; +import org.jetbrains.annotations.Nullable; + +import java.util.Map; + +public class ItemStack { + private final net.minecraft.item.ItemStack stack; + + protected ItemStack(net.minecraft.item.ItemStack stack) { + this.stack = stack; + } + + public static ItemStack of(net.minecraft.item.ItemStack stack) { + if (stack == null) + return new ItemStack(ItemStackUtil.empty()); + + return new ItemStack(stack); + } + + public static ItemStack of(ItemConvertible item) { + return new Builder().item(item).build(); + } + + public static ItemStack of(ItemConvertible item, int count) { + return new Builder().item(item).count(count).build(); + } + + public int getCount() { + return stack.getCount(); + } + + public void setCount(int count) { + stack.setCount(count); + } + + public NbtCompound getNbt() { + return CustomDataUtil.getNbt(stack); + } + + public void setNbt(NbtCompound nbt) { + CustomDataUtil.setNbt(stack, nbt); + } + + public CompatIdentifier getItemId() { + return ItemUtil.toCompatID(stack.getItem()); + } + + public ItemStack copy() { + return new ItemStack(stack.copy()); + } + + public Map getEnchantments(@Nullable World world) { + return EnchantmentUtil.getEnchantment(stack, world); + } + + public void setEnchantments(Map enchantments, @Nullable World world) { + EnchantmentUtil.setEnchantment(stack, enchantments, world); + } + + @Deprecated + public net.minecraft.item.ItemStack toMinecraft() { + return stack; + } + + public static class Builder { + + protected CompatIdentifier id; + protected int count = 1; + protected NbtCompound nbt = NbtUtil.create(); + + public Builder() { + + } + + public Builder item(CompatIdentifier id) { + this.id = id; + return this; + } + + public Builder item(ItemConvertible item) { + this.id = ItemUtil.toCompatID(item.asItem()); + return this; + } + + public Builder count(int count) { + this.count = count; + return this; + } + + public Builder nbt(NbtCompound nbt) { + this.nbt = nbt; + return this; + } + + public ItemStack build() { + net.minecraft.item.ItemStack stack = new net.minecraft.item.ItemStack(ItemUtil.fromId(id), count); + CustomDataUtil.setNbt(stack, nbt); + + return new ItemStack(stack); + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/ElementConvertible.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/ElementConvertible.java new file mode 100644 index 000000000..d92a636ac --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/ElementConvertible.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.midohra.nbt; + +public interface ElementConvertible { + NbtElement toElement(); + + default net.minecraft.nbt.NbtElement toMinecraftNbtElement() { + return toElement().toMinecraft(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java new file mode 100644 index 000000000..9b633984d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java @@ -0,0 +1,147 @@ +package net.pitan76.mcpitanlib.midohra.nbt; + +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.NbtUtil; +import net.pitan76.mcpitanlib.midohra.item.ItemStack; + +import java.util.UUID; + +@SuppressWarnings("deprecation") +public class NbtCompound implements ElementConvertible { + protected final net.minecraft.nbt.NbtCompound nbt; + + protected NbtCompound(net.minecraft.nbt.NbtCompound nbt) { + this.nbt = nbt; + } + + public static NbtCompound of(net.minecraft.nbt.NbtCompound nbt) { + return new NbtCompound(nbt); + } + + public static NbtCompound of() { + return new NbtCompound(NbtUtil.create()); + } + + public NbtCompound copy() { + return new NbtCompound(NbtUtil.copy(nbt)); + } + + public boolean has(String key) { + return NbtUtil.has(nbt, key); + } + + public void putByte(String key, byte value) { + NbtUtil.putByte(nbt, key, value); + } + + public byte getByte(String key) { + return NbtUtil.getByte(nbt, key); + } + + public void putShort(String key, short value) { + NbtUtil.putShort(nbt, key, value); + } + + public short getShort(String key) { + return NbtUtil.getShort(nbt, key); + } + + public void putInt(String key, int value) { + NbtUtil.putInt(nbt, key, value); + } + + public int getInt(String key) { + return NbtUtil.getInt(nbt, key); + } + + public void putLong(String key, long value) { + NbtUtil.putLong(nbt, key, value); + } + + public long getLong(String key) { + return NbtUtil.getLong(nbt, key); + } + + public void putFloat(String key, float value) { + NbtUtil.putFloat(nbt, key, value); + } + + public float getFloat(String key) { + return NbtUtil.getFloat(nbt, key); + } + + public void putDouble(String key, double value) { + NbtUtil.putDouble(nbt, key, value); + } + + public double getDouble(String key) { + return NbtUtil.getDouble(nbt, key); + } + + public void putString(String key, String value) { + NbtUtil.putString(nbt, key, value); + } + + public String getString(String key) { + return NbtUtil.getString(nbt, key); + } + + public void putBoolean(String key, boolean value) { + NbtUtil.putBoolean(nbt, key, value); + } + + public boolean getBoolean(String key) { + return NbtUtil.getBoolean(nbt, key); + } + + public void putUuid(String key, UUID value) { + NbtUtil.putUuid(nbt, key, value); + } + + public UUID getUuid(String key) { + return NbtUtil.getUuid(nbt, key); + } + + public void putItemStack(String key, net.pitan76.mcpitanlib.midohra.item.ItemStack stack, CompatRegistryLookup registryLookup) { + NbtUtil.putItemStack(nbt, key, stack.toMinecraft(), registryLookup); + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getItemStack(String key, CompatRegistryLookup registryLookup) { + return ItemStack.of(NbtUtil.getItemStack(nbt, key, registryLookup).get()); + } + + public void put(String key, NbtCompound compound) { + NbtUtil.put(nbt, key, compound.nbt); + } + + public void put(String key, net.minecraft.nbt.NbtCompound nbt) { + NbtUtil.put(this.nbt, key, nbt); + } + + public void put(String key, ElementConvertible element) { + NbtUtil.put(nbt, key, element.toMinecraftNbtElement()); + } + + public NbtCompound getCompound(String key) { + return new NbtCompound(NbtUtil.get(nbt, key)); + } + + public NbtElement get(String key) { + return NbtElement.of(NbtUtil.getElement(nbt, key)); + } + + @Deprecated + public net.minecraft.nbt.NbtCompound toMinecraft() { + return nbt; + } + + @Override + public String toString() { + return nbt.toString(); + } + + @Override + public NbtElement toElement() { + return NbtElement.of(nbt); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java new file mode 100644 index 000000000..203a5f6c8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java @@ -0,0 +1,46 @@ +package net.pitan76.mcpitanlib.midohra.nbt; + +import net.minecraft.nbt.NbtType; + +public class NbtElement implements ElementConvertible { + protected final net.minecraft.nbt.NbtElement nbt; + + protected NbtElement(net.minecraft.nbt.NbtElement nbt) { + this.nbt = nbt; + } + + public static NbtElement of(net.minecraft.nbt.NbtElement nbt) { + return new NbtElement(nbt); + } + + public NbtElement copy() { + return new NbtElement(nbt.copy()); + } + + public byte getType() { + return nbt.getType(); + } + + public NbtType getNbtType() { + return nbt.getNbtType(); + } + + public int getSizeInBytes() { + return nbt.getSizeInBytes(); + } + + @Override + public String toString() { + return nbt.toString(); + } + + @Deprecated + public net.minecraft.nbt.NbtElement toMinecraft() { + return nbt; + } + + @Override + public NbtElement toElement() { + return this; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java new file mode 100644 index 000000000..b41c0aa6c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java @@ -0,0 +1,111 @@ +package net.pitan76.mcpitanlib.midohra.nbt; + +import java.util.AbstractList; +import java.util.Optional; + +@SuppressWarnings("deprecation") +public class NbtList extends AbstractList implements ElementConvertible { + protected final net.minecraft.nbt.NbtList nbtList; + + protected NbtList(net.minecraft.nbt.NbtList nbtList) { + this.nbtList = nbtList; + } + + public static NbtList of(net.minecraft.nbt.NbtList nbtList) { + return new NbtList(nbtList); + } + + public static Optional ofOptional(NbtElement nbtElement) { + if (nbtElement.toMinecraft() instanceof net.minecraft.nbt.NbtList) + return Optional.of(new NbtList((net.minecraft.nbt.NbtList) nbtElement.toMinecraft())); + + return Optional.empty(); + } + + public NbtList copy() { + return new NbtList(nbtList.copy()); + } + + @Override + public int size() { + return nbtList.size(); + } + + public byte getType() { + return nbtList.getType(); + } + + @Override + public NbtElement get(int index) { + return NbtElement.of(nbtList.get(index)); + } + + public boolean add(net.minecraft.nbt.NbtElement nbtElement) { + return nbtList.add(nbtElement); + } + + @Override + public boolean add(NbtElement nbtElement) { + return add(nbtElement.toMinecraft()); + } + + public void add(int index, net.minecraft.nbt.NbtElement nbtElement) { + nbtList.add(index, nbtElement); + } + + @Override + public void add(int index, NbtElement nbtElement) { + add(index, nbtElement.toMinecraft()); + } + + @Override + public NbtElement set(int index, NbtElement element) { + return NbtElement.of(nbtList.set(index, element.toMinecraft())); + } + + @Override + public NbtElement remove(int index) { + return NbtElement.of(nbtList.remove(index)); + } + + @Override + public boolean isEmpty() { + return nbtList.isEmpty(); + } + + @Override + public void clear() { + nbtList.clear(); + } + + public String asString() { + return nbtList.asString(); + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + + return o instanceof NbtList && nbtList.equals(((NbtList) o).nbtList); + } + + @Override + public int hashCode() { + return nbtList.hashCode(); + } + + @Override + public String toString() { + return nbtList.toString(); + } + + @Deprecated + public net.minecraft.nbt.NbtList toMinecraft() { + return nbtList; + } + + @Override + public NbtElement toElement() { + return NbtElement.of(nbtList); + } +} diff --git a/info.properties b/info.properties index 3aeb94b5b..7f35ea995 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.6 +mod_version=2.4.7 maven_group=net.pitan76 \ No newline at end of file From 97ae06785566c1481fc95e6ee0a7bfaa09a09f39 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 28 Sep 2024 22:37:34 +0900 Subject: [PATCH 393/622] update compatdatapacks --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 377c84a69..8247cd7fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,7 +25,7 @@ neoforge_version=21.0.42-beta cloth_config_version=15.0.127 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.9.210 +compatdatapacks76_version=1.0.10.210 fabricEnabled=true forgeEnabled=false From 4962e91b98cbc40fa7f25767b361059f2085a27e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 28 Sep 2024 22:37:43 +0900 Subject: [PATCH 394/622] fix registrylookup --- .../pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java index f2525aed6..e4504a62b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java @@ -20,6 +20,9 @@ public CompatRegistryLookup() { @Deprecated public RegistryWrapper.WrapperLookup getRegistryLookup() { + if (registryLookup == null) + return BuiltinRegistries.createWrapperLookup(); + return registryLookup; } From 26a081c16e45dd2e26396711b5fe0a1f0883e21d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 28 Sep 2024 23:09:53 +0900 Subject: [PATCH 395/622] add APIs --- .../api/event/item/ItemUseOnBlockEvent.java | 4 ++ .../api/event/item/ItemUseOnEntityEvent.java | 7 +++ .../sided/ChestStyleSidedInventory.java | 10 +++++ .../inventory/sided/CompatSidedInventory.java | 35 +++++++++++++++ .../sided/VanillaStyleSidedInventory.java | 20 +++++++++ .../sided/args/AvailableSlotsArgs.java | 38 ++++++++++++++++ .../inventory/sided/args/CanExtractArgs.java | 32 ++++++++++++++ .../inventory/sided/args/CanInsertArgs.java | 35 +++++++++++++++ .../mcpitanlib/api/util/InteractUtil.java | 43 +++++++++++++++++++ .../mcpitanlib/api/util/WorldUtil.java | 14 +++++- info.properties | 2 +- 11 files changed, 237 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/ChestStyleSidedInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/CompatSidedInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/VanillaStyleSidedInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/AvailableSlotsArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanExtractArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanInsertArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java index 6db0b29f3..583a4a4fb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java @@ -39,6 +39,10 @@ public ItemUseOnBlockEvent(World world, @Nullable PlayerEntity player, Hand hand this.blockPos = hit.getBlockPos(); } + public ItemUseOnBlockEvent(Player player, Hand hand, BlockHitResult hit) { + this(player.getWorld(), player.getEntity(), hand, player.getStackInHand(hand), hit); + } + public ItemUsageContext toIUC() { return new ItemUsageContext(player.getPlayerEntity(), hand, hit); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java index c3dd5aa68..879d27d4c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java @@ -22,6 +22,13 @@ public ItemUseOnEntityEvent(ItemStack stack, PlayerEntity user, LivingEntity ent this.entity = entity; } + public ItemUseOnEntityEvent(ItemStack stack, Player user, LivingEntity entity, Hand hand) { + this.stack = stack; + this.user = user; + this.hand = hand; + this.entity = entity; + } + public ItemStack getStack() { return stack; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/ChestStyleSidedInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/ChestStyleSidedInventory.java new file mode 100644 index 000000000..a4cd6f4f3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/ChestStyleSidedInventory.java @@ -0,0 +1,10 @@ +package net.pitan76.mcpitanlib.api.gui.inventory.sided; + +import net.pitan76.mcpitanlib.api.gui.inventory.sided.args.AvailableSlotsArgs; + +public interface ChestStyleSidedInventory extends VanillaStyleSidedInventory { + @Override + default int[] getAvailableSlots(AvailableSlotsArgs args) { + return args.getAllSlots(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/CompatSidedInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/CompatSidedInventory.java new file mode 100644 index 000000000..5f4ce81b3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/CompatSidedInventory.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.gui.inventory.sided; + +import net.minecraft.inventory.SidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.api.gui.inventory.sided.args.AvailableSlotsArgs; +import net.pitan76.mcpitanlib.api.gui.inventory.sided.args.CanExtractArgs; +import net.pitan76.mcpitanlib.api.gui.inventory.sided.args.CanInsertArgs; +import org.jetbrains.annotations.Nullable; + +public interface CompatSidedInventory extends SidedInventory { + @Override + @Deprecated + default int[] getAvailableSlots(Direction side) { + return getAvailableSlots(new AvailableSlotsArgs(side, this)); + } + + int[] getAvailableSlots(AvailableSlotsArgs args); + + @Override + @Deprecated + default boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) { + return canInsert(new CanInsertArgs(slot, stack, dir)); + } + + boolean canInsert(CanInsertArgs args); + + @Override + @Deprecated + default boolean canExtract(int slot, ItemStack stack, Direction dir) { + return canExtract(new CanExtractArgs(slot, stack, dir)); + } + + boolean canExtract(CanExtractArgs args); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/VanillaStyleSidedInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/VanillaStyleSidedInventory.java new file mode 100644 index 000000000..119a59057 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/VanillaStyleSidedInventory.java @@ -0,0 +1,20 @@ +package net.pitan76.mcpitanlib.api.gui.inventory.sided; + +import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.api.gui.inventory.sided.args.CanExtractArgs; +import net.pitan76.mcpitanlib.api.gui.inventory.sided.args.CanInsertArgs; + +public interface VanillaStyleSidedInventory extends CompatSidedInventory { + @Override + default boolean canInsert(CanInsertArgs args) { + if (args.getDir() == null) + return false; + + return args.getDir() != Direction.DOWN; + } + + @Override + default boolean canExtract(CanExtractArgs args) { + return args.getDir() == Direction.DOWN; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/AvailableSlotsArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/AvailableSlotsArgs.java new file mode 100644 index 000000000..748b47420 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/AvailableSlotsArgs.java @@ -0,0 +1,38 @@ +package net.pitan76.mcpitanlib.api.gui.inventory.sided.args; + +import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.api.gui.inventory.sided.CompatSidedInventory; +import net.pitan76.mcpitanlib.api.gui.inventory.IInventory; + +public class AvailableSlotsArgs { + public Direction side; + public CompatSidedInventory inventory; + + public AvailableSlotsArgs(Direction side, CompatSidedInventory inventory) { + this.side = side; + this.inventory = inventory; + } + + public Direction getSide() { + return side; + } + + public CompatSidedInventory getInventory() { + return inventory; + } + + public int[] getAllSlots() { + if (!(inventory instanceof IInventory)) + return new int[0]; + + IInventory inv = (IInventory) inventory; + int size = inv.size(); + + int[] slots = new int[size]; + for (int i = 0; i < size; i++) { + slots[i] = i; + } + + return slots; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanExtractArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanExtractArgs.java new file mode 100644 index 000000000..568dcbe4c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanExtractArgs.java @@ -0,0 +1,32 @@ +package net.pitan76.mcpitanlib.api.gui.inventory.sided.args; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.Direction; + +public class CanExtractArgs { + public int slot; + public ItemStack stack; + public Direction dir; + + public CanExtractArgs(int slot, ItemStack stack, Direction dir) { + this.slot = slot; + this.stack = stack; + this.dir = dir; + } + + public int getSlot() { + return slot; + } + + public ItemStack getStack() { + return stack; + } + + public Direction getDir() { + return dir; + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getStack_midohra() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStack()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanInsertArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanInsertArgs.java new file mode 100644 index 000000000..a6aa1a662 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/inventory/sided/args/CanInsertArgs.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.gui.inventory.sided.args; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.Direction; +import org.jetbrains.annotations.Nullable; + +public class CanInsertArgs { + public int slot; + public ItemStack stack; + + @Nullable + public Direction dir; + + public CanInsertArgs(int slot, ItemStack stack, @Nullable Direction dir) { + this.slot = slot; + this.stack = stack; + this.dir = dir; + } + + public int getSlot() { + return slot; + } + + public ItemStack getStack() { + return stack; + } + + public @Nullable Direction getDir() { + return dir; + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getStack_midohra() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStack()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java new file mode 100644 index 000000000..537c43ad0 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java @@ -0,0 +1,43 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.block.BlockState; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.util.ActionResult; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnEntityEvent; + +public class InteractUtil { + + public static TypedActionResult useItem(Item item, ItemUseEvent event) { + return item.use(event.getWorld(), event.user.getEntity(), event.getHand()); + } + + public static ActionResult useItemOnBlock(Item item, ItemUsageContext context) { + return item.useOnBlock(context); + } + + public static ActionResult useItemOnBlock(Item item, ItemUseOnBlockEvent event) { + return useItemOnBlock(item, event.toIUC()); + } + + public static ActionResult useItemOnEntity(Item item, ItemUseOnEntityEvent event) { + return item.useOnEntity(event.getStack(), event.getUser().getEntity(), event.getEntity(), event.getHand()); + } + + public static ActionResult useBlock(BlockState state, World world, Player player, BlockHitResult hitResult) { + return BlockStateUtil.onUse(state, world, player, hitResult); + } + + public static ActionResult useBlock(BlockState state, World world, Player player, Direction dir, BlockPos blockPos) { + return BlockStateUtil.onUse(state, world, player, dir, blockPos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 927b68990..eb35a7178 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; import net.minecraft.entity.ExperienceOrbEntity; import net.minecraft.entity.ItemEntity; import net.minecraft.entity.player.PlayerEntity; @@ -19,7 +20,6 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; -import net.minecraft.util.TypeFilter; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.ChunkPos; @@ -285,11 +285,21 @@ public static long getTime(World world) { return world.getTime(); } - public static List getEntitiesByType(World world, TypeFilter filter, Box box, Predicate predicate) { + public static List getEntitiesByType(World world, EntityType filter, Box box, Predicate predicate) { return world.getEntitiesByType(filter, box, predicate); } public static List getEntitiesByClass(World world, Class entityClass, Box box, Predicate predicate) { return world.getEntitiesByClass(entityClass, box, predicate); } + + public static void spawnParticles(World world, ParticleEffect parameters, double x, double y, double z, int count, double velocityX, double velocityY, double velocityZ, double speed) { + if (!isServer(world)) return; + + ((ServerWorld) world).spawnParticles(parameters, x, y, z, count, velocityX, velocityY, velocityZ, speed); + } + + public static void updateListeners(World world, BlockPos pos, BlockState oldState, BlockState newState, int flags) { + world.updateListeners(pos, oldState, newState, flags); + } } diff --git a/info.properties b/info.properties index 7f35ea995..06dafdc95 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.7 +mod_version=2.4.8 maven_group=net.pitan76 \ No newline at end of file From 3ae73ded37aa2c61118e2c7d58726f241d1321fd Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 29 Sep 2024 12:38:35 +0900 Subject: [PATCH 396/622] fix registryLookup --- .../java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java | 3 +++ info.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java index 31df3703e..138dd9f2a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java @@ -36,6 +36,9 @@ public boolean hasRegistryLookup() { @Deprecated public RegistryWrapper.WrapperLookup getWrapperLookup() { + if (registryLookup == null) + registryLookup = new CompatRegistryLookup(); + return registryLookup.getRegistryLookup(); } } diff --git a/info.properties b/info.properties index 06dafdc95..89bb518f2 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.8 +mod_version=2.4.8-fix.1 maven_group=net.pitan76 \ No newline at end of file From be51f4c23ff1c3d1ea6e346c850c12f89c92cb7a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 29 Sep 2024 17:22:46 +0900 Subject: [PATCH 397/622] fix WorldRenderRegistryImpl --- .../event/neoforge/WorldRenderRegistryImpl.java | 11 +---------- .../mcpitanlib/neoforge/MCPitanLibNeoForge.java | 8 ++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java index dc6d92392..1143f4ca7 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java @@ -4,14 +4,9 @@ import net.minecraft.client.render.*; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.world.ClientWorld; -import net.minecraft.util.hit.HitResult; import net.minecraft.util.profiler.Profiler; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RenderHighlightEvent; import net.neoforged.neoforge.client.event.RenderLevelStageEvent; -import net.pitan76.mcpitanlib.MCPitanLib; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineEvent; import net.pitan76.mcpitanlib.api.client.event.listener.BeforeBlockOutlineListener; import net.pitan76.mcpitanlib.api.client.event.listener.WorldRenderContext; @@ -21,13 +16,11 @@ import java.util.ArrayList; import java.util.List; -@EventBusSubscriber(modid = MCPitanLib.MOD_ID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) public class WorldRenderRegistryImpl { public static List beforeBlockOutlineListeners = new ArrayList<>(); public static List worldRenderAfterLevelListeners = new ArrayList<>(); - @SubscribeEvent public static void renderOutlineEventBlock(RenderHighlightEvent.Block event) { for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { boolean eventContinue = listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { @@ -101,7 +94,6 @@ public Frustum getFrustum() { } } - @SubscribeEvent public static void renderOutlineEvent(RenderHighlightEvent.Entity event) { for (BeforeBlockOutlineListener listener : beforeBlockOutlineListeners) { listener.beforeBlockOutline(new BeforeBlockOutlineEvent(new WorldRenderContext() { @@ -170,8 +162,7 @@ public Frustum getFrustum() { } } - @SubscribeEvent - public static void registerWorldRenderAfterLevel(RenderLevelStageEvent event) { + public static void renderLevelStageEvent(RenderLevelStageEvent event) { if (!event.getStage().equals(RenderLevelStageEvent.Stage.AFTER_LEVEL)) return; for (WorldRenderContextListener listener : worldRenderAfterLevelListeners) { diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index 0052b3525..362d3d883 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -4,12 +4,20 @@ import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; import net.pitan76.mcpitanlib.MCPitanLib; +import net.pitan76.mcpitanlib.api.client.event.neoforge.WorldRenderRegistryImpl; +import net.pitan76.mcpitanlib.api.util.PlatformUtil; @Mod(MCPitanLib.MOD_ID) public class MCPitanLibNeoForge { public MCPitanLibNeoForge(ModContainer modContainer) { IEventBus bus = modContainer.getEventBus(); + if (PlatformUtil.isClient()) { + bus.addListener(WorldRenderRegistryImpl::renderOutlineEventBlock); + bus.addListener(WorldRenderRegistryImpl::renderOutlineEvent); + bus.addListener(WorldRenderRegistryImpl::renderLevelStageEvent); + } + MCPitanLib.init(); } } \ No newline at end of file From 4008d6f604982e6b24cae98011d4fb3970e5e46c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 29 Sep 2024 17:27:39 +0900 Subject: [PATCH 398/622] fix neoforge --- info.properties | 2 +- .../pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/info.properties b/info.properties index 89bb518f2..02713f6f0 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.8-fix.1 +mod_version=2.4.8-fix.2 maven_group=net.pitan76 \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index 362d3d883..0d9370d0b 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -3,6 +3,7 @@ import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.common.NeoForge; import net.pitan76.mcpitanlib.MCPitanLib; import net.pitan76.mcpitanlib.api.client.event.neoforge.WorldRenderRegistryImpl; import net.pitan76.mcpitanlib.api.util.PlatformUtil; @@ -13,9 +14,10 @@ public MCPitanLibNeoForge(ModContainer modContainer) { IEventBus bus = modContainer.getEventBus(); if (PlatformUtil.isClient()) { - bus.addListener(WorldRenderRegistryImpl::renderOutlineEventBlock); - bus.addListener(WorldRenderRegistryImpl::renderOutlineEvent); - bus.addListener(WorldRenderRegistryImpl::renderLevelStageEvent); + IEventBus nfBus = NeoForge.EVENT_BUS; + nfBus.addListener(WorldRenderRegistryImpl::renderOutlineEventBlock); + nfBus.addListener(WorldRenderRegistryImpl::renderOutlineEvent); + nfBus.addListener(WorldRenderRegistryImpl::renderLevelStageEvent); } MCPitanLib.init(); From adcc2c3ff2325fc7ab7b89bc221642b047be7ffd Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sat, 13 Jul 2024 19:56:49 +0900 Subject: [PATCH 399/622] Add APIs --- .../net/pitan76/easyapi/config/Config.java | 3 + .../api/client/CompatInventoryScreen.java | 1 + .../api/client/SimpleHandledScreen.java | 1 + .../api/client/SimpleInventoryScreen.java | 1 + .../gui/screen/CompatInventoryScreen.java | 21 ++ .../gui/screen/SimpleHandledScreen.java | 290 ++++++++++++++++++ .../gui/screen/SimpleInventoryScreen.java | 38 +++ .../api/gui/slot/CompatibleSlot.java | 20 ++ .../api/registry/v2/CompatRegistryV2.java | 6 + .../mcpitanlib/api/util/EntityUtil.java | 5 + .../api/util/collection/ItemStackList.java | 11 +- .../api/util/inventory/CompatInventory.java | 104 +++++++ .../util/inventory/args/CanInsertArgs.java | 23 ++ .../api/util/recipe/RecipeMatcherUtil.java | 37 +++ info.properties | 2 +- 15 files changed, 561 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleInventoryScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/args/CanInsertArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java diff --git a/common/src/main/java/net/pitan76/easyapi/config/Config.java b/common/src/main/java/net/pitan76/easyapi/config/Config.java index b4718da00..cdbabbcc1 100644 --- a/common/src/main/java/net/pitan76/easyapi/config/Config.java +++ b/common/src/main/java/net/pitan76/easyapi/config/Config.java @@ -37,6 +37,9 @@ public Config(Config config) { }; public boolean has(String key) { + if (configMap == null) + return false; + return configMap.containsKey(key); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/CompatInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/CompatInventoryScreen.java index 64cef2c47..28fd67071 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/CompatInventoryScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/CompatInventoryScreen.java @@ -6,6 +6,7 @@ import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +@Deprecated public abstract class CompatInventoryScreen extends SimpleInventoryScreen { public CompatInventoryScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 90eb1e0e3..1948aaa5f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -21,6 +21,7 @@ import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; +@Deprecated public abstract class SimpleHandledScreen extends HandledScreen { public int width, height, backgroundWidth, backgroundHeight, x, y; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java index 2a6322b7d..de34a65fc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleInventoryScreen.java @@ -9,6 +9,7 @@ import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; +@Deprecated public abstract class SimpleInventoryScreen extends SimpleHandledScreen { public SimpleInventoryScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java new file mode 100644 index 000000000..b04909c11 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.client.gui.screen; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public abstract class CompatInventoryScreen extends SimpleInventoryScreen { + + public CompatInventoryScreen(S handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + public abstract CompatIdentifier getCompatTexture(); + + @Override + public Identifier getTexture() { + return getCompatTexture().toMinecraft(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java new file mode 100644 index 000000000..fa9d6ee79 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -0,0 +1,290 @@ +package net.pitan76.mcpitanlib.api.client.gui.screen; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.Drawable; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.render.item.ItemRenderer; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; +import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.client.ClientUtil; +import net.pitan76.mcpitanlib.api.util.client.RenderUtil; + +public abstract class SimpleHandledScreen extends HandledScreen { + + public int width, height, backgroundWidth, backgroundHeight, x, y; + public S handler; + public TextRenderer textRenderer; + public ItemRenderer itemRenderer; + + public Text title; + public MinecraftClient client; + public SimpleHandledScreen(S handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + fixScreen(); + this.handler = handler; + this.title = title; + + } + + @Deprecated + @Override + public S getScreenHandler() { + return getScreenHandlerOverride(); + } + + public S getScreenHandlerOverride() { + return super.getScreenHandler(); + } + + public T addDrawableChild_compatibility(T drawableElement) { + return super.addDrawableChild(drawableElement); + // addButton + } + + public T addSelectableChild_compatibility(T selectableElement) { + return super.addSelectableChild(selectableElement); + } + + public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWidget widget) { + return addDrawableChild_compatibility(widget); + } + + @Deprecated + @Override + protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { + DrawObjectDM drawObjectDM = new DrawObjectDM(context); + drawBackgroundOverride(new DrawBackgroundArgs(drawObjectDM, delta, mouseX, mouseY)); + } + + public abstract void drawBackgroundOverride(DrawBackgroundArgs args); + + @Deprecated + @Override + protected void drawForeground(DrawContext context, int mouseX, int mouseY) { + DrawObjectDM drawObjectDM = new DrawObjectDM(context); + drawForegroundOverride(new DrawForegroundArgs(drawObjectDM, mouseX, mouseY)); + } + + protected void drawForegroundOverride(DrawForegroundArgs args) { + super.drawForeground(args.drawObjectDM.getContext(), args.mouseX, args.mouseY); + } + + public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { + //ScreenUtil.setBackground(GUI); + //super.drawTexture(matrices, x, y, u, v, width, height); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); + } + + public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { + callDrawTexture(drawObjectDM, texture.toMinecraft(), x, y, u, v, width, height); + } + + @Deprecated + public void callRenderBackground(DrawObjectDM drawObjectDM) { + callRenderBackground(new RenderArgs(drawObjectDM, 0, 0, 0)); + } + + + public void callRenderBackground(RenderArgs args) { + super.renderBackground(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } + + public void callDrawMouseoverTooltip(DrawMouseoverTooltipArgs args) { + super.drawMouseoverTooltip(args.drawObjectDM.getContext(), args.mouseX, args.mouseY); + } + + public void renderOverride(RenderArgs args) { + super.render(args.drawObjectDM.getContext(), args.mouseX, args.mouseY, args.delta); + } + + public void resizeOverride(MinecraftClient client, int width, int height) { + } + + public void initOverride() { + } + + @Deprecated + @Override + protected void init() { + super.init(); + fixScreen(); + initOverride(); + } + + @Deprecated + @Override + public void resize(MinecraftClient client, int width, int height) { + super.resize(client, width, height); + fixScreen(); + resizeOverride(client, width, height); + } + + public void fixScreen() { + this.backgroundWidth = getBackgroundWidth(); + this.backgroundHeight = getBackgroundHeight(); + this.x = super.x; //(this.width - this.backgroundWidth) / 2; + this.y = super.y; //(this.height - this.backgroundHeight) / 2; + this.textRenderer = super.textRenderer; + this.itemRenderer = MinecraftClient.getInstance().getItemRenderer(); + this.width = super.width; + this.height = super.height; + if (super.client == null) + this.client = MinecraftClient.getInstance(); + else + this.client = super.client; + } + + public void setX(int x) { + this.x = x; + super.x = x; + } + + public void setY(int y) { + this.y = y; + super.y = y; + } + + public void setTextRenderer(TextRenderer textRenderer) { + this.textRenderer = textRenderer; + super.textRenderer = textRenderer; + } + + public void setItemRenderer(ItemRenderer itemRenderer) { + this.itemRenderer = itemRenderer; + } + + public void setWidth(int width) { + this.width = width; + super.width = width; + } + + public void setBackgroundWidth(int backgroundWidth) { + this.backgroundWidth = backgroundWidth; + super.backgroundWidth = backgroundWidth; + } + + public void setBackgroundHeight(int backgroundHeight) { + this.backgroundHeight = backgroundHeight; + super.backgroundHeight = backgroundHeight; + } + + public void setHeight(int height) { + this.height = height; + super.height = height; + } + + public int getBackgroundWidth() { + return super.backgroundWidth; + } + + public int getBackgroundHeight() { + return super.backgroundHeight; + } + + @Deprecated + @Override + public void render(DrawContext context, int mouseX, int mouseY, float delta) { + DrawObjectDM drawObjectDM = new DrawObjectDM(context); + renderOverride(new RenderArgs(drawObjectDM, mouseX, mouseY, delta)); + } + + public boolean keyReleased(KeyEventArgs args) { + return super.keyReleased(args.keyCode, args.scanCode, args.modifiers); + } + + public boolean keyPressed(KeyEventArgs args) { + return super.keyPressed(args.keyCode, args.scanCode, args.modifiers); + } + + public void renderBackgroundTexture(RenderBackgroundTextureArgs args) { + if (getBackgroundTexture() != null) + Screen.renderBackgroundTexture(args.getDrawObjectDM().getContext(), getBackgroundTexture(), x, y, 0, 0, this.width, this.height); + + RenderUtil.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + callDrawTexture(args.drawObjectDM, getBackgroundTexture(), 0, 0, 0, 0, width, height); + } + + @Deprecated + @Override + public boolean keyReleased(int keyCode, int scanCode, int modifiers) { + return this.keyReleased(new KeyEventArgs(keyCode, scanCode, modifiers)); + } + + @Deprecated + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + return this.keyPressed(new KeyEventArgs(keyCode, scanCode, modifiers)); + } + + @Deprecated + @Override + public void renderDarkening(DrawContext context) { + this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); + } + + public void closeOverride() { + super.close(); + } + + public void removedOverride() { + super.removed(); + } + + @Override + public void close() { + closeOverride(); + } + + @Override + public void removed() { + removedOverride(); + } + + public Identifier getBackgroundTexture() { + return getCompatBackgroundTexture().toMinecraft(); + } + + public CompatIdentifier getCompatBackgroundTexture() { + return null; + } + + public void setTitleX(int x) { + this.titleX = x; + } + + public void setTitleY(int y) { + this.titleY = y; + } + + public void setTitlePos(int x, int y) { + setTitleX(x); + setTitleY(y); + } + + public void setTitleXCenter() { + if (textRenderer == null) + textRenderer = ClientUtil.getTextRenderer(); + + setTitleX(backgroundWidth / 2 - textRenderer.getWidth(title) / 2); + } + + public int getTitleX() { + return titleX; + } + + public int getTitleY() { + return titleY; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleInventoryScreen.java new file mode 100644 index 000000000..daa47269d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleInventoryScreen.java @@ -0,0 +1,38 @@ +package net.pitan76.mcpitanlib.api.client.gui.screen; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; +import net.pitan76.mcpitanlib.api.util.client.RenderUtil; + +public abstract class SimpleInventoryScreen extends SimpleHandledScreen { + + public SimpleInventoryScreen(S handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + public abstract Identifier getTexture(); + + @Override + public Identifier getBackgroundTexture() { + return getTexture(); + } + + @Override + public void drawBackgroundOverride(DrawBackgroundArgs args) { + RenderUtil.setShaderToPositionTexProgram(); + RenderUtil.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + callDrawTexture(args.drawObjectDM, getTexture(), x, y, 0, 0, backgroundWidth, backgroundHeight); + } + + @Override + public void renderOverride(RenderArgs args) { + this.callRenderBackground(args); + super.renderOverride(args); + this.callDrawMouseoverTooltip(new DrawMouseoverTooltipArgs(args.drawObjectDM, args.mouseX, args.mouseY)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java index 1a8bea116..861cc2b32 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java @@ -1,8 +1,10 @@ package net.pitan76.mcpitanlib.api.gui.slot; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; +import net.pitan76.mcpitanlib.api.entity.Player; public class CompatibleSlot extends Slot { public CompatibleSlot(Inventory inventory, int index, int x, int y) { @@ -82,4 +84,22 @@ public int callGetY() { public void callMarkDirty() { super.markDirty(); } + + @Override + public boolean canInsert(ItemStack stack) { + return canInsert(net.pitan76.mcpitanlib.midohra.item.ItemStack.of(stack)); + } + + @Override + public boolean canTakeItems(PlayerEntity playerEntity) { + return canTakeItems(new Player(playerEntity)); + } + + public boolean canInsert(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return super.canInsert(stack.toMinecraft()); + } + + public boolean canTakeItems(Player player) { + return super.canTakeItems(player.getEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 9502171ba..71bb03aba 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -9,6 +9,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.particle.ParticleType; +import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; import net.pitan76.mcpitanlib.api.block.ExtendBlock; @@ -82,6 +83,11 @@ public RegistryResult> registerScreenHandlerType(CompatIden return cr1.registerScreenHandlerType(id.toMinecraft(), supplier); } + public Supplier> registerScreenHandlerTypeSavingGenerics(CompatIdentifier id, Supplier> supplier) { + RegistryResult> result = cr1.registerScreenHandlerType(id.toMinecraft(), supplier::get); + return () -> (ScreenHandlerType) result.getOrNull(); + } + public RegistryResult> registerBlockEntityType(CompatIdentifier id, Supplier> supplier) { return cr1.registerBlockEntityType(id.toMinecraft(), supplier); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 2edc19edc..f22aa08e4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -3,6 +3,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.util.BlockRotation; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; @@ -147,4 +148,8 @@ public static Entity getVehicle(Entity entity) { public static void setVehicle(Entity entity, Entity vehicle) { entity.startRiding(vehicle, true); } + + public static void applyRotation(Entity entity, BlockRotation rotation) { + entity.applyRotation(rotation); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java index 06123d5e9..3e2f4a341 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java @@ -23,7 +23,7 @@ public static ItemStackList of() { } public static ItemStackList ofSize(int size) { - return new ItemStackList(Lists.newArrayListWithCapacity(size), ItemStackUtil.empty()); + return ofSize(size, ItemStackUtil.empty()); } public static ItemStackList ofSize(int size, ItemStack defaultStack) { @@ -61,4 +61,13 @@ public Inventory toInventory() { public DefaultedList defaultedList() { return this; } + + public static ItemStackList of(DefaultedList defaultedList) { + ItemStackList stacks = ItemStackList.ofSize(defaultedList.size()); + for (int i = 0; i < defaultedList.size(); i++) { + stacks.set(i , defaultedList.get(i)); + } + + return stacks; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java index 9d9261455..bdd0a8fea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java @@ -1,8 +1,18 @@ package net.pitan76.mcpitanlib.api.util.inventory; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; +import net.pitan76.mcpitanlib.api.util.inventory.args.CanInsertArgs; +import net.pitan76.mcpitanlib.midohra.nbt.NbtList; + +import java.util.List; public class CompatInventory extends SimpleInventory { public CompatInventory(int size) { @@ -42,4 +52,98 @@ public ItemStack removeStack(int slot) { public ItemStack removeItem(Item item, int count) { return super.removeItem(item, count); } + + @Deprecated + @Override + public void onOpen(PlayerEntity player) { + onOpen(new Player(player)); + } + + @Deprecated + @Override + public void onClose(PlayerEntity player) { + onClose(new Player(player)); + } + + @Deprecated + @Override + public net.minecraft.nbt.NbtList toNbtList(RegistryWrapper.WrapperLookup registries) { + return toNbtList(new CompatRegistryLookup(registries)).toMinecraft(); + } + + @Deprecated + @Override + public void readNbtList(net.minecraft.nbt.NbtList list, RegistryWrapper.WrapperLookup registries) { + readNbtList(NbtList.of(list), new CompatRegistryLookup(registries)); + } + + @Deprecated + @Override + public boolean canPlayerUse(PlayerEntity player) { + return canPlayerUse(new Player(player)); + } + + @Deprecated + @Override + public boolean canInsert(ItemStack stack) { + return canInsert(new CanInsertArgs(stack)); + } + + public void onOpen(Player player) { + super.onOpen(player.getEntity()); + } + + public void onClose(Player player) { + super.onClose(player.getEntity()); + } + + public NbtList toNbtList(CompatRegistryLookup registries) { + return NbtList.of(super.toNbtList(registries.getRegistryLookup())); + } + + public void readNbtList(NbtList list, CompatRegistryLookup registries) { + super.readNbtList(list.toMinecraft(), registries.getRegistryLookup()); + } + + public boolean canPlayerUse(Player player) { + return true; + } + + public boolean canInsert(CanInsertArgs args) { + return super.canInsert(args.getMcStack()); + } + + @Deprecated + @Override + public List clearToList() { + return callClearToList(); + } + + public List callClearToList() { + return super.clearToList(); + } + + @Deprecated + @Override + public DefaultedList getHeldStacks() { + return callGetHeldStacks(); + } + + public DefaultedList callGetHeldStacks() { + return super.getHeldStacks(); + } + + public ItemStackList callGetHeldStacksAsItemStackList() { + return ItemStackList.of(callGetHeldStacks()); + } + + @Deprecated + @Override + public ItemStack getStack(int slot) { + return callGetStack(slot); + } + + public ItemStack callGetStack(int slot) { + return super.getStack(slot); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/args/CanInsertArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/args/CanInsertArgs.java new file mode 100644 index 000000000..aeb15f5e9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/args/CanInsertArgs.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.util.inventory.args; + +import net.pitan76.mcpitanlib.midohra.item.ItemStack; + +public class CanInsertArgs { + public ItemStack stack; + + public CanInsertArgs(ItemStack stack) { + this.stack = stack; + } + + public CanInsertArgs(net.minecraft.item.ItemStack stack) { + this(ItemStack.of(stack)); + } + + public ItemStack getStack() { + return stack; + } + + public net.minecraft.item.ItemStack getMcStack() { + return stack.toMinecraft(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java new file mode 100644 index 000000000..6143cfd33 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java @@ -0,0 +1,37 @@ +package net.pitan76.mcpitanlib.api.util.recipe; + +import it.unimi.dsi.fastutil.ints.IntList; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeMatcher; +import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; + +public class RecipeMatcherUtil { + public static ItemStack getStackFromId(int itemId) { + return RecipeMatcher.getStackFromId(itemId); + } + + public static int getItemId(ItemStack stack) { + return RecipeMatcher.getItemId(stack); + } + + public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output) { + return match(matcher, entry.getRecipe(), output); + } + + public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output, int multiplier) { + return match(matcher, entry.getRecipe(), output, multiplier); + } + + public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output) { + return matcher.match(recipe, output); + } + + public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output, int multiplier) { + return matcher.match(recipe, output, multiplier); + } + + public static void clear(RecipeMatcher matcher) { + matcher.clear(); + } +} diff --git a/info.properties b/info.properties index 02713f6f0..72bd01d2a 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.8-fix.2 +mod_version=2.4.9 maven_group=net.pitan76 \ No newline at end of file From 02c1d75331fee08b90f2f49221ba41a362a492e6 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 6 Oct 2024 16:04:43 +0900 Subject: [PATCH 400/622] add APIs --- .../net/pitan76/mcpitanlib/MCPitanLib.java | 11 ++- .../gui/screen/CompatInventoryScreen.java | 12 +++ .../gui/screen/SimpleHandledScreen.java | 18 ++++ .../CompatibleTexturedButtonWidget.java | 17 ++++ .../container/factory/ExtraDataArgs.java | 5 + .../api/event/item/ItemUseEvent.java | 4 + .../api/gui/SimpleScreenHandler.java | 46 +++++++--- .../gui/SimpleScreenHandlerTypeBuilder.java | 15 +++ .../api/gui/args/CreateMenuEvent.java | 12 +++ .../api/registry/result/SupplierResult.java | 52 +++++++++++ .../api/registry/v2/CompatRegistryV2.java | 6 ++ .../api/simple/block/SimpleGuiBlock.java | 28 ++++++ .../api/simple/item/SimpleGuiItem.java | 62 +++++++++++++ .../api/tile/CompatBlockEntity.java | 8 ++ .../api/util/client/ScreenUtil.java | 54 +++++++++++ .../mcpitanlib/api/util/debug/OutputUtil.java | 69 ++++++++++++++ .../api/util/math/BlockRotations.java | 19 ++++ .../mcpitanlib/guilib/GuiRegistry.java | 42 +++++++++ .../mcpitanlib/guilib/GuiTextures.java | 9 ++ .../mcpitanlib/guilib/MGLClientNetworks.java | 17 ++++ .../pitan76/mcpitanlib/guilib/MPLGuiLib.java | 40 ++++++++ .../mcpitanlib/guilib/api/IScreenInfo.java | 38 ++++++++ .../guilib/api/ISimpleScreenInfo.java | 14 +++ .../mcpitanlib/guilib/api/NetworkDefines.java | 8 ++ .../entity/BlockEntityWithContainer.java | 40 ++++++++ .../ExtendedBlockEntityWithContainer.java | 59 ++++++++++++ .../container/BlockEntityContainerGui.java | 11 +++ .../guilib/api/container/ContainerGui.java | 66 ++++++++++++++ .../ExtendedBlockEntityContainerGui.java | 39 ++++++++ .../api/container/SimpleContainerGui.java | 16 ++++ .../guilib/api/render/SlotRenderer.java | 27 ++++++ .../guilib/api/screen/ContainerGuiScreen.java | 86 ++++++++++++++++++ .../api/screen/SimpleContainerGuiScreen.java | 16 ++++ .../mcpitanlib/guilib/test/TestContainer.java | 55 +++++++++++ .../mcpitanlib/midohra/item/ItemStack.java | 5 + .../mcpitanlib/test/ExampleContainerGui.java | 26 ++++++ .../test/ExampleContainerGuiScreen.java | 30 ++++++ .../mcpitanlib/test/ExampleGuiBlock.java | 30 +++--- .../mcpitanlib/test/ExampleGuiItem.java | 29 ++++-- .../pitan76/mcpitanlib/test/ExampleMod.java | 75 +++++++++------ .../mcpitanlib/test/ExampleModClient.java | 5 +- .../mcpitanlib/test/ExampleScreen.java | 32 ++----- .../mcpitanlib/test/ExampleScreenHandler.java | 6 +- .../mplguilib/textures/container/base.png | Bin 0 -> 802 bytes .../textures/container/base_furnace.png | Bin 0 -> 1637 bytes .../textures/container/gui_parts.png | Bin 0 -> 1515 bytes info.properties | 2 +- 47 files changed, 1165 insertions(+), 96 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/SupplierResult.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/debug/OutputUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BlockRotations.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiTextures.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/IScreenInfo.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/ISimpleScreenInfo.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/NetworkDefines.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/BlockEntityWithContainer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/ExtendedBlockEntityWithContainer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/BlockEntityContainerGui.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ContainerGui.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ExtendedBlockEntityContainerGui.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/SimpleContainerGui.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/SlotRenderer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/ContainerGuiScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/SimpleContainerGuiScreen.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/test/TestContainer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGui.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGuiScreen.java create mode 100644 common/src/main/resources/assets/mplguilib/textures/container/base.png create mode 100644 common/src/main/resources/assets/mplguilib/textures/container/base_furnace.png create mode 100644 common/src/main/resources/assets/mplguilib/textures/container/gui_parts.png diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index a937ba2cf..f9b7b6d6d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -14,6 +14,9 @@ import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.PlatformUtil; import net.pitan76.mcpitanlib.debug.DebugTool; +import net.pitan76.mcpitanlib.guilib.MPLGuiLib; +import net.pitan76.mcpitanlib.test.ExampleMod; +import net.pitan76.mcpitanlib.test.ExampleModClient; import java.io.File; import java.util.ArrayList; @@ -40,14 +43,16 @@ public class MCPitanLib { */ public static void init() { configInit(); + new MPLGuiLib().init(); if (PlatformUtil.isDevelopmentEnvironment() || (config.has("debugMode") && config.getBoolean("debugMode"))) { System.out.println("MCPitanLib: Debug Mode"); DebugTool.register(); registry.allRegister(); - /* - ExampleMod.init(); - */ + + new ExampleMod(); + if (PlatformUtil.isClient()) + ExampleModClient.init(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java index b04909c11..675de4d31 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/CompatInventoryScreen.java @@ -2,9 +2,12 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.guilib.api.render.SlotRenderer; public abstract class CompatInventoryScreen extends SimpleInventoryScreen { @@ -14,8 +17,17 @@ public CompatInventoryScreen(S handler, PlayerInventory inventory, Text title) { public abstract CompatIdentifier getCompatTexture(); + @Deprecated @Override public Identifier getTexture() { return getCompatTexture().toMinecraft(); } + + public void drawSlot(DrawObjectDM drawObjectDM, Slot slot) { + SlotRenderer.drawSlot(drawObjectDM, slot, x, y); + } + + public void drawSlots(DrawObjectDM drawObjectDM) { + SlotRenderer.drawSlots(drawObjectDM, handler, x, y); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index fa9d6ee79..6bd2c3135 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -17,9 +17,11 @@ import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; +import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; +import net.pitan76.mcpitanlib.api.util.client.ScreenUtil; public abstract class SimpleHandledScreen extends HandledScreen { @@ -287,4 +289,20 @@ public int getTitleX() { public int getTitleY() { return titleY; } + + public void drawText(DrawObjectDM drawObjectDM, Text text, int x, int y, int color) { + ScreenUtil.RendererUtil.drawText(textRenderer, drawObjectDM, text, x, y, color); + } + + public void drawText(DrawObjectDM drawObjectDM, TextComponent text, int x, int y, int color) { + ScreenUtil.RendererUtil.drawText(textRenderer, drawObjectDM, text, x, y, color); + } + + public void drawText(DrawObjectDM drawObjectDM, Text text, int x, int y) { + ScreenUtil.RendererUtil.drawText(textRenderer, drawObjectDM, text, x, y); + } + + public void drawText(DrawObjectDM drawObjectDM, TextComponent text, int x, int y) { + ScreenUtil.RendererUtil.drawText(textRenderer, drawObjectDM, text, x, y); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java index ee4013b59..570ccc957 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.TextUtil; public class CompatibleTexturedButtonWidget extends TexturedButtonWidget { @@ -38,6 +39,22 @@ public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u this.texture = texture; } + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, CompatIdentifier texture, ButtonWidget.PressAction pressAction) { + this(x, y, width, height, u, v, texture.toMinecraft(), pressAction); + } + + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, ButtonWidget.PressAction pressAction) { + this(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), pressAction); + } + + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { + this(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), textureWidth, textureHeight, pressAction); + } + + public CompatibleTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text text) { + this(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), textureWidth, textureHeight, pressAction, text); + } + public void setPos(int x, int y) { setX(x); setY(y); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java index f73f56479..2b8c2d729 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/container/factory/ExtraDataArgs.java @@ -2,6 +2,7 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.server.network.ServerPlayerEntity; +import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.network.PacketByteUtil; @@ -40,6 +41,10 @@ public ServerPlayerEntity getPlayer() { return player; } + public Player getCompatPlayer() { + return new Player(player); + } + /** * @param obj The object to write * @see PacketByteUtil#writeVar(PacketByteBuf, Object) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index 230611a56..0183559b3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -60,4 +60,8 @@ public TypedActionResult consume() { public boolean isSneaking() { return user.isSneaking(); } + + public TypedActionResult success() { + return success(stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java index 7b652c453..4b2794167 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java @@ -9,6 +9,10 @@ import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.SlotActionType; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; +import net.pitan76.mcpitanlib.api.util.SlotUtil; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -19,6 +23,13 @@ protected SimpleScreenHandler(@Nullable ScreenHandlerType type, int syncId) { super(type, syncId); } + protected SimpleScreenHandler(@Nullable ScreenHandlerType type, CreateMenuEvent e) { + this(type, e.getSyncId()); + } + + public boolean hasMainInventory = false; + public boolean hasHotbar = false; + @Deprecated @Override public boolean canUse(PlayerEntity player) { @@ -73,6 +84,7 @@ public void close(Player player) { * @param y start y */ protected List addPlayerMainInventorySlots(PlayerInventory inventory, int x, int y) { + hasMainInventory = true; return this.addSlots(inventory, 9, x, y, DEFAULT_SLOT_SIZE, 9, 3); } @@ -83,6 +95,7 @@ protected List addPlayerMainInventorySlots(PlayerInventory inventory, int * @param y start y */ protected List addPlayerHotbarSlots(PlayerInventory inventory, int x, int y) { + hasHotbar = true; return this.addSlotsX(inventory, 0, x, y, DEFAULT_SLOT_SIZE, 9); } @@ -163,30 +176,37 @@ protected boolean insertItem(ItemStack stack, int startIndex, int endIndex, bool } public ItemStack quickMoveOverride(Player player, int index) { - ItemStack itemStack = ItemStack.EMPTY; - Slot slot = this.slots.get(index); - if (slot.hasStack()) { - ItemStack itemStack2 = slot.getStack(); + ItemStack itemStack = ItemStackUtil.empty(); + Slot slot = ScreenHandlerUtil.getSlot(this, index); + int size = ScreenHandlerUtil.getSlots(this).size(); + + if (SlotUtil.hasStack(slot)) { + ItemStack itemStack2 = SlotUtil.getStack(slot); itemStack = itemStack2.copy(); - if (index < 9) { - if (!this.insertItem(itemStack2, 9, 36, true)) { - return ItemStack.EMPTY; + + if (hasMainInventory && hasHotbar) { + if (index > 35) { + if (!this.callInsertItem(itemStack2, 0, 9, false)) { + if (!this.callInsertItem(itemStack2, 9, 36, true)) { + return ItemStackUtil.empty(); + } + } + } else if (size > 36 && !this.callInsertItem(itemStack2, 36, size, false)) { + return ItemStackUtil.empty(); } - } else if (!this.insertItem(itemStack2, 0, 9, false)) { - return ItemStack.EMPTY; } if (itemStack2.isEmpty()) { - slot.setStack(ItemStack.EMPTY); + SlotUtil.setStack(slot, ItemStackUtil.empty()); } else { - slot.markDirty(); + SlotUtil.markDirty(slot); } if (itemStack2.getCount() == itemStack.getCount()) { - return ItemStack.EMPTY; + return ItemStackUtil.empty(); } - slot.onTakeItem(player.getEntity(), itemStack2); + SlotUtil.onTakeItem(slot, player, itemStack2); } return itemStack; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandlerTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandlerTypeBuilder.java index a4a5289e7..39d18ee67 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandlerTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandlerTypeBuilder.java @@ -4,6 +4,7 @@ import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; public class SimpleScreenHandlerTypeBuilder { @@ -13,6 +14,10 @@ public SimpleScreenHandlerTypeBuilder(Factory factory) { this.factory = factory; } + public SimpleScreenHandlerTypeBuilder(Factory2 factory) { + this.factory = factory; + } + public ScreenHandlerType build() { return new ScreenHandlerType<>(factory::create, FeatureFlags.VANILLA_FEATURES); } @@ -21,4 +26,14 @@ public ScreenHandlerType build() { public interface Factory { T create(int syncId, PlayerInventory inventory); } + + @FunctionalInterface + public interface Factory2 extends Factory { + T create(CreateMenuEvent e); + + @Override + default T create(int syncId, PlayerInventory inventory) { + return create(new CreateMenuEvent(syncId, inventory)); + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java index 144c963f5..1fface96e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/CreateMenuEvent.java @@ -16,6 +16,18 @@ public CreateMenuEvent(int syncId, PlayerInventory playerInventory, PlayerEntity this.player = player; } + public CreateMenuEvent(int syncId, PlayerInventory playerInventory) { + this.syncId = syncId; + this.playerInventory = playerInventory; + this.player = playerInventory.player; + } + + public CreateMenuEvent(int syncId, Player player) { + this.syncId = syncId; + this.playerInventory = player.getInv(); + this.player = player.getEntity(); + } + public int getSyncId() { return syncId; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/SupplierResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/SupplierResult.java new file mode 100644 index 000000000..4e2a538c2 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/result/SupplierResult.java @@ -0,0 +1,52 @@ +package net.pitan76.mcpitanlib.api.registry.result; + +import dev.architectury.registry.registries.RegistrySupplier; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; +import java.util.function.Supplier; + +public class SupplierResult extends RegistryResult { + protected Supplier supplier; + + protected SupplierResult(Supplier supplier) { + super(null); + this.supplier = supplier; + } + + protected SupplierResult(RegistrySupplier supplier) { + this(supplier::getOrNull); + } + + protected SupplierResult(RegistryResult result) { + this(result.supplier); + } + + public static SupplierResult of(Supplier supplier) { + return new SupplierResult<>(supplier); + } + + public static SupplierResult of(RegistrySupplier supplier) { + return new SupplierResult<>(supplier); + } + + public static SupplierResult of(RegistryResult result) { + return new SupplierResult<>(result); + } + + @Override + public T get() { + return supplier.get(); + } + + @Override + public @Nullable T getOrNull() { + if (supplier == null) + return null; + return supplier.get(); + } + + public Optional getOptional() { + return Optional.ofNullable(getOrNull()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 71bb03aba..6d4ca4ae1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -15,11 +15,13 @@ import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.enchantment.CompatEnchantment; import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; +import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandlerTypeBuilder; import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; import net.pitan76.mcpitanlib.api.registry.FuelRegistry; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.api.registry.result.SupplierResult; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.sound.RegistryResultCompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; @@ -88,6 +90,10 @@ public Supplier> registerScreenHa return () -> (ScreenHandlerType) result.getOrNull(); } + public SupplierResult> registerScreenHandlerType(CompatIdentifier id, SimpleScreenHandlerTypeBuilder builder) { + return SupplierResult.of(registerScreenHandlerTypeSavingGenerics(id, builder::build)); + } + public RegistryResult> registerBlockEntityType(CompatIdentifier id, Supplier> supplier) { return cr1.registerBlockEntityType(id.toMinecraft(), supplier); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java new file mode 100644 index 000000000..4a0843eb9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.api.simple.block; + +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; +import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; +import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; + +public abstract class SimpleGuiBlock extends ExtendBlock implements SimpleScreenHandlerFactory { + + public SimpleGuiBlock(Settings settings) { + super(settings); + } + + @Override + public ActionResult onRightClick(BlockUseEvent e) { + if (e.isClient()) + e.player.openGuiScreen(this); + + return e.success(); + } + + @Override + public Text getDisplayName(DisplayNameArgs args) { + return getName(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java new file mode 100644 index 000000000..2ffc80214 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java @@ -0,0 +1,62 @@ +package net.pitan76.mcpitanlib.api.simple.item; + +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; +import net.minecraft.util.TypedActionResult; +import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; +import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.ExtendItem; + +public class SimpleGuiItem extends ExtendItem implements SimpleScreenHandlerFactory { + + public ScreenHandlerFactory factory; + public Text name; + + public SimpleGuiItem(CompatibleItemSettings settings, ScreenHandlerFactory factory, Text name) { + super(settings); + this.factory = factory; + this.name = name; + } + + public SimpleGuiItem(CompatibleItemSettings settings, ScreenHandlerFactory factory) { + super(settings); + this.factory = factory; + } + + public SimpleGuiItem(CompatibleItemSettings settings) { + super(settings); + } + + @Override + public TypedActionResult onRightClick(ItemUseEvent e) { + if (!e.isClient()) + e.user.openGuiScreen(this); + + return e.success(); + } + + @Override + public Text getDisplayName(DisplayNameArgs args) { + if (name == null) + return getName(); + + return name; + } + + @Override + public ScreenHandler createMenu(CreateMenuEvent e) { + if (factory == null) + return null; + + return factory.create(e); + } + + @FunctionalInterface + public interface ScreenHandlerFactory { + ScreenHandler create(CreateMenuEvent e); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index 79c92439d..d0c2f6c7d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -13,6 +13,7 @@ import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; +import net.pitan76.mcpitanlib.api.util.WorldUtil; import org.jetbrains.annotations.Nullable; public class CompatBlockEntity extends BlockEntity { @@ -93,4 +94,11 @@ public void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLooku readNbt(new ReadNbtArgs(nbt, registryLookup)); } + public boolean isClient() { + if (getWorld() == null) + return false; + + return WorldUtil.isClient(getWorld()); + } + } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index 3e6402eaa..1f0113681 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -13,6 +13,8 @@ import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.gui.widget.RedrawableTexturedButtonWidget; import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.text.TextComponent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import org.jetbrains.annotations.Nullable; @Environment(EnvType.CLIENT) @@ -82,6 +84,38 @@ public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidge return new RedrawableTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, message); } + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, CompatIdentifier texture, ButtonWidget.PressAction pressAction) { + return createTexturedButtonWidget(x, y, width, height, u, v, height, texture.toMinecraft(), pressAction); + } + + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, ButtonWidget.PressAction pressAction) { + return createTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), pressAction); + } + + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { + return createTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), textureWidth, textureHeight, pressAction); + } + + public static CompatibleTexturedButtonWidget createTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text message) { + return createTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), textureWidth, textureHeight, pressAction, message); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, CompatIdentifier texture, ButtonWidget.PressAction pressAction) { + return createRedrawableTexturedButtonWidget(x, y, width, height, u, v, texture.toMinecraft(), pressAction); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, ButtonWidget.PressAction pressAction) { + return createRedrawableTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), pressAction); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction) { + return createRedrawableTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), textureWidth, textureHeight, pressAction); + } + + public static RedrawableTexturedButtonWidget createRedrawableTexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, CompatIdentifier texture, int textureWidth, int textureHeight, ButtonWidget.PressAction pressAction, Text message) { + return createRedrawableTexturedButtonWidget(x, y, width, height, u, v, hoveredVOffset, texture.toMinecraft(), textureWidth, textureHeight, pressAction, message); + } + public static class Texts { @@ -122,6 +156,26 @@ public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, in public static TextRenderer getTextRenderer() { return MinecraftClient.getInstance().textRenderer; } + + public static void drawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { + drawTexture(drawObjectDM, texture.toMinecraft(), x, y, u, v, width, height, textureWidth, textureHeight); + } + + public static void drawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, float u, float v, int width, int height) { + drawTexture(drawObjectDM, texture.toMinecraft(), x, y, u, v, width, height); + } + + public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, TextComponent text, int x, int y, int color) { + return drawText(renderer, drawObjectDM, text.getText(), x, y, color); + } + + public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, Text text, int x, int y) { + return drawText(renderer, drawObjectDM, text, x, y, 4210752); + } + + public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, TextComponent text, int x, int y) { + return drawText(renderer, drawObjectDM, text, x, y, 4210752); + } } public static int getWidth(Text text) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/debug/OutputUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/debug/OutputUtil.java new file mode 100644 index 000000000..2fb569972 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/debug/OutputUtil.java @@ -0,0 +1,69 @@ +package net.pitan76.mcpitanlib.api.util.debug; + +import net.minecraft.inventory.Inventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.PlatformUtil; + +public class OutputUtil { + + public static boolean dev = PlatformUtil.isDevelopmentEnvironment(); + + public static void print(Item item) { + if (!dev) return; + System.out.println(getString(item)); + } + + public static void print(ItemStack stack) { + if (!dev) return; + System.out.println(getString(stack)); + } + + public static void print(Inventory inventory) { + if (!dev) return; + System.out.println(getString(inventory)); + } + + public static String getString(Item item) { + StringBuilder sb = new StringBuilder(); + sb.append("Item: {").append("\n"); + + sb.append(" Name: ").append(item.getTranslationKey()).append("\n"); + sb.append(" Id: ").append(ItemUtil.toCompatID(item)).append("\n"); + sb.append("}\n"); + + return sb.toString(); + } + + public static String getString(ItemStack stack) { + Item item = stack.getItem(); + + StringBuilder sb = new StringBuilder(); + sb.append("ItemStack: {").append("\n"); + + sb.append(getString(item)); + sb.append(" Count: ").append(stack.getCount()).append("\n"); + sb.append("}\n"); + + return sb.toString(); + } + + public static String getString(Inventory inventory) { + StringBuilder sb = new StringBuilder(); + sb.append("Inventory: {").append("\n"); + + for (int i = 0; i < inventory.size(); i++) { + ItemStack stack = inventory.getStack(i); + if (stack.isEmpty()) continue; + + sb.append(" Slot ").append(i).append(": {").append("\n"); + sb.append(getString(stack)); + sb.append(" }\n"); + } + + sb.append("}\n"); + + return sb.toString(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BlockRotations.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BlockRotations.java new file mode 100644 index 000000000..6f19c06bd --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BlockRotations.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.util.math; + +import net.minecraft.util.BlockRotation; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; + +public class BlockRotations { + public static BlockRotation NONE = BlockRotation.NONE; + public static BlockRotation CLOCKWISE_90 = BlockRotation.CLOCKWISE_90; + public static BlockRotation CLOCKWISE_180 = BlockRotation.CLOCKWISE_180; + public static BlockRotation COUNTERCLOCKWISE_90 = BlockRotation.COUNTERCLOCKWISE_90; + + public static BlockRotation rotate(BlockRotation rotation, BlockRotation rotation2) { + return rotation.rotate(rotation2); + } + + public static BlockRotation random(CompatRandom random) { + return BlockRotation.random(random.getMcRandom()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java new file mode 100644 index 000000000..9f789468e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java @@ -0,0 +1,42 @@ +package net.pitan76.mcpitanlib.guilib; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; +import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandlerTypeBuilder; +import net.pitan76.mcpitanlib.api.registry.result.SupplierResult; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.guilib.api.container.SimpleContainerGui; +import net.pitan76.mcpitanlib.guilib.api.screen.SimpleContainerGuiScreen; + +import java.util.function.Supplier; + +public class GuiRegistry { + public static SupplierResult> register(CompatRegistryV2 registry, CompatIdentifier id, SimpleScreenHandlerTypeBuilder.Factory factory) { + return register(registry, id, new SimpleScreenHandlerTypeBuilder<>(factory)); + } + + public static Supplier> register(CompatRegistryV2 registry, CompatIdentifier id, ScreenHandlerType type) { + return registry.registerScreenHandlerTypeSavingGenerics(id, () -> type); + } + + @Environment(EnvType.CLIENT) + public static > void register(String id, ScreenHandlerType type, CompatRegistryClient.ScreenFactory factory) { + CompatRegistryClient.registerScreen(id, type, factory); + } + + @Environment(EnvType.CLIENT) + public static void registerSimpleContainerGui(String id, ScreenHandlerType type) { + CompatRegistryClient.registerScreen(id, type, SimpleContainerGuiScreen::new); + } + + public static SupplierResult> register(CompatRegistryV2 registry, CompatIdentifier id, SimpleScreenHandlerTypeBuilder builder) { + return registry.registerScreenHandlerType(id, builder); + + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiTextures.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiTextures.java new file mode 100644 index 000000000..fad6d9331 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiTextures.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.guilib; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class GuiTextures { + public static CompatIdentifier GUI_PARTS = CompatIdentifier.of("mplguilib", "textures/container/gui_parts.png"); + public static CompatIdentifier BASE_FURNACE_BACKGROUND = CompatIdentifier.of("mplguilib", "textures/container/base_furnace.png"); + public static CompatIdentifier BASE_BACKGROUND = CompatIdentifier.of("mplguilib", "textures/container/base.png"); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java new file mode 100644 index 000000000..6ab10f069 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.guilib; + +import net.pitan76.mcpitanlib.api.network.v2.ClientNetworking; +import net.pitan76.mcpitanlib.guilib.api.container.ExtendedBlockEntityContainerGui; + +import static net.pitan76.mcpitanlib.guilib.api.NetworkDefines.SYNC_GUI_WITH_TILE; + +public class MGLClientNetworks { + public static void init() { + ClientNetworking.registerReceiver(SYNC_GUI_WITH_TILE, (e) -> { + if (e.player.getCurrentScreenHandler() instanceof ExtendedBlockEntityContainerGui) { + ExtendedBlockEntityContainerGui gui = (ExtendedBlockEntityContainerGui) e.player.getCurrentScreenHandler(); + gui.receiveSync(e.buf); + } + }); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java new file mode 100644 index 000000000..5d6cd8b18 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.guilib; + +import net.pitan76.mcpitanlib.api.CommonModInitializer; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class MPLGuiLib extends CommonModInitializer { + public static final String MOD_ID = "mplguilib"; + public static final String MOD_NAME = "MPL GuiLib"; + + public static MPLGuiLib INSTANCE; + public static CompatRegistryV2 registry; + + @Override + public void init() { + INSTANCE = this; + registry = super.registry; + + MGLClientNetworks.init(); + } + + // ---- + /** + * @param path The path of the id + * @return The id + */ + public static CompatIdentifier _id(String path) { + return CompatIdentifier.of(MOD_ID, path); + } + + @Override + public String getId() { + return MOD_ID; + } + + @Override + public String getName() { + return MOD_NAME; + } +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/IScreenInfo.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/IScreenInfo.java new file mode 100644 index 000000000..2e002e555 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/IScreenInfo.java @@ -0,0 +1,38 @@ +package net.pitan76.mcpitanlib.guilib.api; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.guilib.GuiTextures; + +public interface IScreenInfo { + default int getScreenBackgroundWidth() { + return getScreenWidth(); + } + + default int getScreenBackgroundHeight() { + return getScreenHeight(); + } + + int getScreenWidth(); + + int getScreenHeight(); + + default int getScreenX() { + return -1; + } + + default int getScreenY() { + return -1; + } + + default int getScreenTitleX() { + return -1; + } + + default int getScreenTitleY() { + return -1; + } + + default CompatIdentifier getTexture() { + return GuiTextures.BASE_BACKGROUND; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/ISimpleScreenInfo.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/ISimpleScreenInfo.java new file mode 100644 index 000000000..8ff931938 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/ISimpleScreenInfo.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.guilib.api; + +public interface ISimpleScreenInfo extends IScreenInfo { + + @Override + default int getScreenWidth() { + return 176; + } + + @Override + default int getScreenHeight() { + return 166; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/NetworkDefines.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/NetworkDefines.java new file mode 100644 index 000000000..c0631c9ec --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/NetworkDefines.java @@ -0,0 +1,8 @@ +package net.pitan76.mcpitanlib.guilib.api; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.guilib.MPLGuiLib; + +public class NetworkDefines { + public static CompatIdentifier SYNC_GUI_WITH_TILE = MPLGuiLib._id("sync_gui_with_tile"); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/BlockEntityWithContainer.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/BlockEntityWithContainer.java new file mode 100644 index 000000000..f6e88a29e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/BlockEntityWithContainer.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.guilib.api.block.entity; + +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.gui.inventory.IInventory; +import net.pitan76.mcpitanlib.api.gui.inventory.sided.ChestStyleSidedInventory; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; +import net.pitan76.mcpitanlib.api.util.InventoryUtil; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; + +public abstract class BlockEntityWithContainer extends CompatBlockEntity implements IInventory, ChestStyleSidedInventory { + + private final ItemStackList inventory = ItemStackList.ofSize(getDefaultInvSize(), ItemStackUtil.empty()); + + public BlockEntityWithContainer(BlockEntityType type, TileCreateEvent e) { + super(type, e); + } + + public abstract int getDefaultInvSize(); + + @Override + public void writeNbt(WriteNbtArgs args) { + super.writeNbt(args); + InventoryUtil.writeNbt(args, inventory); + } + + @Override + public void readNbt(ReadNbtArgs args) { + super.readNbt(args); + InventoryUtil.readNbt(args, inventory); + } + + @Override + public ItemStackList getItems() { + return inventory; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/ExtendedBlockEntityWithContainer.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/ExtendedBlockEntityWithContainer.java new file mode 100644 index 000000000..dfa884739 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/block/entity/ExtendedBlockEntityWithContainer.java @@ -0,0 +1,59 @@ +package net.pitan76.mcpitanlib.guilib.api.block.entity; + +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; +import net.pitan76.mcpitanlib.api.event.container.factory.ExtraDataArgs; +import net.pitan76.mcpitanlib.api.event.tile.TileTickEvent; +import net.pitan76.mcpitanlib.api.gui.v2.ExtendedScreenHandlerFactory; +import net.pitan76.mcpitanlib.api.network.PacketByteUtil; +import net.pitan76.mcpitanlib.api.network.v2.ServerNetworking; +import net.pitan76.mcpitanlib.api.tile.ExtendBlockEntityTicker; +import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.guilib.api.container.ExtendedBlockEntityContainerGui; + +import java.util.List; +import java.util.Objects; + +import static net.pitan76.mcpitanlib.guilib.api.NetworkDefines.SYNC_GUI_WITH_TILE; + +public abstract class ExtendedBlockEntityWithContainer extends BlockEntityWithContainer implements ExtendedScreenHandlerFactory, ExtendBlockEntityTicker { + + public ExtendedBlockEntityWithContainer(BlockEntityType type, TileCreateEvent e) { + super(type, e); + } + + @Override + public void tick(TileTickEvent e) { + if (isClient()) return; + + List players = WorldUtil.getPlayers(Objects.requireNonNull(getWorld())); + for (Player player : players) { + if (player.hasNetworkHandler() && player.getCurrentScreenHandler() instanceof ExtendedBlockEntityContainerGui && ((ExtendedBlockEntityContainerGui) player.getCurrentScreenHandler()).blockEntity == this ) { + PacketByteBuf buf = PacketByteUtil.create(); + sync(player, buf); + ServerNetworking.send(player, SYNC_GUI_WITH_TILE, buf); + } + } + } + + @Override + public Text getDisplayName(DisplayNameArgs args) { + if (getCachedState() == null) + return TextUtil.of("unknown"); + + return getCachedState().getBlock().getName(); + } + + @Override + public void writeExtraData(ExtraDataArgs args) { + PacketByteUtil.writeBlockPos(args.buf, getPos()); + sync(args.getCompatPlayer(), args.buf); + } + + public abstract void sync(Player player, PacketByteBuf buf); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/BlockEntityContainerGui.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/BlockEntityContainerGui.java new file mode 100644 index 000000000..54445322c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/BlockEntityContainerGui.java @@ -0,0 +1,11 @@ +package net.pitan76.mcpitanlib.guilib.api.container; + +import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.guilib.api.ISimpleScreenInfo; + +public abstract class BlockEntityContainerGui extends ContainerGui implements ISimpleScreenInfo { + protected BlockEntityContainerGui(ScreenHandlerType type, CreateMenuEvent e) { + super(type, e); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ContainerGui.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ContainerGui.java new file mode 100644 index 000000000..04dcc52b3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ContainerGui.java @@ -0,0 +1,66 @@ +package net.pitan76.mcpitanlib.guilib.api.container; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.screen.slot.Slot; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandler; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.guilib.api.IScreenInfo; + +import java.util.ArrayList; +import java.util.List; + +public abstract class ContainerGui extends SimpleScreenHandler implements IScreenInfo { + + private final List INVENTORIES = new ArrayList<>(); + + protected ContainerGui(ScreenHandlerType type, int syncId) { + super(type, syncId); + } + + protected ContainerGui(ScreenHandlerType type, CreateMenuEvent e) { + super(type, e); + } + + @Override + public boolean canUse(Player player) { + return true; + } + + @Override + protected Slot addSlot(Slot slot) { + if (slot.inventory instanceof Inventory && !INVENTORIES.contains(slot.inventory)) + INVENTORIES.add(slot.inventory); + + return super.addSlot(slot); + } + + public int playerMainInventoryX = 8; + public int playerMainInventoryY = 84; + + public int playerHotbarX = 8; + public int playerHotbarY = 142; + + @Override + protected List addPlayerMainInventorySlots(PlayerInventory inventory, int x, int y) { + playerMainInventoryX = x; + playerMainInventoryY = y; + + return super.addPlayerMainInventorySlots(inventory, x, y); + } + + @Override + protected List addPlayerHotbarSlots(PlayerInventory inventory, int x, int y) { + playerHotbarX = x; + playerHotbarY = y; + + return super.addPlayerHotbarSlots(inventory, x, y); + } + + @Override + public void close(Player player) { + INVENTORIES.forEach((inv -> inv.onClose(player.getEntity()))); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ExtendedBlockEntityContainerGui.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ExtendedBlockEntityContainerGui.java new file mode 100644 index 000000000..496c046c6 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/ExtendedBlockEntityContainerGui.java @@ -0,0 +1,39 @@ +package net.pitan76.mcpitanlib.guilib.api.container; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.network.PacketByteBuf; +import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; +import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.guilib.api.ISimpleScreenInfo; + +public abstract class ExtendedBlockEntityContainerGui extends BlockEntityContainerGui implements ISimpleScreenInfo { + + public T blockEntity; + + public ExtendedBlockEntityContainerGui(ScreenHandlerType type, CreateMenuEvent e, PacketByteBuf buf) { + this(type, e); + + if (buf == null) return; + + Player player = e.getPlayer(); + World world = player.getWorld(); + BlockPos pos = buf.readBlockPos(); + + BlockEntity blockEntity = WorldUtil.getBlockEntity(world, pos); + if (blockEntity instanceof CompatBlockEntity) + this.blockEntity = (T) blockEntity; + + receiveSync(buf); + } + + protected ExtendedBlockEntityContainerGui(ScreenHandlerType type, CreateMenuEvent e) { + super(type, e); + } + + public abstract void receiveSync(PacketByteBuf buf); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/SimpleContainerGui.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/SimpleContainerGui.java new file mode 100644 index 000000000..46e5fb903 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/container/SimpleContainerGui.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.guilib.api.container; + +import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.guilib.api.ISimpleScreenInfo; + +public abstract class SimpleContainerGui extends ContainerGui implements ISimpleScreenInfo { + + protected SimpleContainerGui(ScreenHandlerType type, int syncId) { + super(type, syncId); + } + + protected SimpleContainerGui(ScreenHandlerType type, CreateMenuEvent e) { + super(type, e); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/SlotRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/SlotRenderer.java new file mode 100644 index 000000000..0c23c9e94 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/SlotRenderer.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.guilib.api.render; + +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; +import net.pitan76.mcpitanlib.api.util.client.ScreenUtil.RendererUtil; +import net.pitan76.mcpitanlib.guilib.GuiTextures; + +public class SlotRenderer { + + public static void drawSlot(DrawObjectDM drawObjectDM, Slot slot, int x, int y) { + RendererUtil.drawTexture(drawObjectDM, GuiTextures.GUI_PARTS, x + slot.x - 1, y + slot.y - 1, 0, 0, 18, 18); + } + + public static void drawSlots(DrawObjectDM drawObjectDM, ScreenHandler handler, int x, int y) { + ScreenHandlerUtil.getSlots(handler).forEach((slot) -> drawSlot(drawObjectDM, slot, x, y)); + } + + public static void drawPlayerMainInventorySlots(DrawObjectDM drawObjectDM, ScreenHandler handler, int x, int y) { + RendererUtil.drawTexture(drawObjectDM, GuiTextures.GUI_PARTS, x, y, 0, 32, 162, 54); + } + + public static void drawPlayerHotbarSlots(DrawObjectDM drawObjectDM, ScreenHandler handler, int x, int y) { + RendererUtil.drawTexture(drawObjectDM, GuiTextures.GUI_PARTS, x, y, 0, 90, 162, 18); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/ContainerGuiScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/ContainerGuiScreen.java new file mode 100644 index 000000000..70b6158eb --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/ContainerGuiScreen.java @@ -0,0 +1,86 @@ +package net.pitan76.mcpitanlib.guilib.api.screen; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.client.gui.screen.CompatInventoryScreen; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; +import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawForegroundArgs; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; +import net.pitan76.mcpitanlib.guilib.GuiTextures; +import net.pitan76.mcpitanlib.guilib.api.container.ContainerGui; +import net.pitan76.mcpitanlib.guilib.api.render.SlotRenderer; + +public class ContainerGuiScreen extends CompatInventoryScreen { + public ContainerGuiScreen(T handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + setBackgroundWidth(handler.getScreenBackgroundWidth()); + setBackgroundHeight(handler.getScreenBackgroundHeight()); + + if (handler.getScreenX() != -1) + setX(handler.getScreenX()); + if (handler.getScreenY() != -1) + setY(handler.getScreenY()); + + if (handler.getScreenTitleX() != -1) + setTitleX(handler.getScreenTitleX()); + if (handler.getScreenTitleY() != -1) + setTitleY(handler.getScreenTitleY()); + } + + @Override + public void initOverride() { + super.initOverride(); + } + + @Override + public void drawBackgroundOverride(DrawBackgroundArgs args) { + super.drawBackgroundOverride(args); + + if (handler.hasMainInventory && !containPlayerInventoryInBackground()) + drawPlayerMainInventorySlots(args.drawObjectDM); + + if (handler.hasHotbar && !containPlayerInventoryInBackground()) + drawPlayerHotbarSlots(args.drawObjectDM); + + drawSlots(args.drawObjectDM); + } + + @Override + protected void drawForegroundOverride(DrawForegroundArgs args) { + if (!handler.hasMainInventory && !containPlayerInventoryInBackground()) { + drawText(args.drawObjectDM, title, titleX, titleY); + return; + } + + super.drawForegroundOverride(args); + } + + @Override + public CompatIdentifier getCompatTexture() { + return handler.getTexture(); + } + + public void drawPlayerMainInventorySlots(DrawObjectDM drawObjectDM) { + SlotRenderer.drawPlayerMainInventorySlots(drawObjectDM, handler, x + handler.playerMainInventoryX - 1, y + handler.playerMainInventoryY - 1); + } + + public void drawPlayerHotbarSlots(DrawObjectDM drawObjectDM) { + SlotRenderer.drawPlayerHotbarSlots(drawObjectDM, handler, x + handler.playerHotbarX - 1, y + handler.playerHotbarY - 1); + } + + public boolean containPlayerInventoryInBackground() { + return getCompatTexture() == GuiTextures.BASE_FURNACE_BACKGROUND; + } + + @Override + public void drawSlots(DrawObjectDM drawObjectDM) { + ScreenHandlerUtil.getSlots(handler).forEach((slot) -> { + if (slot.inventory instanceof PlayerInventory || containPlayerInventoryInBackground()) + return; + + SlotRenderer.drawSlot(drawObjectDM, slot, x, y); + }); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/SimpleContainerGuiScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/SimpleContainerGuiScreen.java new file mode 100644 index 000000000..3ac5ebed4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/screen/SimpleContainerGuiScreen.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.guilib.api.screen; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.guilib.api.container.SimpleContainerGui; + +public class SimpleContainerGuiScreen extends ContainerGuiScreen { + public SimpleContainerGuiScreen(SimpleContainerGui handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + @Override + public void initOverride() { + super.initOverride(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/test/TestContainer.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/test/TestContainer.java new file mode 100644 index 000000000..f1ce318d4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/test/TestContainer.java @@ -0,0 +1,55 @@ +package net.pitan76.mcpitanlib.guilib.test; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.guilib.api.container.ContainerGui; + +public class TestContainer extends ContainerGui { + public TestContainer(ScreenHandlerType type, int syncId) { + super(type, syncId); + } + + public TestContainer(int i, PlayerInventory inventory) { + this(null, i); + } + + @Override + public int getScreenBackgroundWidth() { + return 176; + } + + @Override + public int getScreenBackgroundHeight() { + return 166; + } + + @Override + public int getScreenWidth() { + return 176; + } + + @Override + public int getScreenHeight() { + return 166; + } + + @Override + public int getScreenX() { + return 0; + } + + @Override + public int getScreenY() { + return 0; + } + + @Override + public int getScreenTitleX() { + return 0; + } + + @Override + public int getScreenTitleY() { + return 0; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java index 3d2bb8fe8..9990142e2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java @@ -105,4 +105,9 @@ public ItemStack build() { return new ItemStack(stack); } } + + @Override + public String toString() { + return stack.toString(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGui.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGui.java new file mode 100644 index 000000000..ab182e28c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGui.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.test; + +import net.minecraft.inventory.Inventory; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.api.util.InventoryUtil; +import net.pitan76.mcpitanlib.api.util.debug.OutputUtil; +import net.pitan76.mcpitanlib.guilib.api.container.SimpleContainerGui; + +public class ExampleContainerGui extends SimpleContainerGui { + + public static Inventory EXAMPLE_INVENTORY = InventoryUtil.createSimpleInventory(1); + + public ExampleContainerGui(CreateMenuEvent e) { + super(ExampleMod.EXAMPLE_CONTAINER_GUI.get(), e); + addPlayerMainInventorySlots(e.playerInventory, 8, 84); + addPlayerHotbarSlots(e.playerInventory, 8, 142); + + addNormalSlot(EXAMPLE_INVENTORY, 0, 24, 24); + } + + @Override + public void close(Player player) { + OutputUtil.print(EXAMPLE_INVENTORY); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGuiScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGuiScreen.java new file mode 100644 index 000000000..3e6d42413 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleContainerGuiScreen.java @@ -0,0 +1,30 @@ +package net.pitan76.mcpitanlib.test; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.client.gui.screen.CompatInventoryScreen; +import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class ExampleContainerGuiScreen extends CompatInventoryScreen { + + public static CompatIdentifier GUI = CompatIdentifier.of("textures/gui/container/blast_furnace.png"); + + public ExampleContainerGuiScreen(ExampleScreenHandler handler, PlayerInventory inventory, Text title) { + super(handler, inventory, title); + } + + @Override + public CompatIdentifier getCompatTexture() { + return GUI; + } + + @Override + public void initOverride() { + super.initOverride(); + System.out.println("hogehogehoge1111"); + this.addDrawableCTBW(new CompatibleTexturedButtonWidget(0, 0, 30, 30, 0, 0, GUI, (buttonWidget) -> { + System.out.println("hogehoge"); + })); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java index f2a5ef3e1..7822463ea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java @@ -1,16 +1,15 @@ package net.pitan76.mcpitanlib.test; -import net.minecraft.block.BlockState; -import net.minecraft.screen.NamedScreenHandlerFactory; -import net.minecraft.screen.SimpleNamedScreenHandlerFactory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; -import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; -public class ExampleGuiBlock extends ExtendBlock { +public class ExampleGuiBlock extends ExtendBlock implements SimpleScreenHandlerFactory { public ExampleGuiBlock(Settings settings) { super(settings); @@ -18,14 +17,19 @@ public ExampleGuiBlock(Settings settings) { @Override public ActionResult onRightClick(BlockUseEvent e) { - if (e.world.isClient) { - e.player.openGuiScreen(e.world, e.state, e.pos); - } - return ActionResult.SUCCESS; + if (e.isClient()) + e.player.openGuiScreen(this); + + return e.success(); + } + + @Override + public Text getDisplayName(DisplayNameArgs args) { + return getName(); } @Override - public NamedScreenHandlerFactory createScreenHandlerFactory(BlockState state, World world, BlockPos pos) { - return new SimpleNamedScreenHandlerFactory((i, playerInventory, playerEntity) -> new ExampleScreenHandler(i, playerInventory), TextUtil.literal("Example Title")); + public ScreenHandler createMenu(CreateMenuEvent e) { + return new ExampleScreenHandler(e); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java index 12650ad2c..1db7fbac3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java @@ -1,29 +1,38 @@ package net.pitan76.mcpitanlib.test; import net.minecraft.item.ItemStack; -import net.minecraft.screen.NamedScreenHandlerFactory; -import net.minecraft.screen.SimpleNamedScreenHandlerFactory; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.text.Text; import net.minecraft.util.TypedActionResult; +import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.util.TextUtil; -public class ExampleGuiItem extends ExtendItem { +public class ExampleGuiItem extends ExtendItem implements SimpleScreenHandlerFactory { public ExampleGuiItem(CompatibleItemSettings settings) { super(settings); } @Override - public TypedActionResult onRightClick(ItemUseEvent event) { - if (!event.world.isClient()) { - event.user.openGuiScreen(getFactory()); - } - return super.onRightClick(event); + public TypedActionResult onRightClick(ItemUseEvent e) { + if (!e.isClient()) + e.user.openGuiScreen(this); + + return e.success(); } - public static NamedScreenHandlerFactory getFactory() { - return new SimpleNamedScreenHandlerFactory((i, playerInventory, playerEntity) -> new ExampleScreenHandler(i, playerInventory), TextUtil.literal("Example Title")); + @Override + public Text getDisplayName(DisplayNameArgs args) { + return TextUtil.literal("Example Title"); + } + + @Override + public ScreenHandler createMenu(CreateMenuEvent e) { + return new ExampleScreenHandler(e); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 59c126e95..92ff67617 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -3,7 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; -import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.CommonModInitializer; import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.block.ExtendBlock; @@ -12,55 +12,70 @@ import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.DefaultItemGroups; import net.pitan76.mcpitanlib.api.item.ExtendItem; -import net.pitan76.mcpitanlib.api.registry.CompatRegistry; +import net.pitan76.mcpitanlib.api.simple.item.SimpleGuiItem; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; -import net.pitan76.mcpitanlib.api.util.IdentifierUtil; +import net.pitan76.mcpitanlib.api.registry.result.SupplierResult; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.ItemUtil; -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import net.pitan76.mcpitanlib.guilib.GuiRegistry; -public class ExampleMod { +public class ExampleMod extends CommonModInitializer { public static final String MOD_ID = "examplemod"; public static final String MOD_NAME = "ExampleMod"; - public static Logger LOGGER = LogManager.getLogger(); - public static void log(Level level, String message){ - LOGGER.log(level, "[" + MOD_NAME + "] " + message); - } - - public static Identifier id(String id) { - return IdentifierUtil.id(MOD_ID, id); - } + public static ExampleMod INSTANCE; + public static CompatRegistryV2 registry; - // en: Create a CompatRegistry instance. , ja: CompatRegistryインスタンスを作成します。 - public static CompatRegistry registry = CompatRegistry.createRegistry(MOD_ID); - - public static RegistryResult> EXAMPLE_SCREENHANDLER; + public static SupplierResult> EXAMPLE_SCREENHANDLER; + public static SupplierResult> EXAMPLE_CONTAINER_GUI; public static RegistryResult EXAMPLE_ITEM; public static RegistryResult EXAMPLE_BLOCK; public static RegistryResult EXAMPLE_BLOCK_ITEM; public static RegistryResult EXAMPLE_GUI_ITEM; + public static RegistryResult EXAMPLE_CONTAINER_GUI_ITEM; public static RegistryResult EXAMPLE_GUI_BLOCK; public static RegistryResult EXAMPLE_GUI_BLOCK_ITEM; - public static void init() { - // en: Register all items, blocks, and others. , ja: 全てのアイテム、ブロック、その他を登録します。 - EXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(id("example_gui"), () -> new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new).build()); - EXAMPLE_ITEM = registry.registerItem(id("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_item")))); - EXAMPLE_BLOCK = registry.registerBlock(id("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); - EXAMPLE_BLOCK_ITEM = registry.registerItem(id("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_block")))); + public void init() { + INSTANCE = this; + registry = super.registry; + + // en: Register all items, blocks and others. , ja: 全てのアイテム、ブロック、その他を登録します。 + EXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(compatId("example_gui"), new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new)); + EXAMPLE_CONTAINER_GUI = GuiRegistry.register(registry, compatId("example_container_gui"), new SimpleScreenHandlerTypeBuilder<>(ExampleContainerGui::new)); + + EXAMPLE_ITEM = registry.registerItem(compatId("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_item")))); + EXAMPLE_BLOCK = registry.registerBlock(compatId("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); + EXAMPLE_BLOCK_ITEM = registry.registerItem(compatId("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_block")))); - EXAMPLE_GUI_ITEM = registry.registerItem(id("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_item")))); + EXAMPLE_GUI_ITEM = registry.registerItem(compatId("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_gui_item")))); - EXAMPLE_GUI_BLOCK = registry.registerBlock(id("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); - EXAMPLE_GUI_BLOCK_ITEM = registry.registerItem(id("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, id("example_gui_block")))); + EXAMPLE_GUI_BLOCK = registry.registerBlock(compatId("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); + EXAMPLE_GUI_BLOCK_ITEM = registry.registerItem(compatId("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, compatId("example_gui_block")))); - // en: Register all registered creative tabs and others , ja: 登録された全てのクリエイティブタブやその他を登録します - registry.allRegister(); + EXAMPLE_CONTAINER_GUI_ITEM = registry.registerItem(compatId("example_container_gui_item"), + () -> new SimpleGuiItem(CompatibleItemSettings.of() + .addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_container_gui_item")), + ExampleContainerGui::new) + ); // en: Register the command , ja: コマンドを登録します CommandRegistry.register("mpla", new ExampleCommand()); } + + public static CompatIdentifier _id(String id) { + return CompatIdentifier.of(MOD_ID, id); + } + + @Override + public String getId() { + return MOD_ID; + } + + @Override + public String getName() { + return MOD_NAME; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java index 5c900af84..aa3b041be 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleModClient.java @@ -1,9 +1,12 @@ package net.pitan76.mcpitanlib.test; import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; +import net.pitan76.mcpitanlib.guilib.GuiRegistry; public class ExampleModClient { public static void init() { - CompatRegistryClient.registerScreen(ExampleMod.EXAMPLE_SCREENHANDLER.getOrNull(), ExampleScreen::new); + CompatRegistryClient.registerScreen(ExampleMod.MOD_ID, ExampleMod.EXAMPLE_SCREENHANDLER.get(), ExampleScreen::new); + + GuiRegistry.registerSimpleContainerGui(ExampleMod.MOD_ID, ExampleMod.EXAMPLE_CONTAINER_GUI.get()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java index 7a778efc2..17bd18c72 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreen.java @@ -1,24 +1,24 @@ package net.pitan76.mcpitanlib.test; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.minecraft.util.Identifier; -import net.pitan76.mcpitanlib.api.client.SimpleHandledScreen; +import net.pitan76.mcpitanlib.api.client.gui.screen.CompatInventoryScreen; import net.pitan76.mcpitanlib.api.client.gui.widget.CompatibleTexturedButtonWidget; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawBackgroundArgs; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.DrawMouseoverTooltipArgs; -import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; -import net.pitan76.mcpitanlib.api.util.IdentifierUtil; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; -public class ExampleScreen extends SimpleHandledScreen { +public class ExampleScreen extends CompatInventoryScreen { - public static Identifier GUI = IdentifierUtil.id("textures/gui/container/blast_furnace.png"); + public static CompatIdentifier GUI = CompatIdentifier.of("textures/gui/container/blast_furnace.png"); - public ExampleScreen(ScreenHandler handler, PlayerInventory inventory, Text title) { + public ExampleScreen(ExampleScreenHandler handler, PlayerInventory inventory, Text title) { super(handler, inventory, title); } + @Override + public CompatIdentifier getCompatTexture() { + return GUI; + } + @Override public void initOverride() { super.initOverride(); @@ -27,16 +27,4 @@ public void initOverride() { System.out.println("hogehoge"); })); } - - @Override - public void drawBackgroundOverride(DrawBackgroundArgs args) { - callDrawTexture(args.drawObjectDM, GUI, x, y, 0, 0, this.backgroundWidth, this.backgroundHeight); - } - - @Override - public void renderOverride(RenderArgs args) { - this.callRenderBackground(args); - super.renderOverride(args); - this.callDrawMouseoverTooltip(new DrawMouseoverTooltipArgs(args.drawObjectDM, args.mouseX, args.mouseY)); - } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java index db6b6e38a..ff99d6ae9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleScreenHandler.java @@ -1,14 +1,14 @@ package net.pitan76.mcpitanlib.test; -import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandler; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; public class ExampleScreenHandler extends SimpleScreenHandler { - public ExampleScreenHandler(int i, PlayerInventory playerInventory) { - super(ExampleMod.EXAMPLE_SCREENHANDLER.getOrNull(), i); + public ExampleScreenHandler(CreateMenuEvent e) { + super(ExampleMod.EXAMPLE_SCREENHANDLER.get(), e); } diff --git a/common/src/main/resources/assets/mplguilib/textures/container/base.png b/common/src/main/resources/assets/mplguilib/textures/container/base.png new file mode 100644 index 0000000000000000000000000000000000000000..e5fca7df1dcdcaf7beb026735c99d427a7987853 GIT binary patch literal 802 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%U;1OBOz`%C|gc+x5^GP!> zFkSI#jVhAMCfcojr4A z-+N=d#{Zvw{6752`Sj!0@eSpw3<7GSXt;&Iom1O#!}~vk)tx;Pl|A=(VMR>G&m9cc zKL6ZPBJiWH_I`TWwX4NPBj_rAkj9gqc{u6{1- HoD!M<`Rb86 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/mplguilib/textures/container/base_furnace.png b/common/src/main/resources/assets/mplguilib/textures/container/base_furnace.png new file mode 100644 index 0000000000000000000000000000000000000000..20a8bd98b0ce4d77ab5f07d0e246e8145127f82f GIT binary patch literal 1637 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 M>FVdQ&MBb@07kxbtN;K2 literal 0 HcmV?d00001 diff --git a/info.properties b/info.properties index 72bd01d2a..e480fd6cc 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.4.9 +mod_version=2.5.0 maven_group=net.pitan76 \ No newline at end of file From eda8748d01b237ec1ca62645c96ca1fc307e8687 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 9 Oct 2024 08:57:21 +0900 Subject: [PATCH 401/622] add APIs --- .../gui/ExtendedScreenHandlerTypeBuilder.java | 17 ++++- .../api/registry/v2/CompatRegistryV2.java | 12 ++++ .../mcpitanlib/guilib/GuiRegistry.java | 4 ++ .../mcpitanlib/guilib/MGLClientNetworks.java | 6 ++ .../pitan76/mcpitanlib/guilib/MPLGuiLib.java | 4 +- .../guilib/api/render/PartsRenderer.java | 72 +++++++++++++++++++ info.properties | 2 +- 7 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerTypeBuilder.java index 9c6a67e60..dd672f9a6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/ExtendedScreenHandlerTypeBuilder.java @@ -5,8 +5,9 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; -public class ExtendedScreenHandlerTypeBuilder { +public class ExtendedScreenHandlerTypeBuilder { private final Factory factory; @@ -14,6 +15,10 @@ public ExtendedScreenHandlerTypeBuilder(Factory factory) { this.factory = factory; } + public ExtendedScreenHandlerTypeBuilder(Factory2 factory) { + this.factory = factory; + } + public ScreenHandlerType build() { return MenuRegistry.ofExtended(factory::create); } @@ -22,4 +27,14 @@ public ScreenHandlerType build() { public interface Factory { T create(int syncId, PlayerInventory inventory, PacketByteBuf buf); } + + @FunctionalInterface + public interface Factory2 extends Factory { + T create(CreateMenuEvent e, PacketByteBuf buf); + + @Override + default T create(int syncId, PlayerInventory inventory, PacketByteBuf buf) { + return create(new CreateMenuEvent(syncId, inventory), buf); + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 6d4ca4ae1..525158b80 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.registry.v2; import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; @@ -15,6 +16,7 @@ import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.enchantment.CompatEnchantment; import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; +import net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerTypeBuilder; import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandlerTypeBuilder; import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.ExtendItem; @@ -24,6 +26,7 @@ import net.pitan76.mcpitanlib.api.registry.result.SupplierResult; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.sound.RegistryResultCompatSoundEvent; +import net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import java.util.function.Supplier; @@ -94,10 +97,19 @@ public SupplierResult> registerSc return SupplierResult.of(registerScreenHandlerTypeSavingGenerics(id, builder::build)); } + public SupplierResult> registerScreenHandlerType(CompatIdentifier id, ExtendedScreenHandlerTypeBuilder builder) { + return SupplierResult.of(registerScreenHandlerTypeSavingGenerics(id, builder::build)); + } + public RegistryResult> registerBlockEntityType(CompatIdentifier id, Supplier> supplier) { return cr1.registerBlockEntityType(id.toMinecraft(), supplier); } + public SupplierResult> registerBlockEntityType(CompatIdentifier id, BlockEntityTypeBuilder builder) { + RegistryResult> result = cr1.registerBlockEntityType(id.toMinecraft(), builder::build); + return SupplierResult.of(() -> (BlockEntityType) result.getOrNull()); + } + public RegistryResult> registerEntity(CompatIdentifier id, Supplier> supplier) { return cr1.registerEntity(id.toMinecraft(), supplier); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java index 9f789468e..c928bb1f1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/GuiRegistry.java @@ -7,6 +7,7 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; +import net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerTypeBuilder; import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandlerTypeBuilder; import net.pitan76.mcpitanlib.api.registry.result.SupplierResult; import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; @@ -37,6 +38,9 @@ public static void registerSimpleContainerGui(Str public static SupplierResult> register(CompatRegistryV2 registry, CompatIdentifier id, SimpleScreenHandlerTypeBuilder builder) { return registry.registerScreenHandlerType(id, builder); + } + public static SupplierResult> register(CompatRegistryV2 registry, CompatIdentifier id, ExtendedScreenHandlerTypeBuilder builder) { + return registry.registerScreenHandlerType(id, builder); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java index 6ab10f069..4d9bc3bad 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MGLClientNetworks.java @@ -6,7 +6,13 @@ import static net.pitan76.mcpitanlib.guilib.api.NetworkDefines.SYNC_GUI_WITH_TILE; public class MGLClientNetworks { + + public static boolean isInitialized = false; + public static void init() { + if (isInitialized) return; + isInitialized = true; + ClientNetworking.registerReceiver(SYNC_GUI_WITH_TILE, (e) -> { if (e.player.getCurrentScreenHandler() instanceof ExtendedBlockEntityContainerGui) { ExtendedBlockEntityContainerGui gui = (ExtendedBlockEntityContainerGui) e.player.getCurrentScreenHandler(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java index 5d6cd8b18..e18206e27 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java @@ -3,6 +3,7 @@ import net.pitan76.mcpitanlib.api.CommonModInitializer; import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.PlatformUtil; public class MPLGuiLib extends CommonModInitializer { public static final String MOD_ID = "mplguilib"; @@ -16,7 +17,8 @@ public void init() { INSTANCE = this; registry = super.registry; - MGLClientNetworks.init(); + if (PlatformUtil.isClient()) + MGLClientNetworks.init(); } // ---- diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java new file mode 100644 index 000000000..97472b25f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java @@ -0,0 +1,72 @@ +package net.pitan76.mcpitanlib.guilib.api.render; + +import net.pitan76.mcpitanlib.api.client.render.DrawObjectDM; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.client.RenderUtil.RendererUtil; +import net.pitan76.mcpitanlib.guilib.GuiTextures; + +public class PartsRenderer { + public static void drawBottom2TopProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u, int v, int u2, int v2, int width, int height, int percentage, CompatIdentifier texture) { + RendererUtil.drawTexture(drawObjectDM, texture, x, y, u, v, width, height); + + if (percentage > 0) { + int progress = (int) ((double) percentage / 100 * height); + RendererUtil.drawTexture(drawObjectDM, texture, x, y + height - progress, u2, v2 + height - progress, width, progress); + } + } + + public static void drawBottom2TopProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { + int percentage = (int) (value / maxValue * 100); + drawBottom2TopProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); + } + + public static void drawTop2BottomProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u, int v, int u2, int v2, int width, int height, int percentage, CompatIdentifier texture) { + RendererUtil.drawTexture(drawObjectDM, texture, x, y, u, v, width, height); + + if (percentage > 0) { + int progress = (int) ((double) percentage / 100 * height); + RendererUtil.drawTexture(drawObjectDM, texture, x, y, u2, v2, width, progress); + } + } + + public static void drawTop2BottomProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { + int percentage = (int) (value / maxValue * 100); + drawTop2BottomProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); + } + + public static void drawLeft2RightProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u, int v, int u2, int v2, int width, int height, int percentage, CompatIdentifier texture) { + RendererUtil.drawTexture(drawObjectDM, texture, x, y, u, v, width, height); + + if (percentage > 0) { + int progress = (int) ((double) percentage / 100 * width); + RendererUtil.drawTexture(drawObjectDM, texture, x, y, u2, v2, progress, height); + } + } + + public static void drawLeft2RightProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { + int percentage = (int) (value / maxValue * 100); + drawLeft2RightProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); + } + + public static void drawRight2LeftProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u, int v, int u2, int v2, int width, int height, int percentage, CompatIdentifier texture) { + RendererUtil.drawTexture(drawObjectDM, texture, x, y, u, v, width, height); + + if (percentage > 0) { + int progress = (int) ((double) percentage / 100 * width); + RendererUtil.drawTexture(drawObjectDM, texture, x + width - progress, y, u2 + width - progress, v2, progress, height); + } + } + + public static void drawRight2LeftProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { + int percentage = (int) (value / maxValue * 100); + drawRight2LeftProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); + } + + public static void drawBurningBar(DrawObjectDM drawObjectDM, int x, int y, int burnTime, int maxBurnTime) { + drawBottom2TopProgressBar(drawObjectDM, x, y, 0, 166, 0, 182, 16, 14, burnTime, maxBurnTime, GuiTextures.BASE_FURNACE_BACKGROUND); + } + + public static void drawHorizontalArrowBar(DrawObjectDM drawObjectDM, int x, int y, double value, double maxValue) { + drawLeft2RightProgressBar(drawObjectDM, x, y, 0, 166, 16, 182, 24, 16, value, maxValue, GuiTextures.BASE_FURNACE_BACKGROUND); + } +} diff --git a/info.properties b/info.properties index e480fd6cc..a270254d4 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,3 @@ archives_base_name=mcpitanlib -mod_version=2.5.0 +mod_version=2.5.1 maven_group=net.pitan76 \ No newline at end of file From d5417719cadad23a044c2a16a9ad5510b4154f5f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:14:38 +0900 Subject: [PATCH 402/622] neoforge.mods.toml --- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 655066ba3..e3512a605 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -28,6 +28,13 @@ versionRange = "[1.20,)" ordering = "NONE" side = "BOTH" +[[dependencies.mcpitanlib]] +modId = "architectury" +type = "required" +versionRange = "[1.3.80,)" +ordering = "NONE" +side = "BOTH" + [[mixins]] config = "mcpitanlib-common.mixins.json" From 1148e8f470290a645ee3db179f6c86042c51a553 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 12 Oct 2024 12:46:30 +0900 Subject: [PATCH 403/622] Add APIs etc --- build.gradle | 85 ++++++++++++++-- .../api/client/render/DrawObjectDM.java | 32 ++++++ .../api/event/ServerCommandEvent.java | 4 + .../event/v0/event/RecipeManagerEvent.java | 7 ++ .../api/recipe/CompatRecipeType.java | 52 ++++++++++ .../mcpitanlib/api/recipe/MatchGetter.java | 13 +++ .../api/recipe/input/CompatRecipeInput.java | 32 ++++++ .../api/recipe/v2/CompatRecipeEntry.java | 65 +++++++++++++ .../mcpitanlib/api/util/BlockEntityUtil.java | 17 ++++ .../mcpitanlib/api/util/CompatIdentifier.java | 8 ++ .../mcpitanlib/api/util/RecipeUtil.java | 87 ++++++++++++++++- .../api/util/block/entity/FurnaceUtil.java | 43 ++++++++ .../api/util/client/ScreenUtil.java | 26 +++++ .../mcpitanlib/api/util/math/PointUtil.java | 15 +++ .../recipe/input/CraftingRecipeInputUtil.java | 97 +++++++++++++++++++ .../input/SingleStackRecipeInputUtil.java | 32 ++++++ .../mcpitanlib/api/util/world/TickerUtil.java | 28 ++++++ .../guilib/api/render/PartsRenderer.java | 4 +- .../main/resources/mcpitanlib.accesswidener | 5 +- info.properties | 5 +- 20 files changed, 643 insertions(+), 14 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PointUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/SingleStackRecipeInputUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java diff --git a/build.gradle b/build.gradle index cc76c02f1..a6fbbb486 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,28 @@ plugins { id "architectury-plugin" version "3.4-SNAPSHOT" id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false + id 'com.matthewprenger.cursegradle' version '1.+' + id "com.modrinth.minotaur" version "2.+" } architectury { minecraft = rootProject.minecraft_version } +def loadProperties(filename) { + def props = new Properties() + file(filename).withInputStream { + props.load(it) + } + return props +} + +ext.info = loadProperties("$rootDir/info.properties") + subprojects { apply plugin: "dev.architectury.loom" + apply plugin: "com.modrinth.minotaur" + apply plugin: "com.matthewprenger.cursegradle" loom { silentMojangMappingsLicense() @@ -34,18 +48,71 @@ subprojects { // https://mvnrepository.com/artifact/org.yaml/snakeyaml implementation 'org.yaml:snakeyaml:2.0' } -} -def loadProperties(filename) { - def props = new Properties() - file(filename).withInputStream { - props.load(it) + if (name in "fabric,neoforge".split(",")) { + var modLoader = name + + if (System.getenv("CURSEFORGE_TOKEN") != null) { + curseforge { + apiKey = System.getenv("CURSEFORGE_TOKEN") + project { + id = '682213' + changelog = info.changelog + releaseType = modLoader == "fabric" ? 'release' : 'beta' + if (modLoader == "fabric") { + addGameVersion "Fabric" + } + if (modLoader == "forge") { + addGameVersion "Forge" + } + if (modLoader == "neoforge") { + addGameVersion "NeoForge" + } + addGameVersion '1.21' + addGameVersion '1.21.1' + + relations { + if (modLoader == "fabric") { + requiredDependency "fabric-api" + } + + requiredDependency 'architectury-api' + embeddedLibrary 'cloth-config' + embeddedLibrary 'compatdatapacks' + } + + mainArtifact(tasks.remapJar) + } + options { + forgeGradleIntegration = false + } + } + + } + + if (System.getenv("MODRINTH_TOKEN") != null) { + modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = 'mcpitanlibarch' + versionNumber = info.mod_version + "-" + modLoader + gameVersions = ['1.21', '1.21.1'] + versionType = 'release' + uploadFile = tasks.remapJar + changelog = info.changelog + loaders = [modLoader] + dependencies { + if (modLoader == "fabric") { + required.project "fabric-api" // Fabric API + } + required.project "architectury-api" + embedded.project "cloth-config" + embedded.project "compatdatapacks" + } + } + } } - return props } -ext.info = loadProperties("$rootDir/info.properties") - allprojects { apply plugin: "java" apply plugin: "architectury-plugin" @@ -66,6 +133,8 @@ allprojects { tasks.withType(JavaCompile).configureEach { options.encoding = "UTF-8" options.release = 21 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } java { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java index f544d78fc..73b449343 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java @@ -2,6 +2,10 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.text.TextComponent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.client.ScreenUtil.RendererUtil; public class DrawObjectDM { private MatrixStack stack; @@ -30,4 +34,32 @@ public void setContext(DrawContext context) { public void setStack(MatrixStack stack) { this.stack = stack; } + + public void drawTexture(CompatIdentifier texture, int x, int y, float u, float v, int width, int height) { + RendererUtil.drawTexture(this, texture, x, y, u, v, width, height); + } + + public void drawTexture(CompatIdentifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { + RendererUtil.drawTexture(this, texture, x, y, u, v, width, height, textureWidth, textureHeight); + } + + public void drawText(Text text, int x, int y) { + RendererUtil.drawText(RendererUtil.getTextRenderer(), this, text, x, y); + } + + public void drawTooltip(Text text, int x, int y) { + RendererUtil.drawTooltip(this, text, x, y); + } + + public void drawText(TextComponent text, int x, int y) { + RendererUtil.drawText(RendererUtil.getTextRenderer(), this, text, x, y); + } + + public void drawTooltip(TextComponent text, int x, int y) { + RendererUtil.drawTooltip(this, text, x, y); + } + + public void drawBorder(int x, int y, int width, int height, int color) { + RendererUtil.drawBorder(this, x, y, width, height, color); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java index 98366531f..2d9e4512a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java @@ -79,6 +79,10 @@ public void sendSuccess(String message) { sendSuccess(TextUtil.literal(message)); } + public void sendFailure(String message) { + sendFailure(TextUtil.literal(message)); + } + public boolean isClient() { return WorldUtil.isClient(getWorld()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index 3c7a7741d..b3699abe3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -4,12 +4,14 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; import com.google.gson.JsonElement; +import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeEntry; import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; +import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; import java.util.Map; @@ -62,4 +64,9 @@ public void putCompatibleRecipeEntry(CompatibleRecipeEntry entry) { recipesById.put(entry.getId(), entry.getRecipeEntry()); recipesByType.put(entry.getType(), entry.getRecipeEntry()); } + + public > void putCompatibleRecipeEntry(CompatRecipeEntry entry) { + recipesById.put(entry.getId(), entry.getRecipeEntry()); + recipesByType.put(entry.getType(), entry.getRecipeEntry()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java new file mode 100644 index 000000000..568c2daa0 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java @@ -0,0 +1,52 @@ +package net.pitan76.mcpitanlib.api.recipe; + +import net.minecraft.recipe.*; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class CompatRecipeType> { + public static final CompatRecipeType CRAFTING = new CompatRecipeType<>(RecipeType.CRAFTING); + public static final CompatRecipeType SMELTING = new CompatRecipeType<>(RecipeType.SMELTING); + public static final CompatRecipeType BLASTING = new CompatRecipeType<>(RecipeType.BLASTING); + public static final CompatRecipeType SMOKING = new CompatRecipeType<>(RecipeType.SMOKING); + public static final CompatRecipeType CAMPFIRE_COOKING = new CompatRecipeType<>(RecipeType.CAMPFIRE_COOKING); + public static final CompatRecipeType STONECUTTING = new CompatRecipeType<>(RecipeType.STONECUTTING); + public static final CompatRecipeType SMITHING = new CompatRecipeType<>(RecipeType.SMITHING); + + private final RecipeType type; + + public CompatRecipeType(String id) { + this(RecipeType.register(id)); + } + + public CompatRecipeType(RecipeType type) { + this.type = type; + } + + public RecipeType getType() { + return type; + } + + public CompatIdentifier getName() { + Identifier id = Registries.RECIPE_TYPE.getId(type); + if (id == null) return CompatIdentifier.empty(); + + return CompatIdentifier.fromMinecraft(id); + } + + public static CompatRecipeType of(CompatIdentifier id) { + RecipeType type = Registries.RECIPE_TYPE.get(id.toMinecraft()); + if (type == null) return null; + + return new CompatRecipeType<>(type); + } + + public static > CompatRecipeType of(CompatIdentifier id, Class clazz) { + return (CompatRecipeType) of(id); + } + + public static > CompatRecipeType of(RecipeType type) { + return new CompatRecipeType<>(type); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java new file mode 100644 index 000000000..8457e5801 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.recipe; + +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.input.RecipeInput; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; +import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; + +import java.util.Optional; + +public interface MatchGetter> { + Optional> getFirstMatch(CompatRecipeInput input, World world); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java new file mode 100644 index 000000000..c7904361e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java @@ -0,0 +1,32 @@ +package net.pitan76.mcpitanlib.api.recipe.input; + +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.input.RecipeInput; + +public class CompatRecipeInput { + protected I input; + + public CompatRecipeInput(I input) { + this.input = input; + } + + public I getInput() { + return input; + } + + public ItemStack getStack(int slot) { + return input.getStackInSlot(slot); + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack(int slot) { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStack(slot)); + } + + public int getSize() { + return input.getSize(); + } + + public boolean isEmpty() { + return input.isEmpty(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java new file mode 100644 index 000000000..a448c5408 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java @@ -0,0 +1,65 @@ +package net.pitan76.mcpitanlib.api.recipe.v2; + +import net.minecraft.recipe.*; +import net.minecraft.recipe.input.RecipeInput; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.RecipeUtil; +import org.jetbrains.annotations.Nullable; + +public class CompatRecipeEntry> { + private final RecipeEntry entry; + + public String group = ""; + public RecipeUtil.CompatibilityCraftingRecipeCategory category = null; + + @Deprecated + public CompatRecipeEntry(RecipeEntry entry) { + this.entry = entry; + } + + public CompatRecipeEntry(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, T recipe) { + this.entry = new RecipeEntry<>(id, recipe); + this.group = group; + this.category = category; + } + + public boolean isNull() { + return entry == null; + } + + @Deprecated + public RecipeEntry getRecipeEntry() { + return entry; + } + + public T getRecipe() { + return entry.value(); + } + + public Identifier getId() { + return entry.id(); + } + + public RecipeType getType() { + T recipe = getRecipe(); + if (recipe == null) return null; + + return recipe.getType(); + } + + public RecipeSerializer getSerializer() { + Recipe recipe = getRecipe(); + if (recipe == null) return null; + + return recipe.getSerializer(); + } + + @Nullable + public RecipeUtil.CompatibilityCraftingRecipeCategory getCategory() { + return category; + } + + public String getGroup() { + return group; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index a00283d4a..333a075ba 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -7,6 +7,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import org.jetbrains.annotations.Nullable; public class BlockEntityUtil { @@ -63,4 +64,20 @@ public static void markDirty(BlockEntity blockEntity) { public static BlockEntityType getType(BlockEntity blockEntity) { return blockEntity.getType(); } + + public static void readNbt(BlockEntity blockEntity, NbtCompound nbt, CompatRegistryLookup registryLookup) { + blockEntity.readNbt(nbt, registryLookup.getRegistryLookup()); + } + + public static void writeNbt(BlockEntity blockEntity, NbtCompound nbt, CompatRegistryLookup registryLookup) { + blockEntity.writeNbt(nbt, registryLookup.getRegistryLookup()); + } + + public static void read(BlockEntity blockEntity, NbtCompound nbt, CompatRegistryLookup registryLookup) { + blockEntity.read(nbt, registryLookup.getRegistryLookup()); + } + + public static void createNbt(BlockEntity blockEntity, CompatRegistryLookup registryLookup) { + blockEntity.createNbt(registryLookup.getRegistryLookup()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java index 4a40880dd..8aafc8174 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java @@ -142,4 +142,12 @@ public Identifier toMinecraft() { public static CompatIdentifier fromMinecraft(Identifier id) { return of(id.toString()); } + + public static CompatIdentifier empty() { + return of("mcpitanlib:empty"); + } + + public boolean isEmpty() { + return this.equals("mcpitanlib:empty"); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java index 23682f1ed..e0b96c244 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java @@ -8,10 +8,17 @@ import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.recipe.CompatRecipeType; +import net.pitan76.mcpitanlib.api.recipe.MatchGetter; +import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; +import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; public class RecipeUtil { public static ShapelessRecipe createShapelessRecipe(Identifier id, String group, CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { @@ -45,7 +52,7 @@ public static ItemStack getOutput(Recipe recipe, World world) { } public static List> getAllRecipes(World world) { - Collection> recipes = world.getRecipeManager().values(); + Collection> recipes = getRecipeManager(world).values(); List> outRecipes = new ArrayList<>(); for (Object recipeEntryObj : recipes) { if (recipeEntryObj instanceof RecipeEntry) { @@ -66,6 +73,84 @@ public static Identifier getId(Recipe recipe) { return IdentifierUtil.id(recipe.getClass().hashCode() + ""); } + public static > CompatRecipeEntry getFirstMatch(RecipeManager recipeManager, CompatRecipeType type, CompatRecipeInput input, World world) { + Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world); + return recipe.map(CompatRecipeEntry::new).orElseGet(() -> new CompatRecipeEntry<>(null)); + } + + public static > CompatRecipeEntry getFirstMatch(RecipeManager recipeManager, CompatRecipeType type, CompatRecipeInput input, World world, CompatIdentifier identifier) { + Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world, identifier.toMinecraft()); + return recipe.map(CompatRecipeEntry::new).orElseGet(() -> new CompatRecipeEntry<>(null)); + } + + public static > CompatRecipeEntry getFirstMatch(World world, CompatRecipeType type, CompatRecipeInput input) { + return getFirstMatch(getRecipeManager(world), type, input, world); + } + + public static > CompatRecipeEntry getFirstMatch(World world, CompatRecipeType type, CompatRecipeInput input, CompatIdentifier identifier) { + return getFirstMatch(getRecipeManager(world), type, input, world, identifier); + } + + public static RecipeManager getRecipeManager(World world) { + return world.getRecipeManager(); + } + + public Optional> get(World world, CompatIdentifier id) { + return get(getRecipeManager(world), id); + } + + public Optional> get(RecipeManager recipeManager, CompatIdentifier id) { + return recipeManager.get(id.toMinecraft()); + } + + public static > MatchGetter createCachedMatchGetter(RecipeType type) { + return (input, world) -> { + Optional> optional = RecipeManager.createCachedMatchGetter(type).getFirstMatch(input.getInput(), world); + return optional.map(CompatRecipeEntry::new); + }; + } + + public static > MatchGetter createCachedMatchGetter(CompatRecipeType type) { + return createCachedMatchGetter(type.getType()); + } + + public static DefaultedList getInputs(Recipe recipe) { + return recipe.getIngredients(); + } + + public static DefaultedList getInputs(CompatRecipeEntry recipeEntry) { + return getInputs(recipeEntry.getRecipe()); + } + + public static ItemStackList getInputsAsStack(Recipe recipe) { + DefaultedList ingredients = getInputs(recipe); + ItemStackList stacks = ItemStackList.ofSize(ingredients.size(), ItemStackUtil.empty()); + for (Ingredient ingredient : ingredients) { + stacks.addAll(IngredientUtil.getMatchingStacksAsList(ingredient)); + } + return stacks; + } + + public static ItemStackList getInputsAsStack(CompatRecipeEntry recipeEntry) { + return getInputsAsStack(recipeEntry.getRecipe()); + } + + public static ItemStack getOutput(Recipe recipe, CompatRegistryLookup registryLookup) { + return recipe.getResult(registryLookup.getRegistryLookup()); + } + + public static ItemStack getOutput(CompatRecipeEntry recipeEntry, CompatRegistryLookup registryLookup) { + return recipeEntry.getRecipe().getResult(registryLookup.getRegistryLookup()); + } + + public static CompatRecipeType getType(CompatRecipeEntry recipeEntry) { + return CompatRecipeType.of(recipeEntry.getRecipe().getType()); + } + + public static > ItemStackList getRemainder(CompatRecipeEntry recipeEntry, CompatRecipeInput input) { + return ItemStackList.of(recipeEntry.getRecipe().getRemainder(input.getInput())); + } + public enum CompatibilityCraftingRecipeCategory { BUILDING, REDSTONE, diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java new file mode 100644 index 000000000..1a6fd78a8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java @@ -0,0 +1,43 @@ +package net.pitan76.mcpitanlib.api.util.block.entity; + +import net.minecraft.block.entity.AbstractFurnaceBlockEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.AbstractCookingRecipe; +import net.minecraft.recipe.input.SingleStackRecipeInput; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.recipe.MatchGetter; +import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; +import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.api.util.recipe.input.SingleStackRecipeInputUtil; + +public class FurnaceUtil { + public static int getDefaultCookTime() { + return AbstractFurnaceBlockEntity.DEFAULT_COOK_TIME; + } + + public static boolean canUseAsFuel(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return canUseAsFuel(stack.toMinecraft()); + } + + public static boolean canUseAsFuel(ItemStack stack) { + return AbstractFurnaceBlockEntity.canUseAsFuel(stack); + } + + public static void tick(World world, BlockPos pos, AbstractFurnaceBlockEntity blockEntity) { + AbstractFurnaceBlockEntity.tick(world, pos, WorldUtil.getBlockState(world, pos), blockEntity); + } + + public static int getCookTime(World world, AbstractFurnaceBlockEntity furnace, MatchGetter matchGetter) { + return getCookTime(world, furnace.getStack(0), matchGetter); + } + + public static int getCookTime(World world, ItemStack stack, MatchGetter matchGetter) { + CompatRecipeInput input = (CompatRecipeInput) SingleStackRecipeInputUtil.create(stack); + + matchGetter.getFirstMatch(input, world); + + return matchGetter.getFirstMatch(input, world).map( + (recipe) -> (recipe.getRecipe()).getCookingTime()).orElse(200); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index 1f0113681..7ba434766 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -17,6 +17,8 @@ import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import org.jetbrains.annotations.Nullable; +import java.util.List; + @Environment(EnvType.CLIENT) public class ScreenUtil { public static void setBackground(Identifier GUI, float f, float g, float h, float i) { @@ -176,6 +178,30 @@ public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, Tex public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, TextComponent text, int x, int y) { return drawText(renderer, drawObjectDM, text, x, y, 4210752); } + + public static void drawTooltip(DrawObjectDM drawObjectDM, TextRenderer textRenderer, Text text, int x, int y) { + drawObjectDM.getContext().drawTooltip(textRenderer, text, x, y); + } + + public static void drawTooltip(DrawObjectDM drawObjectDM, TextRenderer textRenderer, List texts, int x, int y) { + drawObjectDM.getContext().drawTooltip(textRenderer, texts, x, y); + } + + public static void drawBorder(DrawObjectDM drawObjectDM, int x, int y, int width, int height, int color) { + drawObjectDM.getContext().drawBorder(x, y, width, height, color); + } + + public static void drawTooltip(DrawObjectDM drawObjectDM, Text text, int x, int y) { + drawObjectDM.getContext().drawTooltip(getTextRenderer(), text, x, y); + } + + public static void drawTooltip(DrawObjectDM drawObjectDM, TextComponent text, int x, int y) { + drawTooltip(drawObjectDM, text.getText(), x, y); + } + + public static void drawTooltip(DrawObjectDM drawObjectDM, List texts, int x, int y) { + drawObjectDM.getContext().drawTooltip(getTextRenderer(), texts, x, y); + } } public static int getWidth(Text text) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PointUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PointUtil.java new file mode 100644 index 000000000..9af8468c3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PointUtil.java @@ -0,0 +1,15 @@ +package net.pitan76.mcpitanlib.api.util.math; + +public class PointUtil { + public static boolean isInRegion(int x, int y, int width, int height, int pointX, int pointY) { + return pointX >= x && pointX < x + width && pointY >= y && pointY < y + height; + } + + public static boolean isInRegion(int x, int y, int width, int height, double pointX, double pointY) { + return pointX >= x && pointX < x + width && pointY >= y && pointY < y + height; + } + + public static boolean isInRegion2(int x1, int y1, int x2, int y2, int pointX, int pointY) { + return pointX >= x1 && pointX < x2 && pointY >= y1 && pointY < y2; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java new file mode 100644 index 000000000..130d63767 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java @@ -0,0 +1,97 @@ +package net.pitan76.mcpitanlib.api.util.recipe.input; + +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.RecipeMatcher; +import net.minecraft.recipe.input.CraftingRecipeInput; +import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; + +import java.util.List; +import java.util.Optional; + +public class CraftingRecipeInputUtil { + public static Optional get(CompatRecipeInput input) { + if (input.getInput() instanceof CraftingRecipeInput) { + return Optional.of((CraftingRecipeInput) input.getInput()); + } + return Optional.empty(); + } + + public static CompatRecipeInput create(CraftingRecipeInput input) { + return new CompatRecipeInput<>(input); + } + + public static CompatRecipeInput create(int width, int height, List stacks) { + return new CompatRecipeInput<>(CraftingRecipeInput.create(width, height, stacks)); + } + + public static ItemStack getStack(CraftingRecipeInput input, int x, int y) { + return input.getStackInSlot(x, y); + } + + public static ItemStack getStack(CompatRecipeInput input, int x, int y) { + Optional recipeInput = get(input); + if (!recipeInput.isPresent()) return ItemStackUtil.empty(); + + return getStack(recipeInput.get(), x, y); + } + + public static net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack(CompatRecipeInput input, int x, int y) { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStack(input, x, y)); + } + + public static RecipeMatcher getRecipeMatcher(CraftingRecipeInput input) { + return input.getRecipeMatcher(); + } + + public static RecipeMatcher getRecipeMatcher(CompatRecipeInput input) { + Optional recipeInput = get(input); + if (!recipeInput.isPresent()) return null; + + return getRecipeMatcher(recipeInput.get()); + } + + public static List getStacks(CraftingRecipeInput input) { + return input.getStacks(); + } + + public static List getStacks(CompatRecipeInput input) { + Optional recipeInput = get(input); + if (!recipeInput.isPresent()) return null; + + return getStacks(recipeInput.get()); + } + + public static int getWidth(CraftingRecipeInput input) { + return input.getWidth(); + } + + public static int getWidth(CompatRecipeInput input) { + Optional recipeInput = get(input); + if (!recipeInput.isPresent()) return -1; + + return getWidth(recipeInput.get()); + } + + public static int getHeight(CraftingRecipeInput input) { + return input.getHeight(); + } + + public static int getHeight(CompatRecipeInput input) { + Optional recipeInput = get(input); + if (!recipeInput.isPresent()) return -1; + + return getHeight(recipeInput.get()); + } + + public static int getStackCount(CraftingRecipeInput input) { + return input.getStackCount(); + } + + public static int getStackCount(CompatRecipeInput input) { + Optional recipeInput = get(input); + if (!recipeInput.isPresent()) return -1; + + return getStackCount(recipeInput.get()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/SingleStackRecipeInputUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/SingleStackRecipeInputUtil.java new file mode 100644 index 000000000..daf08816f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/SingleStackRecipeInputUtil.java @@ -0,0 +1,32 @@ +package net.pitan76.mcpitanlib.api.util.recipe.input; + +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.input.SingleStackRecipeInput; +import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; + +import java.util.Optional; + +public class SingleStackRecipeInputUtil { + public static Optional get(CompatRecipeInput input) { + if (input.getInput() instanceof SingleStackRecipeInput) { + return Optional.of((SingleStackRecipeInput) input.getInput()); + } + return Optional.empty(); + } + + public static CompatRecipeInput create(SingleStackRecipeInput input) { + return new CompatRecipeInput<>(input); + } + + public static CompatRecipeInput create(ItemStack stack) { + return new CompatRecipeInput<>(new SingleStackRecipeInput(stack)); + } + + public static ItemStack getStack(CompatRecipeInput input) { + Optional recipeInput = get(input); + if (!recipeInput.isPresent()) return ItemStackUtil.empty(); + + return recipeInput.get().getStackInSlot(0); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java new file mode 100644 index 000000000..9b1a31163 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.api.util.world; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +public class TickerUtil { + public static void tick(T blockEntity, World world, BlockPos pos, BlockState state) { + if (blockEntity instanceof BlockEntityTicker) + ((BlockEntityTicker) blockEntity).tick(world, pos, state, blockEntity); + } + + public static void tick(T blockEntity, World world, BlockPos pos) { + tick(blockEntity, world, pos, WorldUtil.getBlockState(world, pos)); + } + + public static void tick(T blockEntity) { + tick(blockEntity, blockEntity.getWorld(), blockEntity.getPos()); + } + + public static void tick(T entity) { + entity.tick(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java index 97472b25f..e69e7b43d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java @@ -63,10 +63,10 @@ public static void drawRight2LeftProgressBar(DrawObjectDM drawObjectDM, int x, i } public static void drawBurningBar(DrawObjectDM drawObjectDM, int x, int y, int burnTime, int maxBurnTime) { - drawBottom2TopProgressBar(drawObjectDM, x, y, 0, 166, 0, 182, 16, 14, burnTime, maxBurnTime, GuiTextures.BASE_FURNACE_BACKGROUND); + drawBottom2TopProgressBar(drawObjectDM, x, y, 0, 168, 0, 184, 16, 14, burnTime, maxBurnTime, GuiTextures.BASE_FURNACE_BACKGROUND); } public static void drawHorizontalArrowBar(DrawObjectDM drawObjectDM, int x, int y, double value, double maxValue) { - drawLeft2RightProgressBar(drawObjectDM, x, y, 0, 166, 16, 182, 24, 16, value, maxValue, GuiTextures.BASE_FURNACE_BACKGROUND); + drawLeft2RightProgressBar(drawObjectDM, x, y, 0, 168, 16, 184, 24, 16, value, maxValue, GuiTextures.BASE_FURNACE_BACKGROUND); } } diff --git a/common/src/main/resources/mcpitanlib.accesswidener b/common/src/main/resources/mcpitanlib.accesswidener index 8a4da5e54..bb30c381c 100644 --- a/common/src/main/resources/mcpitanlib.accesswidener +++ b/common/src/main/resources/mcpitanlib.accesswidener @@ -20,4 +20,7 @@ accessible class net/minecraft/screen/ScreenHandlerType$Factory accessible method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V extendable method net/minecraft/screen/ScreenHandlerType (Lnet/minecraft/screen/ScreenHandlerType$Factory;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V -accessible class net/minecraft/datafixer/fix/ItemStackComponentizationFix$StackData \ No newline at end of file +accessible class net/minecraft/datafixer/fix/ItemStackComponentizationFix$StackData + +accessible method net/minecraft/block/entity/BlockEntity readNbt (Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;)V +accessible method net/minecraft/block/entity/BlockEntity writeNbt (Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/registry/RegistryWrapper$WrapperLookup;)V diff --git a/info.properties b/info.properties index a270254d4..212b6bcca 100644 --- a/info.properties +++ b/info.properties @@ -1,3 +1,4 @@ archives_base_name=mcpitanlib -mod_version=2.5.1 -maven_group=net.pitan76 \ No newline at end of file +mod_version=2.5.2 +maven_group=net.pitan76 +changelog= \ No newline at end of file From f92a30c46c10354e1799f6facfb383fd495561ca Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 12 Oct 2024 16:02:44 +0900 Subject: [PATCH 404/622] fix APIs --- .../api/client/SimpleHandledScreen.java | 8 ++--- .../mcpitanlib/api/client/SimpleScreen.java | 6 ++-- .../gui/screen/SimpleHandledScreen.java | 8 ++--- .../api/client/render/DrawObjectDM.java | 29 +++++++++++++++++++ .../mcpitanlib/api/util/BlockEntityUtil.java | 4 +-- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 1948aaa5f..1696a45ae 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -55,7 +55,7 @@ public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWi @Deprecated @Override protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { - DrawObjectDM drawObjectDM = new DrawObjectDM(context); + DrawObjectDM drawObjectDM = new DrawObjectDM(context, this); drawBackgroundOverride(new DrawBackgroundArgs(drawObjectDM, delta, mouseX, mouseY)); } @@ -64,7 +64,7 @@ protected void drawBackground(DrawContext context, float delta, int mouseX, int @Deprecated @Override protected void drawForeground(DrawContext context, int mouseX, int mouseY) { - DrawObjectDM drawObjectDM = new DrawObjectDM(context); + DrawObjectDM drawObjectDM = new DrawObjectDM(context, this); drawForegroundOverride(new DrawForegroundArgs(drawObjectDM, mouseX, mouseY)); } @@ -187,7 +187,7 @@ public int getBackgroundHeight() { @Deprecated @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - DrawObjectDM drawObjectDM = new DrawObjectDM(context); + DrawObjectDM drawObjectDM = new DrawObjectDM(context, this); renderOverride(new RenderArgs(drawObjectDM, mouseX, mouseY, delta)); } @@ -222,7 +222,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Deprecated @Override public void renderDarkening(DrawContext context) { - this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); + this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context, this), 0)); } public void closeOverride() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index 4b08c1c66..6fda0d8ad 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -58,7 +58,7 @@ public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, @Deprecated @Override public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) { - renderBackground(new RenderArgs(new DrawObjectDM(context), mouseX, mouseY, delta)); + renderBackground(new RenderArgs(new DrawObjectDM(context, this), mouseX, mouseY, delta)); } @@ -125,7 +125,7 @@ public void setHeight(int height) { @Deprecated @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - DrawObjectDM drawObjectDM = new DrawObjectDM(context); + DrawObjectDM drawObjectDM = new DrawObjectDM(context, this); render(new RenderArgs(drawObjectDM, mouseX, mouseY, delta)); } @@ -160,7 +160,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Deprecated @Override public void renderDarkening(DrawContext context) { - this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); + this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context, this), 0)); } public void closeOverride() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index 6bd2c3135..73dee0ee4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -66,7 +66,7 @@ public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWi @Deprecated @Override protected void drawBackground(DrawContext context, float delta, int mouseX, int mouseY) { - DrawObjectDM drawObjectDM = new DrawObjectDM(context); + DrawObjectDM drawObjectDM = new DrawObjectDM(context, this); drawBackgroundOverride(new DrawBackgroundArgs(drawObjectDM, delta, mouseX, mouseY)); } @@ -75,7 +75,7 @@ protected void drawBackground(DrawContext context, float delta, int mouseX, int @Deprecated @Override protected void drawForeground(DrawContext context, int mouseX, int mouseY) { - DrawObjectDM drawObjectDM = new DrawObjectDM(context); + DrawObjectDM drawObjectDM = new DrawObjectDM(context, this); drawForegroundOverride(new DrawForegroundArgs(drawObjectDM, mouseX, mouseY)); } @@ -198,7 +198,7 @@ public int getBackgroundHeight() { @Deprecated @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - DrawObjectDM drawObjectDM = new DrawObjectDM(context); + DrawObjectDM drawObjectDM = new DrawObjectDM(context, this); renderOverride(new RenderArgs(drawObjectDM, mouseX, mouseY, delta)); } @@ -233,7 +233,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @Deprecated @Override public void renderDarkening(DrawContext context) { - this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context), 0)); + this.renderBackgroundTexture(new RenderBackgroundTextureArgs(new DrawObjectDM(context, this), 0)); } public void closeOverride() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java index 73b449343..7f449b306 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectDM.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.client.render; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.Text; import net.pitan76.mcpitanlib.api.text.TextComponent; @@ -11,14 +12,22 @@ public class DrawObjectDM { private MatrixStack stack; private DrawContext context; + private Screen screen = null; + public DrawObjectDM(DrawContext context) { this.context = context; + this.stack = context.getMatrices(); } public DrawObjectDM(MatrixStack stack) { this.stack = stack; } + public DrawObjectDM(DrawContext context, Screen screen) { + this(context); + this.screen = screen; + } + public DrawContext getContext() { return context; } @@ -27,6 +36,10 @@ public MatrixStack getStack() { return stack; } + public Screen getScreen() { + return screen; + } + public void setContext(DrawContext context) { this.context = context; } @@ -35,6 +48,14 @@ public void setStack(MatrixStack stack) { this.stack = stack; } + public void setScreen(Screen screen) { + this.screen = screen; + } + + public boolean hasScreen() { + return screen != null; + } + public void drawTexture(CompatIdentifier texture, int x, int y, float u, float v, int width, int height) { RendererUtil.drawTexture(this, texture, x, y, u, v, width, height); } @@ -62,4 +83,12 @@ public void drawTooltip(TextComponent text, int x, int y) { public void drawBorder(int x, int y, int width, int height, int color) { RendererUtil.drawBorder(this, x, y, width, height, color); } + + public int getWidth() { + return hasScreen() ? screen.width : -1; + } + + public int getHeight() { + return hasScreen() ? screen.height : -1; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index 333a075ba..37d3a4a64 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -77,7 +77,7 @@ public static void read(BlockEntity blockEntity, NbtCompound nbt, CompatRegistry blockEntity.read(nbt, registryLookup.getRegistryLookup()); } - public static void createNbt(BlockEntity blockEntity, CompatRegistryLookup registryLookup) { - blockEntity.createNbt(registryLookup.getRegistryLookup()); + public static NbtCompound createNbt(BlockEntity blockEntity, CompatRegistryLookup registryLookup) { + return blockEntity.createNbt(registryLookup.getRegistryLookup()); } } From 68dc2b1b03b3d62035aa4111e154c130b4e6bb5d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 15 Oct 2024 20:23:27 +0900 Subject: [PATCH 405/622] buildable, but not working --- .../api/block/CompatChestBlock.java | 2 +- .../api/block/CompatStairsBlock.java | 5 +- .../api/block/CompatibleBlockSettings.java | 2 +- .../mcpitanlib/api/block/ExtendBlock.java | 27 ++++--- .../api/block/ExtendBlockProvider.java | 4 +- .../api/client/SimpleHandledScreen.java | 5 +- .../mcpitanlib/api/client/SimpleScreen.java | 3 +- .../event/listener/WorldRenderContext.java | 4 +- .../gui/screen/SimpleHandledScreen.java | 5 +- .../CompatibleTexturedButtonWidget.java | 4 +- .../api/enchantment/CompatEnchantment.java | 6 +- .../mcpitanlib/api/entity/CompatEntity.java | 7 ++ .../api/entity/CompatThrownItemEntity.java | 6 +- .../api/entity/EntityTypeBuilder.java | 18 ++++- .../mcpitanlib/api/entity/ExtendEntity.java | 7 ++ .../api/entity/ExtendEntityType.java | 12 ++- .../pitan76/mcpitanlib/api/entity/Player.java | 26 +++++-- .../api/entity/effect/CompatStatusEffect.java | 7 +- .../api/event/block/BlockUseEvent.java | 18 ++--- .../api/event/block/DroppedStacksArgs.java | 8 +- .../api/event/block/NeighborUpdateEvent.java | 22 +++++- .../block/StateForNeighborUpdateArgs.java | 29 ++++++- .../api/event/item/ItemUseEvent.java | 52 +++++++++---- .../api/event/item/ItemUseOnBlockEvent.java | 18 ++--- .../api/event/item/ItemUseOnEntityEvent.java | 18 ++--- .../api/event/result/EventResult.java | 5 ++ .../api/event/result/TypedEventResult.java | 28 +++++-- .../event/v0/InteractionEventRegistry.java | 22 +++--- .../event/v0/event/RecipeManagerEvent.java | 43 ++--------- .../api/item/ArmorEquipmentType.java | 20 ++--- .../api/item/CompatFoodComponent.java | 11 +-- .../api/item/CompatibleArmorItem.java | 23 +----- .../api/item/CompatibleArmorMaterial.java | 60 +++++---------- .../mcpitanlib/api/item/ExtendBlockItem.java | 28 +++---- .../mcpitanlib/api/item/ExtendItem.java | 43 ++++++----- .../api/item/ExtendItemProvider.java | 9 +-- .../api/item/tool/CompatibleAxeItem.java | 4 +- .../api/item/tool/CompatibleHoeItem.java | 4 +- .../item/tool/CompatibleMiningToolItem.java | 4 +- .../api/item/tool/CompatiblePickaxeItem.java | 4 +- .../api/item/tool/CompatibleShovelItem.java | 4 +- .../api/item/tool/CompatibleSwordItem.java | 4 +- .../api/item/tool/CompatibleToolItem.java | 17 +++-- .../api/item/tool/CompatibleToolMaterial.java | 33 ++++---- .../api/item/v2/ExtendBlockItem.java | 9 ++- .../api/item/v3/CompatArmorMaterial.java | 17 +++++ .../api/item/v3/CompatToolMaterial.java | 16 ++++ .../api/recipe/CompatibleRecipeEntry.java | 15 +++- .../api/recipe/input/CompatRecipeInput.java | 2 +- .../api/recipe/v2/CompatRecipeEntry.java | 16 +++- .../api/simple/block/SimpleGuiBlock.java | 4 +- .../api/simple/item/SimpleGuiItem.java | 5 +- .../api/sound/CompatSoundEvents.java | 7 +- .../api/state/property/CompatProperties.java | 9 +++ .../api/state/property/DirectionProperty.java | 37 +++++++++ .../api/state/property/IProperty.java | 21 +++++ .../api/tag/item/RepairIngredientTag.java | 48 ++++++++++++ .../api/tile/BlockEntityTypeBuilder.java | 2 +- .../mcpitanlib/api/util/ActionResultUtil.java | 30 -------- .../mcpitanlib/api/util/BlockStateUtil.java | 21 ++--- .../api/util/CommandManagerUtil.java | 3 +- .../api/util/CompatActionResult.java | 76 +++++++++++++++++++ .../mcpitanlib/api/util/EntityUtil.java | 16 ++-- .../api/util/EquipMaterialUtil.java | 39 ++-------- .../mcpitanlib/api/util/IngredientUtil.java | 39 ++++++++-- .../mcpitanlib/api/util/InteractUtil.java | 21 +++-- .../pitan76/mcpitanlib/api/util/NbtUtil.java | 2 +- .../mcpitanlib/api/util/PropertyUtil.java | 18 +++-- .../mcpitanlib/api/util/RecipeUtil.java | 59 ++++++++++---- .../mcpitanlib/api/util/SoundEventUtil.java | 2 +- .../mcpitanlib/api/util/WorldUtil.java | 6 +- .../api/util/block/entity/FurnaceUtil.java | 11 +-- .../api/util/client/ClientUtil.java | 3 +- .../api/util/client/RenderUtil.java | 8 +- .../api/util/client/ScreenUtil.java | 5 +- .../api/util/entity/SnowballEntityUtil.java | 7 +- .../api/util/event/ItemEventGenerator.java | 7 +- .../api/util/recipe/RecipeMatcherUtil.java | 24 +++--- .../recipe/input/CraftingRecipeInputUtil.java | 6 +- .../api/util/world/WorldViewUtil.java | 2 +- .../mcpitanlib/core/player/ItemCooldown.java | 15 +++- .../core/registry/FuelRegistry.java | 14 +++- .../guilib/api/render/PartsRenderer.java | 8 +- .../mcpitanlib/mixin/AbstractBlockMixin.java | 6 +- .../pitan76/mcpitanlib/mixin/ItemMixin.java | 15 ++-- .../mcpitanlib/mixin/RecipeManagerMixin.java | 21 ++--- .../mcpitanlib/test/ExampleGuiBlock.java | 4 +- .../mcpitanlib/test/ExampleGuiItem.java | 5 +- .../event/fabric/WorldRenderRegistryImpl.java | 10 --- .../mcpitanlib/fabric/mixin/RecipeMixin.java | 10 +-- info.properties | 2 +- 91 files changed, 874 insertions(+), 530 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java delete mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/ActionResultUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java index b507732c8..05d6c307d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java @@ -12,7 +12,7 @@ public class CompatChestBlock extends ChestBlock { public CompatChestBlock(Settings settings, Supplier> supplier) { - super(settings, supplier); + super(supplier, settings); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java index 8f6ff0337..f879b58ca 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.EnumProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; @@ -17,11 +16,13 @@ import net.pitan76.mcpitanlib.api.event.block.CanPathfindThroughArgs; import net.pitan76.mcpitanlib.api.event.block.OutlineShapeEvent; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.state.property.CompatProperties; +import net.pitan76.mcpitanlib.api.state.property.DirectionProperty; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatStairsBlock extends StairsBlock implements ExtendBlockProvider { - public static final DirectionProperty FACING = StairsBlock.FACING; + public static final DirectionProperty FACING = CompatProperties.HORIZONTAL_FACING; public static final EnumProperty HALF = StairsBlock.HALF; public static final EnumProperty SHAPE = StairsBlock.SHAPE; public static final BooleanProperty WATERLOGGED = StairsBlock.WATERLOGGED; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java index 48a18f468..053d21c56 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java @@ -128,8 +128,8 @@ public CompatibleBlockSettings mapColor(Function color) { return this; } + @Deprecated public CompatibleBlockSettings dropsLike(Block source) { - settings.dropsLike(source); return this; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 56795ff2a..76712d7e0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -14,7 +14,7 @@ import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; import net.minecraft.item.tooltip.TooltipType; -import net.minecraft.loot.context.LootContextParameterSet; +import net.minecraft.loot.context.LootWorldContext; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; @@ -29,14 +29,17 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; +import net.minecraft.world.block.WireOrientation; +import net.minecraft.world.tick.ScheduledTickView; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; import net.pitan76.mcpitanlib.api.event.block.StateForNeighborUpdateArgs; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; import org.jetbrains.annotations.Nullable; @@ -110,7 +113,7 @@ public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Ran @Override @Deprecated protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { - return onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit)); + return onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit)).toActionResult(); } /** @@ -118,8 +121,8 @@ protected ActionResult onUse(BlockState state, World world, BlockPos pos, Player * @param event ActionResultType * @return BlockUseEvent */ - public ActionResult onRightClick(BlockUseEvent event) { - return super.onUse(event.state, event.world, event.pos, event.player.getPlayerEntity(), event.hit); + public CompatActionResult onRightClick(BlockUseEvent event) { + return CompatActionResult.create(super.onUse(event.state, event.world, event.pos, event.player.getPlayerEntity(), event.hit)); } @Deprecated @@ -211,7 +214,7 @@ public void onStateReplaced(StateReplacedEvent event) { @Deprecated @Override - public List getDroppedStacks(BlockState state, LootContextParameterSet.Builder builder) { + public List getDroppedStacks(BlockState state, LootWorldContext.Builder builder) { return getDroppedStacks(new DroppedStacksArgs(state, builder)); } @@ -226,8 +229,8 @@ public List getDroppedStacks(DroppedStacksArgs args) { @Deprecated @Override - public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { - neighborUpdate(new NeighborUpdateEvent(state, world, pos, sourceBlock, sourcePos, notify)); + public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, WireOrientation wireOrientation, boolean notify) { + neighborUpdate(new NeighborUpdateEvent(state, world, pos, sourceBlock, wireOrientation, notify)); } /** @@ -235,7 +238,7 @@ public void neighborUpdate(BlockState state, World world, BlockPos pos, Block so * @param event NeighborUpdateEvent */ public void neighborUpdate(NeighborUpdateEvent event) { - super.neighborUpdate(event.state, event.world, event.pos, event.sourceBlock, event.sourcePos, event.notify); + super.neighborUpdate(event.state, event.world, event.pos, event.sourceBlock, event.wireOrientation, event.notify); } @Deprecated @@ -349,12 +352,12 @@ public FluidState getFluidState(FluidStateArgs args) { @Deprecated @Override - protected BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { - return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos)); + protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos, tickView, new CompatRandom(random))); } public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { - return super.getStateForNeighborUpdate(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos); + return super.getStateForNeighborUpdate(args.state, args.world, args.tickView, args.pos, args.direction, args.neighborPos, args.neighborState, args.random.getMcRandom()); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java index 19f450e2e..996661e2f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlockProvider.java @@ -4,11 +4,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.TextUtil; import java.util.List; @@ -52,7 +52,7 @@ default void scheduledTick(BlockScheduledTickEvent event, Options options) { * @param options Options * @return ActionResult */ - default ActionResult onRightClick(BlockUseEvent event, Options options) { + default CompatActionResult onRightClick(BlockUseEvent event, Options options) { options.cancel = false; return null; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 1696a45ae..9076e7feb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; @@ -73,9 +74,7 @@ protected void drawForegroundOverride(DrawForegroundArgs args) { } public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { - //ScreenUtil.setBackground(GUI); - //super.drawTexture(matrices, x, y, u, v, width, height); - drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); + drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); } public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index 6fda0d8ad..b6eed54f7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -48,7 +49,7 @@ public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWi public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { //ScreenUtil.setBackground(GUI); //super.drawTexture(matrices, x, y, u, v, width, height); - drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); + drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); } public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java index c4bd03d35..10f36d4fb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java @@ -40,8 +40,6 @@ public interface WorldRenderContext { ClientWorld getWorld(); - Profiler getProfiler(); - @Deprecated boolean isAdvancedTranslucency(); @@ -123,6 +121,6 @@ default void drawBox(Box box, float red, float green, float blue, float alpha) { if (!vertexConsumer.isPresent()) return; - WorldRenderer.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); + VertexRendering.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index 73dee0ee4..266fc9d96 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; +import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; @@ -84,9 +85,7 @@ protected void drawForegroundOverride(DrawForegroundArgs args) { } public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { - //ScreenUtil.setBackground(GUI); - //super.drawTexture(matrices, x, y, u, v, width, height); - drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height); + drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); } public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java index 570ccc957..d69357a5e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -4,6 +4,7 @@ import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TexturedButtonWidget; +import net.minecraft.client.render.RenderLayer; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; @@ -68,6 +69,7 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt } else if (this.isHovered()) { i += hoveredVOffset; } - context.drawTexture(texture, this.getX(), this.getY(), u, i, this.width, this.height, textureWidth, textureHeight); + + context.drawTexture(RenderLayer::getGuiTextured, texture, this.getX(), this.getY(), u, i, this.width, this.height, textureWidth, textureHeight); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java index d20d4a2b4..9a685a047 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java @@ -50,10 +50,10 @@ public boolean equals(Object obj) { public RegistryEntry getEntry(@Nullable World world) { Optional> optionalEntry; if (world == null) { - optionalEntry = BuiltinRegistries.createWrapperLookup().createRegistryLookup() - .getOptionalEntry(RegistryKeys.ENCHANTMENT, registryKey); + optionalEntry = BuiltinRegistries.createWrapperLookup() + .getOptionalEntry(registryKey); } else { - optionalEntry = world.getRegistryManager().get(RegistryKeys.ENCHANTMENT).getEntry(registryKey); + optionalEntry = world.getRegistryManager().getOptionalEntry(registryKey); } return optionalEntry.orElseThrow(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java index 796da806b..73593fd96 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java @@ -2,10 +2,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; @@ -22,6 +24,11 @@ public void initDataTracker(DataTracker.Builder builder) { initDataTracker(new InitDataTrackerArgs(builder)); } + @Override + public boolean damage(ServerWorld world, DamageSource source, float amount) { + return false; + } + public void initDataTracker(InitDataTrackerArgs args) { } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java index a7f71a891..3217ef58a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java @@ -7,7 +7,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; -import net.minecraft.text.Text; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; @@ -16,6 +15,7 @@ import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public abstract class CompatThrownItemEntity extends ThrownItemEntity { @@ -24,11 +24,11 @@ public CompatThrownItemEntity(EntityType entityType, } public CompatThrownItemEntity(EntityType entityType, double d, double e, double f, World world) { - super(entityType, d, e, f, world); + super(entityType, d, e, f, world, ItemStackUtil.empty()); } public CompatThrownItemEntity(EntityType entityType, LivingEntity livingEntity, World world) { - super(entityType, livingEntity, world); + super(entityType, livingEntity, world, ItemStackUtil.empty()); } public abstract Item getDefaultItemOverride(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/EntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/EntityTypeBuilder.java index 25263250e..933e0d8fc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/EntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/EntityTypeBuilder.java @@ -6,6 +6,11 @@ import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; +import net.minecraft.loot.LootTable; +import net.minecraft.registry.RegistryKey; +import net.pitan76.mcpitanlib.MCPitanLib; + +import java.util.Optional; public class EntityTypeBuilder { @@ -20,7 +25,8 @@ public class EntityTypeBuilder { private int maxTrackDistance; private int trackTickInterval; private Boolean alwaysUpdateVelocity = null; - + private String translationKey = "entity." + MCPitanLib.MOD_ID; + private Optional> lootTable = Optional.empty(); @Deprecated // Recommend: create() @@ -51,7 +57,7 @@ public static EntityTypeBuilder create(SpawnGroup spawnGro } public EntityType build() { - return new ExtendEntityType<>(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, alwaysUpdateVelocity); + return new ExtendEntityType<>(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, maxTrackDistance, trackTickInterval, translationKey, lootTable, alwaysUpdateVelocity); } public EntityTypeBuilder setSpawnGroup(SpawnGroup spawnGroup) { @@ -116,4 +122,12 @@ public EntityTypeBuilder setAlwaysUpdateVelocity(Boolean alwaysUpdateVelocity this.alwaysUpdateVelocity = alwaysUpdateVelocity; return this; } + + public void setTranslationKey(String translationKey) { + this.translationKey = translationKey; + } + + public void setLootTable(RegistryKey lootTable) { + this.lootTable = Optional.ofNullable(lootTable); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java index e9fcd70ce..6217f4cf8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java @@ -2,10 +2,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; +import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; +import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.nbt.NbtTag; @@ -20,6 +22,11 @@ public void initDataTracker(DataTracker.Builder builder) { initDataTracker(); } + @Override + public boolean damage(ServerWorld world, DamageSource source, float amount) { + return false; + } + public void initDataTracker() { } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java index 57bc7e021..38fee4052 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java @@ -6,20 +6,24 @@ import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; +import net.minecraft.loot.LootTable; +import net.minecraft.registry.RegistryKey; import net.minecraft.resource.featuretoggle.FeatureFlags; import net.minecraft.world.World; +import java.util.Optional; + public class ExtendEntityType extends EntityType { private final Boolean alwaysUpdateVelocity; @Deprecated - public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { - super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); + public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, String translationKey, Optional> lootTable, Boolean alwaysUpdateVelocity) { + super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, translationKey, lootTable, FeatureFlags.DEFAULT_ENABLED_FEATURES); this.alwaysUpdateVelocity = alwaysUpdateVelocity; } - public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) { - super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, 5, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); + public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, String translationKey, Optional> lootTable, Boolean alwaysUpdateVelocity) { + super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, 5, maxTrackDistance, trackTickInterval, translationKey, lootTable, FeatureFlags.DEFAULT_ENABLED_FEATURES); this.alwaysUpdateVelocity = alwaysUpdateVelocity; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 8e374fc24..9a12763a1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -344,8 +344,9 @@ public Direction getHorizontalFacing() { return getEntity().getHorizontalFacing(); } + // TODO: 1.21.2 public void eatFood(World world, ItemStack stack, CompatFoodComponent foodComponentBuilder) { - getEntity().eatFood(world, stack, foodComponentBuilder.build()); + //getEntity().eatFood(world, stack, foodComponentBuilder.build()); } public double getX() { @@ -477,31 +478,44 @@ public void setTotalExperience(int experience) { getEntity().totalExperience = experience; } + // TODO: 1.21.2 public boolean isFallFlying() { - return getEntity().isFallFlying(); + return false; } public boolean isSwimming() { return getEntity().isSwimming(); } + // TODO: 1.21.2 public void startFallFlying() { - getEntity().startFallFlying(); + } + // TODO: 1.21.2 public void stopFallFlying() { - getEntity().stopFallFlying(); + } + // TODO: 1.21.2 public int getFallFlyingTicks() { - return getEntity().getFallFlyingTicks(); + return 0; } + // TODO: 1.21.2 public boolean checkFallFlying() { - return getEntity().checkFallFlying(); + return false; } public void setStackInHand(Hand hand, ItemStack stack) { getEntity().setStackInHand(hand, stack); } + + public void setStackInHand(Hand hand, net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + setStackInHand(hand, stack.toMinecraft()); + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStackInHand(Hand hand) { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStackInHand(hand)); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java index a8e9d4a57..3b0b77435 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java @@ -3,7 +3,6 @@ import net.minecraft.entity.effect.StatusEffect; import net.minecraft.registry.BuiltinRegistries; import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Identifier; import net.minecraft.world.World; @@ -48,10 +47,10 @@ public boolean equals(Object obj) { public RegistryEntry getEntry(@Nullable World world) { Optional> optionalEntry; if (world == null) { - optionalEntry = BuiltinRegistries.createWrapperLookup().createRegistryLookup() - .getOptionalEntry(RegistryKeys.STATUS_EFFECT, registryKey); + optionalEntry = BuiltinRegistries.createWrapperLookup() + .getOptionalEntry(registryKey); } else { - optionalEntry = world.getRegistryManager().get(RegistryKeys.STATUS_EFFECT).getEntry(registryKey); + optionalEntry = world.getRegistryManager().getOptionalEntry(registryKey); } return optionalEntry.orElseThrow(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java index 62c6b3e4a..55b5f4d50 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java @@ -4,13 +4,13 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.WorldUtil; public class BlockUseEvent extends BaseEvent { @@ -64,20 +64,20 @@ public boolean isClient() { return world.isClient(); } - public ActionResult success() { - return ActionResult.SUCCESS; + public CompatActionResult success() { + return CompatActionResult.SUCCESS; } - public ActionResult fail() { - return ActionResult.FAIL; + public CompatActionResult fail() { + return CompatActionResult.FAIL; } - public ActionResult pass() { - return ActionResult.PASS; + public CompatActionResult pass() { + return CompatActionResult.PASS; } - public ActionResult consume() { - return ActionResult.CONSUME; + public CompatActionResult consume() { + return CompatActionResult.CONSUME; } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java index edb85cb20..b2d322b87 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java @@ -2,15 +2,15 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.loot.context.LootContextParameters; +import net.minecraft.loot.context.LootWorldContext; import net.pitan76.mcpitanlib.api.event.BaseEvent; public class DroppedStacksArgs extends BaseEvent { public BlockState state; - public LootContextParameterSet.Builder builder; + public LootWorldContext.Builder builder; - public DroppedStacksArgs(BlockState state, LootContextParameterSet.Builder builder) { + public DroppedStacksArgs(BlockState state, LootWorldContext.Builder builder) { this.state = state; this.builder = builder; } @@ -20,7 +20,7 @@ public BlockState getState() { } @Deprecated - public LootContextParameterSet.Builder getBuilder() { + public LootWorldContext.Builder getBuilder() { return builder; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java index 399bb414a..e86a68fa3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java @@ -5,18 +5,26 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.block.WireOrientation; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import org.jetbrains.annotations.Nullable; public class NeighborUpdateEvent extends BaseEvent { public BlockState state; public World world; public BlockPos pos; public Block sourceBlock; + + @Nullable public BlockPos sourcePos; + + @Nullable + public WireOrientation wireOrientation; + public boolean notify; - public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { + public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block sourceBlock, @Nullable BlockPos sourcePos, boolean notify) { this.state = state; this.world = world; this.pos = pos; @@ -25,6 +33,11 @@ public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block so this.notify = notify; } + public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block sourceBlock, @Nullable WireOrientation wireOrientation, boolean notify) { + this(state, world, pos, sourceBlock, (BlockPos) null, notify); + this.wireOrientation = wireOrientation; + } + public BlockState getState() { return state; } @@ -41,7 +54,7 @@ public Block getSourceBlock() { return sourceBlock; } - public BlockPos getSourcePos() { + public @Nullable BlockPos getSourcePos() { return sourcePos; } @@ -60,4 +73,9 @@ public BlockEntity getBlockEntity() { public boolean hasBlockEntity() { return WorldUtil.hasBlockEntity(world, pos); } + + @Deprecated + public @Nullable WireOrientation getWireOrientation() { + return wireOrientation; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java index b48adc4d9..034355d4c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java @@ -5,14 +5,19 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; public class StateForNeighborUpdateArgs { public BlockState state; public Direction direction; public BlockState neighborState; - public WorldAccess world; + public WorldView world; public BlockPos pos; public BlockPos neighborPos; + public ScheduledTickView tickView; + public CompatRandom random; public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { this.state = state; @@ -23,6 +28,17 @@ public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockSt this.neighborPos = neighborPos; } + public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldView world, BlockPos pos, BlockPos neighborPos, ScheduledTickView tickView, CompatRandom random) { + this.state = state; + this.direction = direction; + this.neighborState = neighborState; + this.world = world; + this.pos = pos; + this.neighborPos = neighborPos; + this.tickView = tickView; + this.random = random; + } + public BlockState getState() { return state; } @@ -47,7 +63,7 @@ public BlockState getNeighborState() { return neighborState; } - public WorldAccess getWorld() { + public WorldView getWorld() { return world; } @@ -58,4 +74,13 @@ public BlockPos getPos() { public BlockPos getNeighborPos() { return neighborPos; } + + public CompatRandom getRandom() { + return random; + } + + @Deprecated + public ScheduledTickView getTickView() { + return tickView; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index 0183559b3..5805cccb4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -2,11 +2,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class ItemUseEvent extends BaseEvent { @@ -26,6 +27,10 @@ public ItemStack getStack() { return stack; } + public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(stack); + } + public Hand getHand() { return hand; } @@ -33,6 +38,7 @@ public Hand getHand() { public World getWorld() { return world; } + public Player getUser() { return user; } @@ -41,27 +47,47 @@ public boolean isClient() { return world.isClient(); } - public TypedActionResult success(ItemStack stack) { - return TypedActionResult.success(stack); + public CompatActionResult success(ItemStack stack) { + if (getStack() != stack) { + CompatActionResult.create(ActionResult.SUCCESS.withNewHandStack(stack)); + } + + return success(); } - public TypedActionResult fail() { - return TypedActionResult.fail(stack); + public CompatActionResult success(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return success(stack.toMinecraft()); } - public TypedActionResult pass() { - return TypedActionResult.pass(stack); + public CompatActionResult success() { + return CompatActionResult.SUCCESS; } - public TypedActionResult consume() { - return TypedActionResult.consume(stack); + public CompatActionResult fail() { + return CompatActionResult.FAIL; } - public boolean isSneaking() { - return user.isSneaking(); + public CompatActionResult pass() { + return CompatActionResult.PASS; } - public TypedActionResult success() { - return success(stack); + public CompatActionResult consume(ItemStack stack) { + if (getStack() != stack) { + CompatActionResult.create(ActionResult.CONSUME.withNewHandStack(stack)); + } + + return consume(); + } + + public CompatActionResult consume(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return consume(stack.toMinecraft()); + } + + public CompatActionResult consume() { + return CompatActionResult.CONSUME; + } + + public boolean isSneaking() { + return user.isSneaking(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java index 583a4a4fb..080663db9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java @@ -5,7 +5,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; -import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -14,6 +13,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.WorldUtil; import org.jetbrains.annotations.Nullable; @@ -75,20 +75,20 @@ public ItemStack getStack() { return stack; } - public ActionResult success() { - return ActionResult.SUCCESS; + public CompatActionResult success() { + return CompatActionResult.SUCCESS; } - public ActionResult fail() { - return ActionResult.FAIL; + public CompatActionResult fail() { + return CompatActionResult.FAIL; } - public ActionResult pass() { - return ActionResult.PASS; + public CompatActionResult pass() { + return CompatActionResult.PASS; } - public ActionResult consume() { - return ActionResult.CONSUME; + public CompatActionResult consume() { + return CompatActionResult.CONSUME; } public BlockEntity getBlockEntity() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java index 879d27d4c..53c2822f4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnEntityEvent.java @@ -3,10 +3,10 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class ItemUseOnEntityEvent extends BaseEvent { @@ -49,19 +49,19 @@ public boolean isClient() { return user.isClient(); } - public ActionResult success() { - return ActionResult.SUCCESS; + public CompatActionResult success() { + return CompatActionResult.SUCCESS; } - public ActionResult fail() { - return ActionResult.FAIL; + public CompatActionResult fail() { + return CompatActionResult.FAIL; } - public ActionResult pass() { - return ActionResult.PASS; + public CompatActionResult pass() { + return CompatActionResult.PASS; } - public ActionResult consume() { - return ActionResult.CONSUME; + public CompatActionResult consume() { + return CompatActionResult.CONSUME; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java index eefce4ca1..67dcae814 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/EventResult.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.event.result; import net.minecraft.util.ActionResult; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class EventResult { @@ -40,4 +41,8 @@ public dev.architectury.event.EventResult getResult() { public ActionResult toActionResult() { return result.asMinecraft(); } + + public CompatActionResult toCompatActionResult() { + return CompatActionResult.create(toActionResult()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java index 971177e9b..dacb8ca36 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java @@ -1,8 +1,9 @@ package net.pitan76.mcpitanlib.api.event.result; import dev.architectury.event.CompoundEventResult; +import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; -import net.minecraft.util.TypedActionResult; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class TypedEventResult { protected final dev.architectury.event.CompoundEventResult result; @@ -32,11 +33,28 @@ public dev.architectury.event.CompoundEventResult getResult() { return result; } - public TypedActionResult toTypedActionResult() { - return result.asMinecraft(); + public ActionResult toActionResult() { + return result.result().asMinecraft(); } - public ActionResult toActionResult() { - return result.asMinecraft().getResult(); + public CompatActionResult toCompatActionResult() { + return CompatActionResult.of(result.result().asMinecraft()); + } + + public CompatActionResult toCompatActionResult(ItemStack stack) { + if (result.object() != stack) + return toCompatActionResult(); + + if (toActionResult() instanceof ActionResult.Success) { + ActionResult.Success success = (ActionResult.Success) toActionResult(); + + return CompatActionResult.create(success.withNewHandStack(stack)); + } + + return toCompatActionResult(); + } + + public CompatActionResult toCompatActionResult(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return toCompatActionResult(stack.toMinecraft()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java index d31cf54c5..65a8d74b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java @@ -1,25 +1,22 @@ package net.pitan76.mcpitanlib.api.event.v0; -import dev.architectury.event.CompoundEventResult; import dev.architectury.event.events.common.InteractionEvent; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.result.EventResult; -import net.pitan76.mcpitanlib.api.event.result.TypedEventResult; import net.pitan76.mcpitanlib.api.event.v0.event.ClickBlockEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class InteractionEventRegistry { - @SuppressWarnings("deprecation") public static void registerRightClickBlock(RightClickBlock rightClickBlock) { - InteractionEvent.RIGHT_CLICK_BLOCK.register((player, hand, pos, direction) -> rightClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).getResult()); + InteractionEvent.RIGHT_CLICK_BLOCK.register((player, hand, pos, direction) -> rightClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).toActionResult()); } - @SuppressWarnings("deprecation") public static void registerLeftClickBlock(LeftClickBlock leftClickBlock) { - InteractionEvent.LEFT_CLICK_BLOCK.register((player, hand, pos, direction) -> leftClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).getResult()); + InteractionEvent.LEFT_CLICK_BLOCK.register((player, hand, pos, direction) -> leftClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).toActionResult()); } public static void registerRightClickItem(RightClickItem rightClickItem) { @@ -49,12 +46,11 @@ public interface RightClickBlock { } public interface RightClickItem { - @SuppressWarnings("deprecation") - default CompoundEventResult click(PlayerEntity var1, Hand var2) { - return click(new Player(var1), var2).getResult(); + default ActionResult click(PlayerEntity var1, Hand var2) { + return click(new Player(var1), var2).toActionResult(); } - TypedEventResult click(Player player, Hand hand); + CompatActionResult click(Player player, Hand hand); } public interface ClientLeftClickAir { @@ -76,9 +72,9 @@ default void click(PlayerEntity var1, Hand var2) { public interface InteractEntity { @SuppressWarnings("deprecation") default dev.architectury.event.EventResult interact(PlayerEntity var1, Entity var2, Hand var3) { - return interact(new Player(var1), var2, var3).getResult(); + return interact(new Player(var1), var2, var3).toEventResult().getResult(); } - EventResult interact(Player player, Entity entity, Hand hand); + CompatActionResult interact(Player player, Entity entity, Hand hand); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index b3699abe3..c91e9235e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -1,51 +1,26 @@ package net.pitan76.mcpitanlib.api.event.v0.event; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimap; -import com.google.gson.JsonElement; import net.minecraft.recipe.Recipe; -import net.minecraft.recipe.RecipeEntry; -import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; -import java.util.Map; +import java.util.SortedMap; public class RecipeManagerEvent { - public Map jsonMap; - public ResourceManager resourceManager; - public Profiler profiler; @Deprecated - public ImmutableMap.Builder> recipesById; + private SortedMap> sortedMap; - @Deprecated - public ImmutableMultimap.Builder, RecipeEntry> recipesByType; + public ResourceManager resourceManager; + public Profiler profiler; - public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, ImmutableMap.Builder> recipesById, ImmutableMultimap.Builder, RecipeEntry> recipesByType) { - this.jsonMap = map; + public RecipeManagerEvent(SortedMap> sortedMap, ResourceManager resourceManager, Profiler profiler) { + this.sortedMap = sortedMap; this.resourceManager = resourceManager; this.profiler = profiler; - this.recipesById = recipesById; - this.recipesByType = recipesByType; - } - - public Map getJsonMap() { - return jsonMap; - } - - @Deprecated - public ImmutableMap.Builder> getRecipesById() { - return recipesById; - } - - @Deprecated - public ImmutableMultimap.Builder, RecipeEntry> getRecipesByType() { - return recipesByType; } public Profiler getProfiler() { @@ -61,12 +36,10 @@ public void putCompatibleRecipeEntry(Identifier id, CompatibleRecipeEntry entry) } public void putCompatibleRecipeEntry(CompatibleRecipeEntry entry) { - recipesById.put(entry.getId(), entry.getRecipeEntry()); - recipesByType.put(entry.getType(), entry.getRecipeEntry()); + sortedMap.put(entry.getId(), entry.getRecipe()); } public > void putCompatibleRecipeEntry(CompatRecipeEntry entry) { - recipesById.put(entry.getId(), entry.getRecipeEntry()); - recipesByType.put(entry.getType(), entry.getRecipeEntry()); + sortedMap.put(entry.getId(), entry.getRecipe()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java index c1ec04ae7..09198de39 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java @@ -1,23 +1,23 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.entity.EquipmentSlot; -import net.minecraft.item.ArmorItem; +import net.minecraft.item.equipment.EquipmentType; import org.jetbrains.annotations.Nullable; public class ArmorEquipmentType { - public static ArmorEquipmentType HEAD = new ArmorEquipmentType(EquipmentSlot.HEAD, ArmorItem.Type.HELMET); - public static ArmorEquipmentType CHEST = new ArmorEquipmentType(EquipmentSlot.CHEST, ArmorItem.Type.CHESTPLATE); - public static ArmorEquipmentType LEGS = new ArmorEquipmentType(EquipmentSlot.LEGS, ArmorItem.Type.LEGGINGS); - public static ArmorEquipmentType FEET = new ArmorEquipmentType(EquipmentSlot.FEET, ArmorItem.Type.BOOTS); + public static ArmorEquipmentType HEAD = new ArmorEquipmentType(EquipmentSlot.HEAD, EquipmentType.HELMET); + public static ArmorEquipmentType CHEST = new ArmorEquipmentType(EquipmentSlot.CHEST, EquipmentType.CHESTPLATE); + public static ArmorEquipmentType LEGS = new ArmorEquipmentType(EquipmentSlot.LEGS, EquipmentType.LEGGINGS); + public static ArmorEquipmentType FEET = new ArmorEquipmentType(EquipmentSlot.FEET, EquipmentType.BOOTS); // New type for animals from 1.20.5 - public static ArmorEquipmentType BODY = new ArmorEquipmentType(EquipmentSlot.BODY, ArmorItem.Type.BODY); + public static ArmorEquipmentType BODY = new ArmorEquipmentType(EquipmentSlot.BODY, EquipmentType.BODY); protected final EquipmentSlot slot; - protected final ArmorItem.Type type; + protected final EquipmentType type; - protected ArmorEquipmentType(EquipmentSlot slot, ArmorItem.Type type) { + protected ArmorEquipmentType(EquipmentSlot slot, EquipmentType type) { this.slot = slot; this.type = type; } @@ -28,7 +28,7 @@ public EquipmentSlot getSlot() { } @Deprecated - public ArmorItem.Type getType() { + public EquipmentType getType() { return type; } @@ -54,7 +54,7 @@ public static ArmorEquipmentType of(EquipmentSlot slot) { } @Nullable - public static ArmorEquipmentType of(ArmorItem.Type type) { + public static ArmorEquipmentType of(EquipmentType type) { switch (type) { case HELMET -> { return HEAD; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java index cc6115cad..c7cf23987 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.item; -import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import net.minecraft.component.type.FoodComponent; import net.minecraft.entity.effect.StatusEffectInstance; @@ -8,7 +7,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Optional; public class CompatFoodComponent { private int hunger; @@ -63,11 +61,6 @@ public FoodComponent.Builder getVanillaBuilder() { FoodComponent.Builder builder = new FoodComponent.Builder(); builder.nutrition(hunger).saturationModifier(saturation); if (alwaysEdible) builder.alwaysEdible(); - if (snack) builder.snack(); - //if (meat) builder.meat(); - for (Pair pair : statusEffects) { - builder.statusEffect(pair.getFirst(), pair.getSecond()); - } return builder; } @@ -75,12 +68,10 @@ public FoodComponent build() { if (latestComponent != null) return latestComponent; float eatSeconds = 1.6f; - ImmutableList.Builder effects = ImmutableList.builder(); - effects.addAll(statusEffects.stream().map(pair -> new FoodComponent.StatusEffectEntry(pair.getFirst(), pair.getSecond())).iterator()); if (snack) eatSeconds = 0.8f; if (meat) eatSeconds = 1.6f; - latestComponent = new FoodComponent(hunger, saturation, alwaysEdible, eatSeconds, Optional.empty(), effects.build()); + latestComponent = new FoodComponent(hunger, saturation, alwaysEdible); return latestComponent; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java index b3def3454..29564914b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java @@ -1,20 +1,15 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.ArmorItem; -import net.minecraft.item.ArmorMaterial; -import net.minecraft.registry.entry.RegistryEntry; - -import java.util.Map; public class CompatibleArmorItem extends ArmorItem implements ExtendItemProvider { public final ArmorEquipmentType type; - - @Deprecated - public static final Map> CACHE = new java.util.HashMap<>(); + public final CompatibleArmorMaterial material; public CompatibleArmorItem(CompatibleArmorMaterial material, ArmorEquipmentType type, CompatibleItemSettings settings) { super(material.build(), type.getType(), settings.build()); this.type = type; + this.material = material; } /** @@ -25,23 +20,11 @@ public ArmorEquipmentType getArmorEquipmentType() { return type; } - /** - * @deprecated Use {@link #getArmorEquipmentType()} instead - */ - @Deprecated - @Override - public Type getType() { - return super.getType(); - } - /** * get ArmorMaterial * @return CompatibleArmorMaterial */ public CompatibleArmorMaterial getArmorMaterial() { - if (!(this.getMaterial() instanceof CompatibleArmorMaterial)) { - throw new IllegalStateException("ArmorMaterial is not CompatibleArmorMaterial"); - } - return (CompatibleArmorMaterial) this.getMaterial(); + return material; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java index 19bb91e67..0ac27dc81 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java @@ -1,19 +1,17 @@ package net.pitan76.mcpitanlib.api.item; -import net.minecraft.item.ArmorItem; -import net.minecraft.item.ArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.equipment.ArmorMaterial; +import net.minecraft.item.equipment.EquipmentType; import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; import net.minecraft.sound.SoundEvent; -import net.minecraft.sound.SoundEvents; import net.minecraft.util.Identifier; -import net.minecraft.util.Util; +import net.pitan76.mcpitanlib.api.util.IngredientUtil; import java.util.EnumMap; -import java.util.List; -import java.util.function.Supplier; public interface CompatibleArmorMaterial { int getDurability(ArmorEquipmentType type); @@ -24,7 +22,9 @@ public interface CompatibleArmorMaterial { SoundEvent getEquipSound(); - Ingredient getRepairIngredient(); + default Ingredient getRepairIngredient() { + return IngredientUtil.fromTagByIdentifier(getRepairTag().id()); + } /** * @return the name of the material @@ -42,39 +42,21 @@ default String getName() { float getKnockbackResistance(); - @Deprecated - default RegistryEntry build() { - if (CompatibleArmorItem.CACHE.containsKey(this)) { - return CompatibleArmorItem.CACHE.get(this); - } - - RegistryEntry entry = register(getId(), Util.make(new EnumMap<>(ArmorItem.Type.class), (map) -> { - map.put(ArmorItem.Type.HELMET, this.getProtection(ArmorEquipmentType.HEAD)); - map.put(ArmorItem.Type.CHESTPLATE, this.getProtection(ArmorEquipmentType.CHEST)); - map.put(ArmorItem.Type.LEGGINGS, this.getProtection(ArmorEquipmentType.LEGS)); - map.put(ArmorItem.Type.BOOTS, this.getProtection(ArmorEquipmentType.FEET)); - - map.put(ArmorItem.Type.BODY, this.getProtection(ArmorEquipmentType.BODY)); - }), getEnchantability(), SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, getToughness(), getKnockbackResistance(), - this::getRepairIngredient - ); - CompatibleArmorItem.CACHE.put(this, entry); - return entry; + default TagKey getRepairTag() { + return ItemTags.REPAIRS_IRON_ARMOR; } - private static RegistryEntry register(Identifier id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient) { - List list = List.of(new ArmorMaterial.Layer(id)); - return register(id, defense, enchantability, equipSound, toughness, knockbackResistance, repairIngredient, list); + @Deprecated + default ArmorMaterial build() { + return new ArmorMaterial(0, getDefense(), getEnchantability(), RegistryEntry.of(getEquipSound()), getToughness(), getKnockbackResistance(), getRepairTag(), getId()); } - private static RegistryEntry register(Identifier id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient, List layers) { - EnumMap enumMap = new EnumMap<>(ArmorItem.Type.class); - ArmorItem.Type[] var9 = ArmorItem.Type.values(); - - for (ArmorItem.Type type : var9) { - enumMap.put(type, defense.get(type)); - } - - return Registry.registerReference(Registries.ARMOR_MATERIAL, id, new ArmorMaterial(enumMap, enchantability, equipSound, repairIngredient, layers, toughness, knockbackResistance)); + default EnumMap getDefense() { + EnumMap map = new EnumMap<>(EquipmentType.class); + map.put(EquipmentType.HELMET, this.getProtection(ArmorEquipmentType.HEAD)); + map.put(EquipmentType.CHESTPLATE, this.getProtection(ArmorEquipmentType.CHEST)); + map.put(EquipmentType.LEGGINGS, this.getProtection(ArmorEquipmentType.LEGS)); + map.put(EquipmentType.BOOTS, this.getProtection(ArmorEquipmentType.FEET)); + return map; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java index ed1b89361..927399070 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java @@ -10,12 +10,11 @@ import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.core.Dummy; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; -import org.jetbrains.annotations.Nullable; import java.util.List; @@ -33,15 +32,15 @@ public ExtendBlockItem(Block block, CompatibleItemSettings settings) { // ExtendItem @Deprecated @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - return onRightClick(new ItemUseEvent(world, user, hand)); + public ActionResult use(World world, PlayerEntity user, Hand hand) { + return onRightClick(new ItemUseEvent(world, user, hand)).toActionResult(); } @Deprecated @Override public ActionResult useOnBlock(ItemUsageContext context) { ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; - return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); + return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())).toActionResult(); } @Deprecated @@ -53,11 +52,12 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { @Deprecated @Override public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) { - return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)); + return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)).toActionResult(); } + // TODO: Remove this method @Deprecated - @Override + //@Override public boolean hasRecipeRemainder() { return hasRecipeRemainder(new Dummy()); } @@ -80,8 +80,8 @@ public void onCraft(ItemStack stack, World world) { * @param event ItemUseEvent * @return ActionResultType */ - public TypedActionResult onRightClick(ItemUseEvent event) { - return super.use(event.world, event.user.getPlayerEntity(), event.hand); + public CompatActionResult onRightClick(ItemUseEvent event) { + return CompatActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand)); } /** @@ -89,8 +89,8 @@ public TypedActionResult onRightClick(ItemUseEvent event) { * @param event ItemUseOnBlockEvent * @return ActionResultType */ - public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { - return super.useOnBlock(event.toIUC()); + public CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { + return CompatActionResult.create(super.useOnBlock(event.toIUC())); } /** @@ -107,8 +107,8 @@ public ItemStack onFinishUsing(ItemFinishUsingEvent event) { * @param event ItemUseOnEntityEvent * @return ActionResultType */ - public ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { - return super.useOnEntity(event.stack, event.user.getEntity(), event.entity, event.hand); + public CompatActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { + return CompatActionResult.create(super.useOnEntity(event.stack, event.user.getEntity(), event.entity, event.hand)); } /** @@ -117,7 +117,7 @@ public ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { * @return boolean */ public boolean hasRecipeRemainder(Dummy dummy) { - return super.hasRecipeRemainder(); + return false; } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index a6ba3bb03..95462b196 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -13,13 +13,12 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.Rarity; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.core.Dummy; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; -import org.jetbrains.annotations.Nullable; import java.util.List; @@ -34,15 +33,15 @@ public ExtendItem(CompatibleItemSettings settings) { @Deprecated @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - return onRightClick(new ItemUseEvent(world, user, hand)); + public ActionResult use(World world, PlayerEntity user, Hand hand) { + return onRightClick(new ItemUseEvent(world, user, hand)).toActionResult(); } @Deprecated @Override public ActionResult useOnBlock(ItemUsageContext context) { ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; - return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); + return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())).toActionResult(); } @Deprecated @@ -54,11 +53,11 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { @Deprecated @Override public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) { - return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)); + return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)).toActionResult(); } @Deprecated - @Override + //@Override public boolean hasRecipeRemainder() { return hasRecipeRemainder(new Dummy()); } @@ -93,8 +92,8 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos * @param event ItemUseEvent * @return ActionResultType */ - public TypedActionResult onRightClick(ItemUseEvent event) { - return super.use(event.world, event.user.getPlayerEntity(), event.hand); + public CompatActionResult onRightClick(ItemUseEvent event) { + return CompatActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand)); } /** @@ -102,8 +101,8 @@ public TypedActionResult onRightClick(ItemUseEvent event) { * @param event ItemUseOnBlockEvent * @return ActionResultType */ - public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { - return super.useOnBlock(event.toIUC()); + public CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { + return CompatActionResult.create(super.useOnBlock(event.toIUC())); } /** @@ -120,8 +119,8 @@ public ItemStack onFinishUsing(ItemFinishUsingEvent event) { * @param event ItemUseOnEntityEvent * @return ActionResultType */ - public ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { - return super.useOnEntity(event.stack, event.user.getEntity(), event.entity, event.hand); + public CompatActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { + return CompatActionResult.create(super.useOnEntity(event.stack, event.user.getEntity(), event.entity, event.hand)); } /** @@ -129,8 +128,9 @@ public ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { * @param dummy Dummy * @return boolean */ + // TODO: Remove this method in 1.21.2 public boolean hasRecipeRemainder(Dummy dummy) { - return super.hasRecipeRemainder(); + return false; } /** @@ -172,24 +172,26 @@ public Rarity getRarity(ItemStack stack) { return Rarity.COMMON; } + // TODO: 1.21.2 @Deprecated - @Override + //@Override public boolean isEnchantable(ItemStack stack) { return isEnchantable(new EnchantableArgs(stack)); } public boolean isEnchantable(EnchantableArgs args) { - return super.isEnchantable(args.stack); + return false; } + // TODO: 1.21.2 @Deprecated - @Override + //@Override public int getEnchantability() { return getEnchantability(new EnchantabilityArgs()); } public int getEnchantability(EnchantabilityArgs args) { - return super.getEnchantability(); + return 0; } @Deprecated @@ -232,14 +234,15 @@ public float getBonusAttackDamage(BonusAttackDamageArgs args) { return super.getBonusAttackDamage(args.target, args.baseAttackDamage, args.damageSource); } + // TODO: 1.21.2 @Deprecated - @Override + //@Override public boolean canRepair(ItemStack stack, ItemStack ingredient) { return canRepair(new CanRepairArgs(stack, ingredient)); } public boolean canRepair(CanRepairArgs args) { - return super.canRepair(args.stack, args.ingredient); + return false; } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java index 17874b97c..76a6dc6de 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java @@ -1,10 +1,9 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; import net.minecraft.util.Rarity; -import net.minecraft.util.TypedActionResult; import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public interface ExtendItemProvider { @@ -14,7 +13,7 @@ public interface ExtendItemProvider { * @param event ItemUseEvent * @return ActionResultType */ - default TypedActionResult onRightClick(ItemUseEvent event, Options options) { + default CompatActionResult onRightClick(ItemUseEvent event, Options options) { options.cancel = false; return null; } @@ -24,7 +23,7 @@ default TypedActionResult onRightClick(ItemUseEvent event, Options op * @param event ItemUseOnBlockEvent * @return ActionResultType */ - default ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event, Options options) { + default CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent event, Options options) { options.cancel = false; return null; } @@ -44,7 +43,7 @@ default ItemStack onFinishUsing(ItemFinishUsingEvent event, Options options) { * @param event ItemUseOnEntityEvent * @return ActionResult */ - default ActionResult onRightClickOnEntity(ItemUseOnEntityEvent event, Options options) { + default CompatActionResult onRightClickOnEntity(ItemUseOnEntityEvent event, Options options) { options.cancel = false; return null; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index 5e5b6294d..01b90c26a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -15,11 +15,11 @@ public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material.build(), attackDamage, attackSpeed, settings.build()); } public CompatibleAxeItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material, attackDamage, attackSpeed, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index c99f35b27..f3b3c45da 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -15,11 +15,11 @@ public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material.build(), attackDamage, attackSpeed, settings.build()); } public CompatibleHoeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material, attackDamage, attackSpeed, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index eccb70459..8f377ec89 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -18,11 +18,11 @@ public class CompatibleMiningToolItem extends MiningToolItem implements ExtendItemProvider { @Deprecated protected CompatibleMiningToolItem(float attackDamage, float attackSpeed, ToolMaterial material, net.minecraft.registry.tag.TagKey effectiveBlocks, Settings settings) { - super(material, effectiveBlocks, settings); + super(material, effectiveBlocks, attackDamage, attackSpeed, settings); } public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, TagKey tagKey, CompatibleItemSettings settings) { - this(attackDamage, attackSpeed, material, tagKey.getTagKey(), settings.build()); + this(attackDamage, attackSpeed, material.build(), tagKey.getTagKey(), settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index c48ba1d5d..a2102fe83 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -15,11 +15,11 @@ public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material.build(), attackDamage, attackSpeed, settings.build()); } public CompatiblePickaxeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material, attackDamage, attackSpeed, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index 346cd7132..88717e768 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -15,11 +15,11 @@ public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material.build(), attackDamage, attackSpeed, settings.build()); } public CompatibleShovelItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material, attackDamage, attackSpeed, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index a53f76387..cf1f48f96 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -15,11 +15,11 @@ public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material.build(), attackDamage, attackSpeed, settings.build()); } public CompatibleSwordItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, settings.build()); + super(material, attackDamage, attackSpeed, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java index 949cfd572..a8e189434 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java @@ -2,9 +2,8 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.ToolItem; -import net.minecraft.item.ToolMaterial; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; @@ -12,14 +11,18 @@ import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; -public class CompatibleToolItem extends ToolItem implements ExtendItemProvider { +public class CompatibleToolItem extends Item implements ExtendItemProvider { + + public CompatibleToolMaterial material; + @Deprecated - protected CompatibleToolItem(ToolMaterial material, Settings settings) { - super(material, settings); + protected CompatibleToolItem(Settings settings) { + super(settings); } public CompatibleToolItem(CompatibleToolMaterial material, CompatibleItemSettings settings) { - this(material, settings.build()); + this(material.build().applyToolSettings(settings.build(), null, 0, 0)); + this.material = material; } public boolean overrideIsSuitableFor(BlockState state) { @@ -39,7 +42,7 @@ public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) @Deprecated @Override public float getMiningSpeed(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state) * material.getCompatMiningSpeedMultiplier(); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java index dabf05b57..ab44f30bf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java @@ -1,13 +1,15 @@ package net.pitan76.mcpitanlib.api.item.tool; import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ToolMaterial; -import net.minecraft.item.ToolMaterials; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.util.IngredientUtil; -public interface CompatibleToolMaterial extends ToolMaterial { +public interface CompatibleToolMaterial { int getCompatMiningLevel(); @@ -15,22 +17,14 @@ public interface CompatibleToolMaterial extends ToolMaterial { float getCompatMiningSpeedMultiplier(); - Ingredient getCompatRepairIngredient(); + default Ingredient getCompatRepairIngredient() { + return IngredientUtil.fromTagByIdentifier(getRepairTag().id()); + } int getCompatDurability(); int getCompatEnchantability(); - /* - @Deprecated - @Override - default int getMiningLevel() { - return getCompatMiningLevel(); - } - */ - - - @Override default TagKey getInverseTag() { return level2inverseTag(getCompatMiningLevel()); @@ -57,32 +51,35 @@ public static TagKey level2inverseTag(int level) { } @Deprecated - @Override default float getAttackDamage() { return getCompatAttackDamage(); } @Deprecated - @Override default float getMiningSpeedMultiplier() { return getCompatMiningSpeedMultiplier(); } @Deprecated - @Override default Ingredient getRepairIngredient() { return getCompatRepairIngredient(); } @Deprecated - @Override default int getDurability() { return getCompatDurability(); } @Deprecated - @Override default int getEnchantability() { return getCompatEnchantability(); } + + default TagKey getRepairTag() { + return ItemTags.IRON_TOOL_MATERIALS; + } + + default ToolMaterial build() { + return new ToolMaterial(getInverseTag(), getCompatDurability(), getCompatMiningSpeedMultiplier(), getCompatAttackDamage(), getCompatEnchantability(), getRepairTag()); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java index ecdc6d850..9f852fa6a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java @@ -11,6 +11,7 @@ import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; import java.util.List; @@ -28,17 +29,17 @@ public ExtendBlockItem(Block block, CompatibleItemSettings settings) { @Override public ActionResult useOnBlock(ItemUsageContext context) { ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; - return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())); + return onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit())).toActionResult(); } @Deprecated @Override - public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event, Options options) { + public CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent event, Options options) { return ExtendItemProvider.super.onRightClickOnBlock(event, options); } - public ActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { - return super.useOnBlock(event.toIUC()); + public CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { + return CompatActionResult.create(super.useOnBlock(event.toIUC())); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java new file mode 100644 index 000000000..55365a246 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.item.v3; + +import net.minecraft.item.Item; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; + +public interface CompatArmorMaterial extends CompatibleArmorMaterial { + + @Deprecated + @Override + default TagKey getRepairTag() { + return getRepairIngredientTag().getTag(); + } + + RepairIngredientTag getRepairIngredientTag(); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java new file mode 100644 index 000000000..2c568c16c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.item.v3; + +import net.minecraft.item.Item; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; + +public interface CompatToolMaterial extends CompatibleArmorMaterial { + @Deprecated + @Override + default TagKey getRepairTag() { + return getRepairIngredientTag().getTag(); + } + + RepairIngredientTag getRepairIngredientTag(); +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java index 347a6cd8f..8a813adcd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java @@ -1,7 +1,10 @@ package net.pitan76.mcpitanlib.api.recipe; import net.minecraft.recipe.*; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.RecipeUtil; import org.jetbrains.annotations.Nullable; @@ -17,11 +20,15 @@ public CompatibleRecipeEntry(RecipeEntry entry) { } public CompatibleRecipeEntry(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ShapelessRecipe shapelessRecipe) { - this.entry = new RecipeEntry<>(id, shapelessRecipe); + this.entry = new RecipeEntry<>(RegistryKey.of(RegistryKeys.RECIPE, id), shapelessRecipe); this.group = group; this.category = category; } + public CompatibleRecipeEntry(CompatIdentifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ShapelessRecipe shapelessRecipe) { + this(id.toMinecraft(), group, category, shapelessRecipe); + } + @Deprecated public RecipeEntry getRecipeEntry() { return entry; @@ -36,7 +43,11 @@ public Recipe getRecipe() { } public Identifier getId() { - return entry.id(); + return entry.id().getValue(); + } + + public CompatIdentifier getCompatId() { + return CompatIdentifier.fromMinecraft(getId()); } public RecipeType getType() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java index c7904361e..5f97fc400 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java @@ -23,7 +23,7 @@ public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack(int slot) { } public int getSize() { - return input.getSize(); + return input.size(); } public boolean isEmpty() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java index a448c5408..f594f28d6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java @@ -1,8 +1,10 @@ package net.pitan76.mcpitanlib.api.recipe.v2; import net.minecraft.recipe.*; -import net.minecraft.recipe.input.RecipeInput; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.RecipeUtil; import org.jetbrains.annotations.Nullable; @@ -18,11 +20,15 @@ public CompatRecipeEntry(RecipeEntry entry) { } public CompatRecipeEntry(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, T recipe) { - this.entry = new RecipeEntry<>(id, recipe); + this.entry = new RecipeEntry<>(RegistryKey.of(RegistryKeys.RECIPE, id), recipe); this.group = group; this.category = category; } + public CompatRecipeEntry(CompatIdentifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, T recipe) { + this(id.toMinecraft(), group, category, recipe); + } + public boolean isNull() { return entry == null; } @@ -37,7 +43,11 @@ public T getRecipe() { } public Identifier getId() { - return entry.id(); + return entry.id().getValue(); + } + + public CompatIdentifier getCompatId() { + return CompatIdentifier.fromMinecraft(getId()); } public RecipeType getType() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java index 4a0843eb9..2353be362 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/block/SimpleGuiBlock.java @@ -1,11 +1,11 @@ package net.pitan76.mcpitanlib.api.simple.block; import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public abstract class SimpleGuiBlock extends ExtendBlock implements SimpleScreenHandlerFactory { @@ -14,7 +14,7 @@ public SimpleGuiBlock(Settings settings) { } @Override - public ActionResult onRightClick(BlockUseEvent e) { + public CompatActionResult onRightClick(BlockUseEvent e) { if (e.isClient()) e.player.openGuiScreen(this); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java index 2ffc80214..695b04ad2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java @@ -1,15 +1,14 @@ package net.pitan76.mcpitanlib.api.simple.item; -import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.minecraft.util.TypedActionResult; import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class SimpleGuiItem extends ExtendItem implements SimpleScreenHandlerFactory { @@ -32,7 +31,7 @@ public SimpleGuiItem(CompatibleItemSettings settings) { } @Override - public TypedActionResult onRightClick(ItemUseEvent e) { + public CompatActionResult onRightClick(ItemUseEvent e) { if (!e.isClient()) e.user.openGuiScreen(this); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java index 22b271ead..f0d48b13a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java @@ -1,11 +1,8 @@ package net.pitan76.mcpitanlib.api.sound; import com.google.common.collect.ImmutableList; -import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; -import java.util.stream.Collectors; - public class CompatSoundEvents { public static final CompatSoundEvent ENTITY_ALLAY_AMBIENT_WITH_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_AMBIENT_WITH_ITEM); public static final CompatSoundEvent ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM = new CompatSoundEvent(SoundEvents.ENTITY_ALLAY_AMBIENT_WITHOUT_ITEM); @@ -624,7 +621,7 @@ public class CompatSoundEvents { public static final CompatSoundEvent ENTITY_GOAT_PREPARE_RAM = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_PREPARE_RAM); public static final CompatSoundEvent ENTITY_GOAT_RAM_IMPACT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_RAM_IMPACT); public static final CompatSoundEvent ENTITY_GOAT_HORN_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_HORN_BREAK); - public static final CompatSoundEvent ITEM_GOAT_HORN_PLAY = new CompatSoundEvent(SoundEvents.ITEM_GOAT_HORN_PLAY); + public static final CompatSoundEvent ITEM_GOAT_HORN_PLAY = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_STEP); public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_AMBIENT); public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_DEATH); public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_EAT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_EAT); @@ -633,7 +630,7 @@ public class CompatSoundEvents { public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_MILK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_MILK); public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_PREPARE_RAM = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_PREPARE_RAM); public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_RAM_IMPACT = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_RAM_IMPACT); - public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_HORN_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_SCREAMING_HORN_BREAK); + public static final CompatSoundEvent ENTITY_GOAT_SCREAMING_HORN_BREAK = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_HORN_BREAK); public static final CompatSoundEvent ENTITY_GOAT_STEP = new CompatSoundEvent(SoundEvents.ENTITY_GOAT_STEP); public static final CompatSoundEvent BLOCK_GRASS_BREAK = new CompatSoundEvent(SoundEvents.BLOCK_GRASS_BREAK); public static final CompatSoundEvent BLOCK_GRASS_FALL = new CompatSoundEvent(SoundEvents.BLOCK_GRASS_FALL); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java new file mode 100644 index 000000000..1e2ffb348 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.api.state.property; + +import net.minecraft.state.property.Properties; + +public class CompatProperties { + public static final DirectionProperty FACING = new DirectionProperty(Properties.FACING); + public static final DirectionProperty HORIZONTAL_FACING = new DirectionProperty(Properties.HORIZONTAL_FACING); + public static final DirectionProperty HOPPER_FACING = new DirectionProperty(Properties.HOPPER_FACING); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java new file mode 100644 index 000000000..50c38ab1e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java @@ -0,0 +1,37 @@ +package net.pitan76.mcpitanlib.api.state.property; + +import net.minecraft.state.property.EnumProperty; +import net.minecraft.state.property.Property; +import net.minecraft.util.math.Direction; + +import java.util.function.Predicate; + +public class DirectionProperty implements IProperty { + + private final EnumProperty property; + + public DirectionProperty(String name, Predicate filter) { + this(EnumProperty.of(name, Direction.class, filter)); + } + + public DirectionProperty(String name) { + this(name, direction -> true); + } + + public DirectionProperty(EnumProperty property) { + this.property = property; + } + + public static DirectionProperty of(String name) { + return new DirectionProperty(name); + } + + public static DirectionProperty of(String name, Predicate filter) { + return new DirectionProperty(name, filter); + } + + @Override + public Property getProperty() { + return property; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java new file mode 100644 index 000000000..555fec27e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.state.property; + +import net.minecraft.block.BlockState; +import net.minecraft.state.property.Property; +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; + +public interface IProperty> { + default void apply(AppendPropertiesArgs args) { + args.addProperty(getProperty()); + } + + default T get(BlockState state) { + return state.get(getProperty()); + } + + default BlockState with(BlockState state, T value) { + return state.with(getProperty(), value); + } + + Property getProperty(); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java new file mode 100644 index 000000000..b39a82dfe --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java @@ -0,0 +1,48 @@ +package net.pitan76.mcpitanlib.api.tag.item; + +import net.minecraft.item.Item; +import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IngredientUtil; + +public class RepairIngredientTag { + + public static final RepairIngredientTag REPAIRS_LEATHER_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_LEATHER_ARMOR); + public static final RepairIngredientTag REPAIRS_CHAIN_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_CHAIN_ARMOR); + public static final RepairIngredientTag REPAIRS_IRON_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_IRON_ARMOR); + public static final RepairIngredientTag REPAIRS_GOLD_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_GOLD_ARMOR); + public static final RepairIngredientTag REPAIRS_DIAMOND_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_DIAMOND_ARMOR); + public static final RepairIngredientTag REPAIRS_NETHERITE_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_NETHERITE_ARMOR); + public static final RepairIngredientTag REPAIRS_TURTLE_HELMET = new RepairIngredientTag(ItemTags.REPAIRS_TURTLE_HELMET); + public static final RepairIngredientTag REPAIRS_WOLF_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_WOLF_ARMOR); + public static final RepairIngredientTag WOODEN_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.WOODEN_TOOL_MATERIALS); + public static final RepairIngredientTag STONE_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.STONE_TOOL_MATERIALS); + public static final RepairIngredientTag IRON_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.IRON_TOOL_MATERIALS); + public static final RepairIngredientTag GOLDEN_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.GOLD_TOOL_MATERIALS); + public static final RepairIngredientTag DIAMOND_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.DIAMOND_TOOL_MATERIALS); + public static final RepairIngredientTag NETHERITE_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.NETHERITE_TOOL_MATERIALS); + + private TagKey tag; + + public RepairIngredientTag(CompatIdentifier identifier) { + this.tag = TagKey.of(RegistryKeys.ITEM, identifier.toMinecraft()); + } + + @Deprecated + public RepairIngredientTag(TagKey tag) { + this.tag = tag; + } + + @Deprecated + public TagKey getTag() { + return tag; + } + + @Deprecated + public Ingredient getIngredient() { + return IngredientUtil.fromTagByIdentifier(tag.id()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java index 9f305ac51..ebee9da24 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java @@ -43,7 +43,7 @@ public BlockEntityType build() { } public BlockEntityType build(Type type) { - return BlockEntityType.Builder.create(factory::create, blocks.toArray(new Block[0])).build(type); + return BlockEntityTypeBuilder.create(factory, blocks.toArray(new Block[0])).build(type); } @FunctionalInterface diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ActionResultUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ActionResultUtil.java deleted file mode 100644 index 49bd97159..000000000 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ActionResultUtil.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.pitan76.mcpitanlib.api.util; - -import net.minecraft.util.ActionResult; -import net.minecraft.util.TypedActionResult; - -public class ActionResultUtil { - - public static TypedActionResult typedActionResult(ActionResult result, T t, boolean swingHand) { - switch (result) { - case PASS: - return TypedActionResult.pass(t); - case SUCCESS: - return TypedActionResult.success(t, swingHand); - case FAIL: - return TypedActionResult.fail(t); - case CONSUME: - case CONSUME_PARTIAL: - return TypedActionResult.consume(t); - } - return TypedActionResult.pass(t); - } - - public static TypedActionResult typedActionResult(ActionResult result, T t) { - return typedActionResult(result, t, true); - } - - public static ActionResult actionResult(TypedActionResult result) { - return result.getResult(); - } -} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index f414848e0..d55ad5890 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -8,14 +8,13 @@ import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.Property; -import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.ItemActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import net.minecraft.world.block.WireOrientation; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.util.block.BlockHitResultUtil; @@ -49,7 +48,9 @@ public static , V extends T> BlockState with(BlockState } public static void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean notify) { - state.neighborUpdate(world, pos, block, fromPos, notify); + WireOrientation wireOrientation = WireOrientation.of(pos.up() == fromPos ? Direction.UP : Direction.DOWN, pos.north() == fromPos ? Direction.NORTH : Direction.SOUTH, pos.east() == fromPos ? WireOrientation.SideBias.RIGHT : WireOrientation.SideBias.LEFT); + + state.neighborUpdate(world, pos, block, wireOrientation, notify); } public static void updateNeighbors(BlockState state, WorldAccess world, BlockPos pos, int flags) { @@ -64,19 +65,19 @@ public static void randomTick(BlockState state, ServerWorld world, BlockPos pos) state.randomTick(world, pos, world.random); } - public static ActionResult onUse(BlockState state, World world, Player player, BlockHitResult hitResult) { - return state.onUse(world, player.getEntity(), hitResult); + public static CompatActionResult onUse(BlockState state, World world, Player player, BlockHitResult hitResult) { + return CompatActionResult.create(state.onUse(world, player.getEntity(), hitResult)); } - public static ActionResult onUse(BlockState state, World world, Player player, Direction dir, BlockPos blockPos) { + public static CompatActionResult onUse(BlockState state, World world, Player player, Direction dir, BlockPos blockPos) { return onUse(state, world, player, BlockHitResultUtil.create(player.getPos(), dir, blockPos)); } - public static ItemActionResult onUseWithItem(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { - return state.onUseWithItem(stack, world, player, hand, hit); + public static CompatActionResult onUseWithItem(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { + return CompatActionResult.create(state.onUseWithItem(stack, world, player, hand, hit)); } - public static ActionResult onUseWithItem_actionResult(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { - return onUseWithItem(state, stack, world, player, hand, hit).toActionResult(); + public static CompatActionResult onUseWithItem_actionResult(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { + return onUseWithItem(state, stack, world, player, hand, hit); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java index 30ef31a72..0b44d2194 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java @@ -5,6 +5,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.world.ServerWorld; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.core.command.CommandResult; @@ -75,7 +76,7 @@ public static ServerCommandSource getCommandSource(MinecraftServer server) { } public static ServerCommandSource getCommandSource(Player player) { - return player.getEntity().getCommandSource(); + return player.getEntity().getCommandSource((ServerWorld) player.getWorld()); } public static ServerCommandSource withLevel(ServerCommandSource source, int level) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java new file mode 100644 index 000000000..bf382e3ef --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java @@ -0,0 +1,76 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.util.ActionResult; +import net.pitan76.mcpitanlib.api.event.result.EventResult; + +public class CompatActionResult { + public static final CompatActionResult SUCCESS = new CompatActionResult(ActionResult.SUCCESS, EventResult.success()); + public static final CompatActionResult PASS = new CompatActionResult(ActionResult.PASS, EventResult.pass()); + public static final CompatActionResult FAIL = new CompatActionResult(ActionResult.FAIL, EventResult.fail()); + public static final CompatActionResult CONSUME = new CompatActionResult(ActionResult.CONSUME, EventResult.success()); + public static final CompatActionResult PASS_TO_DEFAULT_BLOCK_ACTION = new CompatActionResult(ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION, EventResult.pass()); + public static final CompatActionResult SUCCESS_SERVER = new CompatActionResult(ActionResult.SUCCESS_SERVER, EventResult.success()); + public static final CompatActionResult STOP = new CompatActionResult(ActionResult.FAIL, EventResult.stop()); + + private final ActionResult actionResult; + private final EventResult eventResult; + + protected CompatActionResult(ActionResult actionResult, EventResult eventResult) { + this.actionResult = actionResult; + this.eventResult = eventResult; + } + + public ActionResult toActionResult() { + return actionResult; + } + + public EventResult toEventResult() { + return eventResult; + } + + public static CompatActionResult of(ActionResult result) { + if (result == ActionResult.SUCCESS) + return SUCCESS; + + if (result == ActionResult.PASS) + return PASS; + + if (result == ActionResult.FAIL) + return FAIL; + + if (result == ActionResult.CONSUME) + return CONSUME; + + if (result == ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION) + return PASS_TO_DEFAULT_BLOCK_ACTION; + + if (result == ActionResult.SUCCESS_SERVER) + return SUCCESS_SERVER; + + return PASS; + } + + public static CompatActionResult of(EventResult result) { + if (result == EventResult.success()) + return SUCCESS; + + if (result == EventResult.pass()) + return PASS; + + if (result == EventResult.fail()) + return FAIL; + + if (result == EventResult.stop()) + return STOP; + + return PASS; + } + + public static CompatActionResult create(ActionResult result, EventResult eventResult) { + return new CompatActionResult(result, eventResult); + } + + public static CompatActionResult create(ActionResult result) { + return create(result, EventResult.stop()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index f22aa08e4..9f73f0089 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -3,6 +3,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -14,23 +15,23 @@ public static World getWorld(Entity entity) { } public static boolean damage(Entity target, DamageSource damageSource, float amount) { - return target.damage(damageSource, amount); + return target.damage((ServerWorld) target.getWorld(), damageSource, amount); } public static boolean damageWithThrownProjectile(Entity target, float damageAmount, Entity projectile, Entity attacker) { - return target.damage(DamageSourceUtil.thrownProjectile(projectile, attacker), damageAmount); + return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.thrownProjectile(projectile, attacker), damageAmount); } public static boolean damageWithMobProjectile(Entity target, float damageAmount, Entity projectile, LivingEntity attacker) { - return target.damage(DamageSourceUtil.mobProjectile(projectile, attacker), damageAmount); + return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.mobProjectile(projectile, attacker), damageAmount); } public static boolean damageWithMobAttack(Entity target, float damageAmount, Entity source, LivingEntity attacker) { - return target.damage(DamageSourceUtil.mobAttack(attacker, source), damageAmount); + return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.mobAttack(attacker, source), damageAmount); } public static boolean damageWithPlayerAttack(Entity target, float damageAmount, Entity source, Player attacker) { - return target.damage(DamageSourceUtil.playerAttack(attacker, source), damageAmount); + return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.playerAttack(attacker, source), damageAmount); } public static void discard(Entity entity) { @@ -38,7 +39,10 @@ public static void discard(Entity entity) { } public static void kill(Entity entity) { - entity.kill(); + if (entity.getWorld() instanceof ServerWorld) + return; + + entity.kill((ServerWorld) entity.getWorld()); } public static void setVelocity(Entity entity, double x, double y, double z) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java index e335ef228..2f97b2781 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java @@ -1,48 +1,23 @@ package net.pitan76.mcpitanlib.api.util; -import net.minecraft.block.Block; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.tag.TagKey; +import net.minecraft.registry.tag.ItemTags; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; import net.pitan76.mcpitanlib.api.item.tool.CompatibleToolMaterial; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; public class EquipMaterialUtil { + @Deprecated public static ToolMaterial createToolMaterial(int durability, float miningSpeedMultiplier, float attackDamage, int miningLevel, int enchantability, Ingredient repairIngredient) { - return new ToolMaterial() { - @Override - public int getDurability() { - return durability; - } - - @Override - public float getMiningSpeedMultiplier() { - return miningSpeedMultiplier; - } - - @Override - public float getAttackDamage() { - return attackDamage; - } - - @Override - public TagKey getInverseTag() { - return CompatibleToolMaterial.level2inverseTag(miningLevel); - } - - @Override - public int getEnchantability() { - return enchantability; - } + return new ToolMaterial(CompatibleToolMaterial.level2inverseTag(miningLevel), durability, miningSpeedMultiplier, attackDamage, enchantability, ItemTags.IRON_TOOL_MATERIALS); + } - @Override - public Ingredient getRepairIngredient() { - return repairIngredient; - } - }; + public static ToolMaterial createToolMaterial(int durability, float miningSpeedMultiplier, float attackDamage, int miningLevel, int enchantability, RepairIngredientTag ingredientTag) { + return new ToolMaterial(CompatibleToolMaterial.level2inverseTag(miningLevel), durability, miningSpeedMultiplier, attackDamage, enchantability, ingredientTag.getTag()); } public static int toInt(ArmorEquipmentType type) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index bec9f4348..698fe8dac 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -1,10 +1,13 @@ package net.pitan76.mcpitanlib.api.util; +import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.Registries; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.registry.entry.RegistryEntryList; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; @@ -14,7 +17,16 @@ public class IngredientUtil { public static Ingredient fromTagByIdentifier(Identifier id) { - return Ingredient.fromTag(TagKey.of(Registries.ITEM.getKey(), id)); + List items = ItemUtil.getItems(id); + + List> entryList = new ArrayList<>(); + for (Item item : items) { + entryList.add(Registries.ITEM.getEntry(item)); + } + + RegistryEntryList entryList2 = RegistryEntryList.of(entryList); + + return Ingredient.fromTag(entryList2); } public static Ingredient fromTagByString(String id) { @@ -27,16 +39,22 @@ public static Ingredient fromTagByIdentifier(CompatIdentifier id) { public static List getItems(Ingredient ingredient) { List items = new ArrayList<>(); - for (int rawId : ingredient.getMatchingItemIds()) { - try { - items.add(ItemUtil.fromIndex(rawId)); - } catch (Exception ignored) {} + + for (RegistryEntry entry : ingredient.getMatchingItems()) { + items.add(entry.value()); } + return items; } public static IntList getMatchingStacksIds(Ingredient ingredient) { - return ingredient.getMatchingItemIds(); + IntList ids = new IntArrayList(); + + for (Item item : getItems(ingredient)) { + ids.add(ItemUtil.getRawId(item)); + } + + return ids; } public static List getMatchingStacksAsList(Ingredient ingredient) { @@ -44,10 +62,15 @@ public static List getMatchingStacksAsList(Ingredient ingredient) { } public static ItemStack[] getMatchingStacks(Ingredient ingredient) { - return ingredient.getMatchingStacks(); + List stacks = new ArrayList<>(); + for (Item item : getItems(ingredient)) { + stacks.add(new ItemStack(item)); + } + + return stacks.toArray(new ItemStack[0]); } public static Ingredient empty() { - return Ingredient.EMPTY; + return null; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java index 537c43ad0..d031f33fe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java @@ -2,10 +2,7 @@ import net.minecraft.block.BlockState; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; -import net.minecraft.util.ActionResult; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -17,27 +14,27 @@ public class InteractUtil { - public static TypedActionResult useItem(Item item, ItemUseEvent event) { - return item.use(event.getWorld(), event.user.getEntity(), event.getHand()); + public static CompatActionResult useItem(Item item, ItemUseEvent event) { + return CompatActionResult.create(item.use(event.getWorld(), event.user.getEntity(), event.getHand())); } - public static ActionResult useItemOnBlock(Item item, ItemUsageContext context) { - return item.useOnBlock(context); + public static CompatActionResult useItemOnBlock(Item item, ItemUsageContext context) { + return CompatActionResult.create(item.useOnBlock(context)); } - public static ActionResult useItemOnBlock(Item item, ItemUseOnBlockEvent event) { + public static CompatActionResult useItemOnBlock(Item item, ItemUseOnBlockEvent event) { return useItemOnBlock(item, event.toIUC()); } - public static ActionResult useItemOnEntity(Item item, ItemUseOnEntityEvent event) { - return item.useOnEntity(event.getStack(), event.getUser().getEntity(), event.getEntity(), event.getHand()); + public static CompatActionResult useItemOnEntity(Item item, ItemUseOnEntityEvent event) { + return CompatActionResult.create(item.useOnEntity(event.getStack(), event.getUser().getEntity(), event.getEntity(), event.getHand())); } - public static ActionResult useBlock(BlockState state, World world, Player player, BlockHitResult hitResult) { + public static CompatActionResult useBlock(BlockState state, World world, Player player, BlockHitResult hitResult) { return BlockStateUtil.onUse(state, world, player, hitResult); } - public static ActionResult useBlock(BlockState state, World world, Player player, Direction dir, BlockPos blockPos) { + public static CompatActionResult useBlock(BlockState state, World world, Player player, Direction dir, BlockPos blockPos) { return BlockStateUtil.onUse(state, world, player, dir, blockPos); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index 91ddbd793..50e3a81fb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -365,7 +365,7 @@ public static Vec3d getVec3d(NbtCompound nbt, String key) { } public static void putItemStack(NbtCompound nbt, String key, ItemStack stack, CompatRegistryLookup registryLookup) { - NbtElement stackNbt = stack.encode(registryLookup.getRegistryLookup()); + NbtElement stackNbt = stack.toNbt(registryLookup.getRegistryLookup()); put(nbt, key, stackNbt); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java index 6209a1587..104d00b92 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java @@ -7,6 +7,8 @@ import net.minecraft.util.StringIdentifiable; import net.minecraft.util.math.Direction; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.state.property.CompatProperties; +import net.pitan76.mcpitanlib.api.state.property.DirectionProperty; public class PropertyUtil { public static BooleanProperty createBooleanProperty(String name) { @@ -34,7 +36,7 @@ public static BlockState with(BlockState state, IntProperty property, int value) } public static BlockState with(BlockState state, DirectionProperty property, Direction value) { - return state.with(property, value); + return property.with(state, value); } public static boolean get(BlockState state, BooleanProperty property) { @@ -46,15 +48,15 @@ public static int get(BlockState state, IntProperty property) { } public static Direction get(BlockState state, DirectionProperty property) { - return state.get(property); + return property.get(state); } public static Direction getFacing(BlockState state) { - return state.get(facing()); + return facing().get(state); } public static Direction getHorizontalFacing(BlockState state) { - return state.get(horizontalFacing()); + return horizontalFacing().get(state); } public static int getPower(BlockState state) { @@ -70,11 +72,11 @@ public static void append(AppendPropertiesArgs args, Property... properties) } public static void appendFacing(AppendPropertiesArgs args) { - args.addProperty(facing()); + facing().apply(args); } public static void appendHorizontalFacing(AppendPropertiesArgs args) { - args.addProperty(horizontalFacing()); + horizontalFacing().apply(args); } public static void appendPower(AppendPropertiesArgs args) { @@ -94,11 +96,11 @@ public static BooleanProperty powered() { } public static DirectionProperty facing() { - return Properties.FACING; + return CompatProperties.FACING; } public static DirectionProperty horizontalFacing() { - return Properties.HORIZONTAL_FACING; + return CompatProperties.HORIZONTAL_FACING; } public static EnumProperty axis() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java index e0b96c244..e7395b6fc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java @@ -4,7 +4,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.*; import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.recipe.input.CraftingRecipeInput; import net.minecraft.recipe.input.RecipeInput; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; @@ -36,7 +40,7 @@ public static ItemStack craft_2(Recipe recipe, C inve @Deprecated public static ItemStack getOutput_2(Recipe recipe, World world) { - return recipe.getResult(world.getRegistryManager()); + return craft_2(recipe, (C) CraftingRecipeInput.EMPTY, world); } public static ItemStack craft(Recipe recipe, Inventory inventory, World world) { @@ -48,11 +52,17 @@ public static ItemStack craft(Recipe recipe, Inventory inventory, World world } public static ItemStack getOutput(Recipe recipe, World world) { - return recipe.getResult(world.getRegistryManager()); + return recipe.craft(null, world.getRegistryManager()); } public static List> getAllRecipes(World world) { - Collection> recipes = getRecipeManager(world).values(); + RecipeManager iRecipeManager = getRecipeManager(world); + if (!(iRecipeManager instanceof ServerRecipeManager)) + return new ArrayList<>(); + + ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; + + Collection> recipes = recipeManager.values(); List> outRecipes = new ArrayList<>(); for (Object recipeEntryObj : recipes) { if (recipeEntryObj instanceof RecipeEntry) { @@ -73,13 +83,23 @@ public static Identifier getId(Recipe recipe) { return IdentifierUtil.id(recipe.getClass().hashCode() + ""); } - public static > CompatRecipeEntry getFirstMatch(RecipeManager recipeManager, CompatRecipeType type, CompatRecipeInput input, World world) { + public static > CompatRecipeEntry getFirstMatch(RecipeManager iRecipeManager, CompatRecipeType type, CompatRecipeInput input, World world) { + if (!(iRecipeManager instanceof ServerRecipeManager)) + return new CompatRecipeEntry<>(null); + + ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; + Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world); return recipe.map(CompatRecipeEntry::new).orElseGet(() -> new CompatRecipeEntry<>(null)); } - public static > CompatRecipeEntry getFirstMatch(RecipeManager recipeManager, CompatRecipeType type, CompatRecipeInput input, World world, CompatIdentifier identifier) { - Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world, identifier.toMinecraft()); + public static > CompatRecipeEntry getFirstMatch(RecipeManager iRecipeManager, CompatRecipeType type, CompatRecipeInput input, World world, CompatIdentifier identifier) { + if (!(iRecipeManager instanceof ServerRecipeManager)) + return new CompatRecipeEntry<>(null); + + ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; + + Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world, RegistryKey.of(RegistryKeys.RECIPE, identifier.toMinecraft())); return recipe.map(CompatRecipeEntry::new).orElseGet(() -> new CompatRecipeEntry<>(null)); } @@ -99,13 +119,17 @@ public Optional> get(World world, CompatIdentifier id) { return get(getRecipeManager(world), id); } - public Optional> get(RecipeManager recipeManager, CompatIdentifier id) { - return recipeManager.get(id.toMinecraft()); + public Optional> get(RecipeManager iRecipeManager, CompatIdentifier id) { + if (!(iRecipeManager instanceof ServerRecipeManager)) + return Optional.empty(); + ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; + + return recipeManager.get(RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft())); } public static > MatchGetter createCachedMatchGetter(RecipeType type) { return (input, world) -> { - Optional> optional = RecipeManager.createCachedMatchGetter(type).getFirstMatch(input.getInput(), world); + Optional> optional = ServerRecipeManager.createCachedMatchGetter(type).getFirstMatch(input.getInput(), (ServerWorld) world); return optional.map(CompatRecipeEntry::new); }; } @@ -115,7 +139,15 @@ public static > MatchGetter cre } public static DefaultedList getInputs(Recipe recipe) { - return recipe.getIngredients(); + List ingredients = recipe.getIngredientPlacement().getIngredients(); + + DefaultedList outIngredients = DefaultedList.ofSize(ingredients.size()); + + for (int i = 0; i < ingredients.size(); i++) { + outIngredients.set(i, ingredients.get(i)); + } + + return outIngredients; } public static DefaultedList getInputs(CompatRecipeEntry recipeEntry) { @@ -136,11 +168,11 @@ public static ItemStackList getInputsAsStack(CompatRecipeEntry recipeEntry) { } public static ItemStack getOutput(Recipe recipe, CompatRegistryLookup registryLookup) { - return recipe.getResult(registryLookup.getRegistryLookup()); + return recipe.craft(null, registryLookup.getRegistryLookup()); } public static ItemStack getOutput(CompatRecipeEntry recipeEntry, CompatRegistryLookup registryLookup) { - return recipeEntry.getRecipe().getResult(registryLookup.getRegistryLookup()); + return recipeEntry.getRecipe().craft(null, registryLookup.getRegistryLookup()); } public static CompatRecipeType getType(CompatRecipeEntry recipeEntry) { @@ -148,7 +180,8 @@ public static CompatRecipeType getType(CompatRecipeEntry recipeEntry) { } public static > ItemStackList getRemainder(CompatRecipeEntry recipeEntry, CompatRecipeInput input) { - return ItemStackList.of(recipeEntry.getRecipe().getRemainder(input.getInput())); + return ItemStackList.of(); + //return ItemStackList.of(recipeEntry.getRecipe().getRemainder(input.getInput())); } public enum CompatibilityCraftingRecipeCategory { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java index a6f367799..c1e7f69ab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java @@ -10,7 +10,7 @@ public class SoundEventUtil { public static Identifier getId(SoundEvent soundEvent) { - return soundEvent.getId(); + return Registries.SOUND_EVENT.getId(soundEvent); } public static SoundEvent getSoundEvent(Identifier id) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index eb35a7178..85f65521e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -2,6 +2,8 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.ShapeContext; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; @@ -178,7 +180,7 @@ public static int getBottomY(World world) { } public static int getTopY(World world) { - return world.getTopY(); + return world.getTopYInclusive(); } public static int getDimensionHeight(World world) { @@ -257,7 +259,7 @@ public static void addParticle(World world, ParticleEffect parameters, double x, } public static boolean canSetBlock(World world, BlockPos pos) { - return world.canSetBlock(pos); + return world.canPlace(Blocks.STONE.getDefaultState(), pos, ShapeContext.absent()); } public static void updateComparators(World world, BlockPos pos, Block block) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java index 1a6fd78a8..20199a63e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.AbstractCookingRecipe; import net.minecraft.recipe.input.SingleStackRecipeInput; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.recipe.MatchGetter; @@ -16,16 +17,16 @@ public static int getDefaultCookTime() { return AbstractFurnaceBlockEntity.DEFAULT_COOK_TIME; } - public static boolean canUseAsFuel(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { - return canUseAsFuel(stack.toMinecraft()); + public static boolean canUseAsFuel(net.pitan76.mcpitanlib.midohra.item.ItemStack stack, World world) { + return canUseAsFuel(stack.toMinecraft(), world); } - public static boolean canUseAsFuel(ItemStack stack) { - return AbstractFurnaceBlockEntity.canUseAsFuel(stack); + public static boolean canUseAsFuel(ItemStack stack, World world) { + return world.getFuelRegistry().isFuel(stack); } public static void tick(World world, BlockPos pos, AbstractFurnaceBlockEntity blockEntity) { - AbstractFurnaceBlockEntity.tick(world, pos, WorldUtil.getBlockState(world, pos), blockEntity); + AbstractFurnaceBlockEntity.tick((ServerWorld) world, pos, WorldUtil.getBlockState(world, pos), blockEntity); } public static int getCookTime(World world, AbstractFurnaceBlockEntity furnace, MatchGetter matchGetter) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java index 936e089c4..4262b0edf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java @@ -86,8 +86,9 @@ public static File getRunDirectory() { return getClient().runDirectory; } + // TODO: 1.21.2 public static Profiler getProfiler() { - return getClient().getProfiler(); + return null; } public static GameProfile getGameProfile() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java index 0632da0b3..59f466f23 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java @@ -1,12 +1,18 @@ package net.pitan76.mcpitanlib.api.util.client; import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gl.ShaderProgram; +import net.minecraft.client.gl.ShaderProgramKey; +import net.minecraft.client.gl.ShaderProgramKeys; +import net.minecraft.client.gui.screen.ingame.AbstractFurnaceScreen; import net.minecraft.client.render.GameRenderer; import net.minecraft.util.Identifier; public class RenderUtil { public static void setShaderToPositionTexProgram() { - RenderSystem.setShader(GameRenderer::getPositionTexProgram); + try (ShaderProgram program = RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX)) { + RenderSystem.setShader(program); + } } public static void setShaderColor(float red, float green, float blue, float alpha) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index 7ba434766..829deb8e1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -6,6 +6,7 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.render.RenderLayer; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.OrderedText; import net.minecraft.text.Text; @@ -148,11 +149,11 @@ public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, Ord } public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { - drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, textureWidth, textureHeight); + drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, textureWidth, textureHeight); } public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, float u, float v, int width, int height) { - drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, 256, 256); + drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); } public static TextRenderer getTextRenderer() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java index b41984039..9d5fd3085 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java @@ -3,10 +3,15 @@ import net.minecraft.entity.projectile.thrown.SnowballEntity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class SnowballEntityUtil { public static SnowballEntity create(World world, double x, double y, double z) { - return new SnowballEntity(world, x, y, z); + return new SnowballEntity(world, x, y, z, ItemStackUtil.empty()); + } + + public static SnowballEntity create(World world, double x, double y, double z, ItemStack stack) { + return new SnowballEntity(world, x, y, z, stack); } public static void setVelocity(SnowballEntity entity, double x, double y, double z, float velocity, float divergence) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java index caf91b12e..8983bd5d4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java @@ -1,12 +1,11 @@ package net.pitan76.mcpitanlib.api.util.event; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.TypedActionResult; import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class ItemEventGenerator { - public static TypedActionResult onRightClick(Item item, ItemUseEvent e) { - return item.use(e.world, e.user.getPlayerEntity(), e.hand); + public static CompatActionResult onRightClick(Item item, ItemUseEvent e) { + return CompatActionResult.create(item.use(e.world, e.user.getPlayerEntity(), e.hand)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java index 6143cfd33..2c6844f07 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java @@ -5,33 +5,39 @@ import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeMatcher; import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.util.ItemUtil; public class RecipeMatcherUtil { public static ItemStack getStackFromId(int itemId) { - return RecipeMatcher.getStackFromId(itemId); + return ItemStackUtil.create(ItemUtil.fromIndex(itemId)); } public static int getItemId(ItemStack stack) { - return RecipeMatcher.getItemId(stack); + return ItemUtil.getRawId(stack.getItem()); } - public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output) { + public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output) { return match(matcher, entry.getRecipe(), output); } - public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output, int multiplier) { + public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output, int multiplier) { return match(matcher, entry.getRecipe(), output, multiplier); } - public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output) { - return matcher.match(recipe, output); + @Deprecated + public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output) { + return false; + //return matcher.match(recipe, output); } - public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output, int multiplier) { - return matcher.match(recipe, output, multiplier); + @Deprecated + public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output, int multiplier) { + return false; + //return matcher.match(recipe, output, multiplier); } - public static void clear(RecipeMatcher matcher) { + public static void clear(RecipeMatcher matcher) { matcher.clear(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java index 130d63767..694e4c3b1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.util.recipe.input; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.RecipeMatcher; +import net.minecraft.recipe.RecipeFinder; import net.minecraft.recipe.input.CraftingRecipeInput; import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; @@ -40,11 +40,11 @@ public static net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack(Comp return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStack(input, x, y)); } - public static RecipeMatcher getRecipeMatcher(CraftingRecipeInput input) { + public static RecipeFinder getRecipeMatcher(CraftingRecipeInput input) { return input.getRecipeMatcher(); } - public static RecipeMatcher getRecipeMatcher(CompatRecipeInput input) { + public static RecipeFinder getRecipeMatcher(CompatRecipeInput input) { Optional recipeInput = get(input); if (!recipeInput.isPresent()) return null; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java index abe0d816e..5c0c9adfe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java @@ -41,7 +41,7 @@ public static int getBottomY(WorldView world) { } public static int getTopY(WorldView world) { - return world.getTopY(); + return world.getTopYInclusive(); } public static boolean isChunkLoaded(WorldView world, BlockPos pos) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java index 4aac66ae5..00902072b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.core.player; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.pitan76.mcpitanlib.api.entity.Player; public class ItemCooldown { @@ -11,10 +12,20 @@ public ItemCooldown(Player player) { } public boolean isCoolingDown(Item item) { - return player.getItemCooldownManager().isCoolingDown(item); + for (ItemStack stack : player.getMain()) { + if (stack.getItem() == item) { + return player.getItemCooldownManager().isCoolingDown(stack); + } + } + + return false; } public void set(Item item, int duration) { - player.getItemCooldownManager().set(item, duration); + for (ItemStack stack : player.getMain()) { + if (stack.getItem() == item) { + player.getItemCooldownManager().set(stack, duration); + } + } } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java index ac1802e19..47f69c5f9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java @@ -2,16 +2,26 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; +import net.minecraft.resource.featuretoggle.FeatureSet; +import net.minecraft.world.World; public class FuelRegistry { private FuelRegistry() { } + // TODO: 1.21.2 public static void register(int time, ItemConvertible... item) { - dev.architectury.registry.fuel.FuelRegistry.register(time, item); + //dev.architectury.registry.fuel.FuelRegistry.register(time, item); } + + // TODO: 1.21.2 public static int get(ItemStack stack) { - return dev.architectury.registry.fuel.FuelRegistry.get(stack); + return 0; + //return dev.architectury.registry.fuel.FuelRegistry.get(stack); + } + + public static int get(World world, ItemStack stack) { + return world.getFuelRegistry().getFuelTicks(stack); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java index e69e7b43d..facc1262a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/api/render/PartsRenderer.java @@ -16,7 +16,7 @@ public static void drawBottom2TopProgressBar(DrawObjectDM drawObjectDM, int x, i } public static void drawBottom2TopProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { - int percentage = (int) (value / maxValue * 100); + int percentage = (maxValue != 0) ? (int) (value / maxValue * 100) : 0; drawBottom2TopProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); } @@ -30,7 +30,7 @@ public static void drawTop2BottomProgressBar(DrawObjectDM drawObjectDM, int x, i } public static void drawTop2BottomProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { - int percentage = (int) (value / maxValue * 100); + int percentage = (maxValue != 0) ? (int) (value / maxValue * 100) : 0; drawTop2BottomProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); } @@ -44,7 +44,7 @@ public static void drawLeft2RightProgressBar(DrawObjectDM drawObjectDM, int x, i } public static void drawLeft2RightProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { - int percentage = (int) (value / maxValue * 100); + int percentage = (maxValue != 0) ? (int) (value / maxValue * 100) : 0; drawLeft2RightProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); } @@ -58,7 +58,7 @@ public static void drawRight2LeftProgressBar(DrawObjectDM drawObjectDM, int x, i } public static void drawRight2LeftProgressBar(DrawObjectDM drawObjectDM, int x, int y, int u1, int v1, int u2, int v2, int width, int height, double value, double maxValue, CompatIdentifier texture) { - int percentage = (int) (value / maxValue * 100); + int percentage = (maxValue != 0) ? (int) (value / maxValue * 100) : 0; drawRight2LeftProgressBar(drawObjectDM, x, y, u1, v1, u2, v2, width, height, percentage, texture); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java index 947eb2aa1..33dbde8bf 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootContextParameterSet; +import net.minecraft.loot.context.LootWorldContext; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.world.ServerWorld; @@ -68,7 +68,7 @@ public class AbstractBlockMixin { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); - ActionResult returnValue = provider.onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit), options); + ActionResult returnValue = provider.onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit), options).toActionResult(); if (options.cancel && returnValue != null) cir.setReturnValue(returnValue); } @@ -98,7 +98,7 @@ public class AbstractBlockMixin { } @Inject(method = "getDroppedStacks", at = @At("HEAD"), cancellable = true) - private void mcpitanlib$inject_getDroppedStacks(BlockState state, LootContextParameterSet.Builder builder, CallbackInfoReturnable> cir) { + private void mcpitanlib$inject_getDroppedStacks(BlockState state, LootWorldContext.Builder builder, CallbackInfoReturnable> cir) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index a795c8697..dd857bee0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -12,7 +12,6 @@ import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; @@ -29,11 +28,11 @@ @Mixin(Item.class) public class ItemMixin { @Inject(method = "use", at = @At("HEAD"), cancellable = true) - private void mcpitanlib$use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { + private void mcpitanlib$use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); - TypedActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options); + ActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options).toActionResult(); if (options.cancel && returnValue != null) cir.setReturnValue(returnValue); } @@ -45,7 +44,7 @@ public class ItemMixin { ExtendItemProvider provider = (ExtendItemProvider) this; ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; Options options = new Options(); - ActionResult returnValue = provider.onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit()), options); + ActionResult returnValue = provider.onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit()), options).toActionResult(); if (options.cancel && returnValue != null) cir.setReturnValue(returnValue); } @@ -56,7 +55,7 @@ public class ItemMixin { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); - ActionResult returnValue = provider.onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand), options); + ActionResult returnValue = provider.onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand), options).toActionResult(); if (options.cancel && returnValue != null) cir.setReturnValue(returnValue); } @@ -73,6 +72,7 @@ public class ItemMixin { } } + /* @Inject(method = "hasRecipeRemainder", at = @At("HEAD"), cancellable = true) private void mcpitanlib$hasRecipeRemainder(CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { @@ -83,6 +83,7 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } + */ @Inject(method = "appendTooltip", at = @At("HEAD"), cancellable = true) private void mcpitanlib$appendTooltip(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipType type, CallbackInfo ci) { @@ -128,6 +129,7 @@ public class ItemMixin { } } + /* @Inject(method = "isEnchantable", at = @At("HEAD"), cancellable = true) private void mcpitanlib$isEnchantable(ItemStack stack, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { @@ -138,7 +140,9 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } + */ + /* @Inject(method = "getEnchantability", at = @At("HEAD"), cancellable = true) private void mcpitanlib$getEnchantability(CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { @@ -149,6 +153,7 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } + */ @Inject(method = "getItemBarColor", at = @At("HEAD"), cancellable = true) private void mcpitanlib$getItemBarColor(ItemStack stack, CallbackInfoReturnable cir) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 9a79a2f02..24bc30cb4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -1,11 +1,7 @@ package net.pitan76.mcpitanlib.mixin; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import com.google.gson.JsonElement; -import net.minecraft.recipe.RecipeEntry; -import net.minecraft.recipe.RecipeManager; -import net.minecraft.recipe.RecipeType; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.recipe.*; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; @@ -14,19 +10,18 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.util.Map; +import java.util.SortedMap; -@Mixin(RecipeManager.class) +@Mixin(ServerRecipeManager.class) public class RecipeManagerMixin { - @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", locals = LocalCapture.CAPTURE_FAILHARD, + @Inject(method = "prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Lnet/minecraft/recipe/PreparedRecipes;", at = @At(value = "TAIL")) - private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, ImmutableMultimap.Builder, RecipeEntry> builder, ImmutableMap.Builder> builder2) { + private void mcpitanlib$invokeApply(ResourceManager resourceManager, Profiler profiler, CallbackInfoReturnable cir, @Local SortedMap> sortedMap) { if (RecipeManagerRegistry.managers.isEmpty()) return; - RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, builder2, builder))); + RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(sortedMap, resourceManager, profiler))); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java index 7822463ea..56420c784 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java @@ -2,12 +2,12 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class ExampleGuiBlock extends ExtendBlock implements SimpleScreenHandlerFactory { @@ -16,7 +16,7 @@ public ExampleGuiBlock(Settings settings) { } @Override - public ActionResult onRightClick(BlockUseEvent e) { + public CompatActionResult onRightClick(BlockUseEvent e) { if (e.isClient()) e.player.openGuiScreen(this); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java index 1db7fbac3..759f4fa20 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java @@ -1,15 +1,14 @@ package net.pitan76.mcpitanlib.test; -import net.minecraft.item.ItemStack; import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.minecraft.util.TypedActionResult; import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.TextUtil; public class ExampleGuiItem extends ExtendItem implements SimpleScreenHandlerFactory { @@ -19,7 +18,7 @@ public ExampleGuiItem(CompatibleItemSettings settings) { } @Override - public TypedActionResult onRightClick(ItemUseEvent e) { + public CompatActionResult onRightClick(ItemUseEvent e) { if (!e.isClient()) e.user.openGuiScreen(this); diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java index 2b81187c2..1af714858 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/event/fabric/WorldRenderRegistryImpl.java @@ -56,11 +56,6 @@ public ClientWorld getWorld() { return worldRenderContext.world(); } - @Override - public Profiler getProfiler() { - return worldRenderContext.profiler(); - } - @Override public boolean isAdvancedTranslucency() { return worldRenderContext.advancedTranslucency(); @@ -121,11 +116,6 @@ public ClientWorld getWorld() { return context.world(); } - @Override - public Profiler getProfiler() { - return context.profiler(); - } - @Override public boolean isAdvancedTranslucency() { return context.advancedTranslucency(); diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java index 286680873..13ecb0947 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/fabric/mixin/RecipeMixin.java @@ -1,17 +1,13 @@ package net.pitan76.mcpitanlib.fabric.mixin; -import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; import net.minecraft.recipe.input.RecipeInput; -import net.minecraft.util.collection.DefaultedList; -import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(Recipe.class) public interface RecipeMixin { + + /* @Inject(method = "getRemainder", at = @At("RETURN")) default void injectGetRemainder(C input, CallbackInfoReturnable> cir) { DefaultedList defaultedList = cir.getReturnValue(); @@ -25,4 +21,6 @@ default void injectGetRemainder(C input, CallbackInfoReturnable Date: Fri, 18 Oct 2024 21:49:43 +0900 Subject: [PATCH 406/622] MCPitanLib3, 1.21.2 --- .../net/pitan76/mcpitanlib/MCPitanLib.java | 5 + .../api/block/CompatibleBlockSettings.java | 10 +- .../mcpitanlib/api/block/v2/CompatBlock.java | 23 ++ .../api/block/v2/CompatibleBlockSettings.java | 274 ++++++++++++++++++ .../api/item/CompatibleItemSettings.java | 6 +- .../api/item/CreativeTabBuilder.java | 14 + .../mcpitanlib/api/item/ExtendItem.java | 1 + .../mcpitanlib/api/item/v2/CompatItem.java | 22 ++ .../api/item/v2/CompatibleItemSettings.java | 163 +++++++++++ .../api/registry/CompatRegistry.java | 11 +- .../api/simple/item/SimpleGuiItem.java | 6 +- .../mcpitanlib/api/util/BlockStateUtil.java | 5 + .../mcpitanlib/api/util/BlockUtil.java | 1 + .../mcpitanlib/api/util/CompatIdentifier.java | 10 +- .../pitan76/mcpitanlib/api/util/ItemUtil.java | 1 + .../mcpitanlib/api/util/block/BlockUtil.java | 225 ++++++++++++++ .../api/util/item/ItemGroupUtil.java | 40 +++ .../mcpitanlib/api/util/item/ItemUtil.java | 250 ++++++++++++++++ .../pitan76/mcpitanlib/debug/DebugTool.java | 11 +- .../mcpitanlib/midohra/block/BlockState.java | 57 ++++ .../midohra/block/BlockWrapper.java | 87 ++++++ .../midohra/item/ItemGroupWrapper.java | 53 ++++ .../mcpitanlib/midohra/item/ItemGroups.java | 30 ++ .../mcpitanlib/midohra/item/ItemStack.java | 7 +- .../mcpitanlib/midohra/item/ItemWrapper.java | 105 +++++++ .../mcpitanlib/midohra/item/Items.java | 20 ++ .../mcpitanlib/test/ExampleGuiBlock.java | 7 +- .../mcpitanlib/test/ExampleGuiItem.java | 6 +- .../pitan76/mcpitanlib/test/ExampleMod.java | 37 ++- info.properties | 4 +- 30 files changed, 1448 insertions(+), 43 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemGroupUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroups.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/item/Items.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index f9b7b6d6d..c45645b66 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -11,6 +11,7 @@ import net.pitan76.easyapi.config.Config; import net.pitan76.easyapi.config.JsonConfig; import net.pitan76.mcpitanlib.api.registry.CompatRegistry; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.PlatformUtil; import net.pitan76.mcpitanlib.debug.DebugTool; @@ -102,6 +103,10 @@ public static Identifier id(String path) { return IdentifierUtil.id(MOD_ID, path); } + public static CompatIdentifier compatId(String path) { + return CompatIdentifier.fromMinecraft(id(path)); + } + public static boolean isItemBlackListed(Identifier id) { try { return itemBlackList.contains(id.toString()); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java index 053d21c56..56cc62dc5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatibleBlockSettings.java @@ -12,19 +12,22 @@ import java.util.function.Function; import java.util.function.ToIntFunction; +@Deprecated public class CompatibleBlockSettings { public static final Codec CODEC = Codec.unit(CompatibleBlockSettings::of); - private final AbstractBlock.Settings settings; + protected final AbstractBlock.Settings settings; public CompatibleBlockSettings() { this.settings = AbstractBlock.Settings.create(); } + @Deprecated public static CompatibleBlockSettings of() { return new CompatibleBlockSettings(); } + @Deprecated private static CompatibleBlockSettings copyCompatibleMaterial(CompatibleMaterial material, CompatibleBlockSettings settings) { settings.mapColor(material.getColor()); if (material.isLiquid()) @@ -64,18 +67,22 @@ public CompatibleBlockSettings(CompatibleMaterial material, Function mapColor) { return new CompatibleBlockSettings(material, mapColor); } @@ -84,6 +91,7 @@ public CompatibleBlockSettings(AbstractBlock block) { this.settings = AbstractBlock.Settings.copy(block); } + @Deprecated public static CompatibleBlockSettings copy(AbstractBlock block) { return new CompatibleBlockSettings(block); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java new file mode 100644 index 000000000..aabdcb251 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.api.block.v2; + +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; + +public class CompatBlock extends ExtendBlock { + + public CompatibleBlockSettings settings; + + public CompatBlock(CompatibleBlockSettings settings) { + super(settings); + this.settings = settings; + } + + public CompatibleBlockSettings getCompatSettings() { + return settings; + } + + public BlockWrapper getWrapper() { + return BlockWrapper.of(this); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java new file mode 100644 index 000000000..651891fd0 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java @@ -0,0 +1,274 @@ +package net.pitan76.mcpitanlib.api.block.v2; + +import com.mojang.serialization.Codec; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.MapColor; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.DyeColor; +import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; +import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.function.Function; +import java.util.function.ToIntFunction; + +@SuppressWarnings("deprecation") +public class CompatibleBlockSettings extends net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings { + protected CompatIdentifier identifier = null; + public boolean changedTranslationKey = false; + + public static final Codec CODEC = Codec.unit(CompatibleBlockSettings::new); + + @Deprecated + protected CompatibleBlockSettings() { + super(); + } + + public CompatibleBlockSettings(CompatIdentifier identifier) { + super(); + setId(identifier); + } + + public static CompatibleBlockSettings of(CompatIdentifier id) { + return new CompatibleBlockSettings(id); + } + + @Deprecated + public CompatibleBlockSettings setId(CompatIdentifier identifier) { + this.identifier = identifier; + return this; + } + + private static CompatibleBlockSettings copy(CompatibleMaterial material, CompatibleBlockSettings settings) { + settings.mapColor(material.getColor()); + if (material.isLiquid()) + settings.settings.liquid(); + if (material.isSolid()) + settings.settings.solid(); + if (material.isReplaceable()) + settings.settings.replaceable(); + if (material.isSolid()) + settings.settings.solid(); + if (material.isBurnable()) + settings.settings.burnable(); + settings.settings.pistonBehavior(material.getPistonBehavior()); + return settings; + } + + public CompatibleBlockSettings(CompatIdentifier id, CompatibleMaterial material, MapColor mapColor) { + this(id); + copy(material, this); + mapColor(mapColor); + } + + public CompatibleBlockSettings(CompatIdentifier id, CompatibleMaterial material, DyeColor dyeColor) { + this(id); + copy(material, this); + mapColor(dyeColor); + } + + public CompatibleBlockSettings(CompatIdentifier id, CompatibleMaterial material) { + this(id); + copy(material, this); + } + + public CompatibleBlockSettings(CompatIdentifier id, CompatibleMaterial material, Function mapColor) { + this(id); + copy(material, this); + mapColor(mapColor); + } + + public static CompatibleBlockSettings of(CompatIdentifier id, CompatibleMaterial material, MapColor mapColor) { + return new CompatibleBlockSettings(id, material, mapColor); + } + + public static CompatibleBlockSettings of(CompatIdentifier id, CompatibleMaterial material, DyeColor dyeColor) { + return new CompatibleBlockSettings(id, material, dyeColor); + } + + public static CompatibleBlockSettings of(CompatIdentifier id, CompatibleMaterial material) { + return new CompatibleBlockSettings(id, material); + } + + public static CompatibleBlockSettings of(CompatIdentifier id, CompatibleMaterial material, Function mapColor) { + return new CompatibleBlockSettings(id, material, mapColor); + } + + public CompatibleBlockSettings(CompatIdentifier id, AbstractBlock block) { + super(block); + setId(id); + } + + public static CompatibleBlockSettings copy(CompatIdentifier id, AbstractBlock block) { + return new CompatibleBlockSettings(id, block); + } + + public CompatibleBlockSettings air() { + super.air(); + return this; + } + + public CompatibleBlockSettings blockVision(AbstractBlock.ContextPredicate predicate) { + super.blockVision(predicate); + return this; + } + + public CompatibleBlockSettings postProcess(AbstractBlock.ContextPredicate predicate) { + super.postProcess(predicate); + return this; + } + + public CompatibleBlockSettings solidBlock(AbstractBlock.ContextPredicate predicate) { + super.solidBlock(predicate); + return this; + } + + public CompatibleBlockSettings suffocates(AbstractBlock.ContextPredicate predicate) { + super.suffocates(predicate); + return this; + } + + public CompatibleBlockSettings mapColor(MapColor color) { + super.mapColor(color); + return this; + } + + public CompatibleBlockSettings mapColor(DyeColor color) { + super.mapColor(color); + return this; + } + + public CompatibleBlockSettings mapColor(Function color) { + super.mapColor(color); + return this; + } + + @Deprecated + public CompatibleBlockSettings dropsLike(Block source) { + super.dropsLike(source); + return this; + } + + public CompatibleBlockSettings breakInstantly() { + super.breakInstantly(); + return this; + } + + public CompatibleBlockSettings dropsNothing() { + super.dropsNothing(); + return this; + } + + public CompatibleBlockSettings dynamicBounds() { + super.dynamicBounds(); + return this; + } + + public CompatibleBlockSettings hardness(float hardness) { + super.hardness(hardness); + return this; + } + + public CompatibleBlockSettings noBlockBreakParticles() { + super.noBlockBreakParticles(); + return this; + } + + public CompatibleBlockSettings requiresTool() { + super.requiresTool(); + return this; + } + + public CompatibleBlockSettings noCollision() { + super.noCollision(); + return this; + } + + public CompatibleBlockSettings nonOpaque() { + super.nonOpaque(); + return this; + } + + public CompatibleBlockSettings resistance(float resistance) { + super.resistance(resistance); + return this; + } + + public CompatibleBlockSettings strength(float strength) { + super.strength(strength); + return this; + } + + public CompatibleBlockSettings strength(float hardness, float resistance) { + super.strength(hardness, resistance); + return this; + } + + public CompatibleBlockSettings ticksRandomly() { + super.ticksRandomly(); + return this; + } + + public CompatibleBlockSettings sounds(CompatBlockSoundGroup blockSoundGroup) { + super.sounds(blockSoundGroup); + return this; + } + + public CompatibleBlockSettings luminance(ToIntFunction luminance) { + super.luminance(luminance); + return this; + } + + public CompatibleBlockSettings jumpVelocityMultiplier(float jumpVelocityMultiplier) { + super.jumpVelocityMultiplier(jumpVelocityMultiplier); + return this; + } + + public CompatibleBlockSettings slipperiness(float slipperiness) { + super.slipperiness(slipperiness); + return this; + } + + public CompatibleBlockSettings velocityMultiplier(float velocityMultiplier) { + super.velocityMultiplier(velocityMultiplier); + return this; + } + + public CompatibleBlockSettings emissiveLighting(AbstractBlock.ContextPredicate predicate) { + super.emissiveLighting(predicate); + return this; + } + + public CompatibleBlockSettings offset(AbstractBlock.OffsetType offsetType) { + super.offset(offsetType); + return this; + } + + public CompatibleBlockSettings allowsSpawning(AbstractBlock.TypedContextPredicate> predicate) { + super.allowsSpawning(predicate); + return this; + } + + public AbstractBlock.Settings build() { + super.build(); + + if (identifier != null) { + settings.registryKey(RegistryKey.of(RegistryKeys.BLOCK, identifier.toMinecraft())); + } + + return settings; + } + + @Deprecated + @Override + public CompatibleBlockSettings sounds(BlockSoundGroup blockSoundGroup) { + super.sounds(blockSoundGroup); + return this; + } + + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index ffc6a1cfb..2dc4b4190 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -11,11 +11,13 @@ import java.util.function.Supplier; +@Deprecated public class CompatibleItemSettings { - private final ExtendSettings settings = new ExtendSettings(); + protected final ExtendSettings settings = new ExtendSettings(); protected Identifier itemGroupId = null; + @Deprecated public static CompatibleItemSettings of() { return new CompatibleItemSettings(); } @@ -77,7 +79,7 @@ public CompatibleItemSettings recipeRemainder(Item recipeRemainder) { return this; } - public ExtendSettings build() { + public Item.Settings build() { if (itemGroupId != null) { RegistrySupplier itemGroup = MCPLRegistry1_20.REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.get(itemGroupId); settings.arch$tab(itemGroup); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java index ed6bc01bd..fc7e9851a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CreativeTabBuilder.java @@ -9,6 +9,8 @@ import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; +import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; import java.util.function.Supplier; @@ -92,7 +94,19 @@ public ItemGroup build() { })); } + @SuppressWarnings("deprecation") + public ItemGroupWrapper getBuiltWrapper() { + if (MCPLRegistry1_20.REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.containsKey(identifier)) + return ItemGroupWrapper.of(MCPLRegistry1_20.REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.get(identifier).getOrNull()); + + return ItemGroupWrapper.of(build()); + } + public Identifier getIdentifier() { return identifier; } + + public CompatIdentifier getCompatIdentifier() { + return CompatIdentifier.fromMinecraft(identifier); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 95462b196..feac42a4a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -23,6 +23,7 @@ import java.util.List; public class ExtendItem extends Item { + public ExtendItem(Settings settings) { super(settings); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java new file mode 100644 index 000000000..3245c52a8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java @@ -0,0 +1,22 @@ +package net.pitan76.mcpitanlib.api.item.v2; + +import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; + +public class CompatItem extends ExtendItem { + + public CompatibleItemSettings settings; + + public CompatItem(CompatibleItemSettings settings) { + super(settings); + this.settings = settings; + } + + public CompatibleItemSettings getCompatSettings() { + return settings; + } + + public ItemWrapper getWrapper() { + return ItemWrapper.of(this); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java new file mode 100644 index 000000000..aa4dd42f1 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java @@ -0,0 +1,163 @@ +package net.pitan76.mcpitanlib.api.item.v2; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; +import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; +import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; +import net.pitan76.mcpitanlib.api.item.ExtendSettings; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; + +import java.util.function.Supplier; + +@SuppressWarnings("deprecation") +public class CompatibleItemSettings extends net.pitan76.mcpitanlib.api.item.CompatibleItemSettings { + protected CompatIdentifier identifier = null; + public boolean changedTranslationKey = false; + + public CompatibleItemSettings(CompatIdentifier identifier) { + super(); + setId(identifier); + } + + public static CompatibleItemSettings of(CompatIdentifier id) { + return new CompatibleItemSettings(id); + } + + @Deprecated + public CompatibleItemSettings setId(CompatIdentifier identifier) { + this.identifier = identifier; + return this; + } + + public CompatibleItemSettings addGroup(ItemGroup itemGroup) { + super.addGroup(itemGroup, identifier); + return this; + } + + public CompatibleItemSettings addGroup(Supplier itemGroup) { + super.addGroup(itemGroup, identifier); + return this; + } + + @Override + public CompatibleItemSettings addGroup(CreativeTabBuilder itemGroup) { + super.addGroup(itemGroup); + return this; + } + + public CompatibleItemSettings addGroup(ItemGroupWrapper itemGroup) { + return addGroup(itemGroup.get()); + } + + @Override + public CompatibleItemSettings maxCount(int maxCount) { + super.maxCount(maxCount); + return this; + } + + @Override + public CompatibleItemSettings maxDamage(int maxDamage) { + super.maxDamage(maxDamage); + return this; + } + + @Override + public CompatibleItemSettings maxDamageIfAbsent(int maxDamage) { + super.maxDamageIfAbsent(maxDamage); + return this; + } + + @Override + public CompatibleItemSettings recipeRemainder(Item recipeRemainder) { + super.recipeRemainder(recipeRemainder); + return this; + } + + public CompatibleItemSettings recipeRemainder(ItemWrapper recipeRemainder) { + return recipeRemainder(recipeRemainder.get()); + } + + @Override + public CompatibleItemSettings rarity(Rarity rarity) { + super.rarity(rarity); + return this; + } + + @Override + public CompatibleItemSettings food(CompatFoodComponent foodComponent) { + super.food(foodComponent); + return this; + } + + public CompatibleItemSettings useItemPrefixedTranslationKey() { + settings.useItemPrefixedTranslationKey(); + changedTranslationKey = true; + return this; + } + + public CompatibleItemSettings useBlockPrefixedTranslationKey() { + settings.useBlockPrefixedTranslationKey(); + changedTranslationKey = true; + return this; + } + + public CompatibleItemSettings translationKey(String translationKey) { + settings.translationKey(translationKey); + changedTranslationKey = true; + return this; + } + + public CompatibleItemSettings enchantable(int enchantability) { + settings.enchantable(enchantability); + return this; + } + + public CompatibleItemSettings repairable(RepairIngredientTag tag) { + settings.repairable(tag.getTag()); + return this; + } + + @Override + public ExtendSettings build() { + super.build(); + + if (identifier != null) { + settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier.toMinecraft())); + } + + return settings; + } + + // Deprecated + + @Deprecated + @Override + public net.pitan76.mcpitanlib.api.item.CompatibleItemSettings addGroup(ItemGroup itemGroup, Identifier identifier) { + return super.addGroup(itemGroup, identifier); + } + + @Deprecated + @Override + public net.pitan76.mcpitanlib.api.item.CompatibleItemSettings addGroup(Supplier itemGroup, Identifier identifier) { + return super.addGroup(itemGroup, identifier); + } + + @Deprecated + @Override + public net.pitan76.mcpitanlib.api.item.CompatibleItemSettings addGroup(Supplier itemGroup, CompatIdentifier identifier) { + return super.addGroup(itemGroup, identifier); + } + + @Deprecated + @Override + public net.pitan76.mcpitanlib.api.item.CompatibleItemSettings addGroup(ItemGroup itemGroup, CompatIdentifier identifier) { + return super.addGroup(itemGroup, identifier); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java index b1f4b3130..2bb439e04 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistry.java @@ -19,12 +19,13 @@ import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.gui.ExtendedScreenHandlerTypeBuilder; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.CreativeTabManager; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; -import net.pitan76.mcpitanlib.api.util.BlockUtil; -import net.pitan76.mcpitanlib.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.block.BlockUtil; +import net.pitan76.mcpitanlib.api.util.item.ItemUtil; import net.pitan76.mcpitanlib.core.registry.FuelRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry; import net.pitan76.mcpitanlib.core.registry.MCPLRegistry1_20; @@ -77,14 +78,14 @@ public static CompatRegistry create(String MOD_ID) { * @return The registry result */ public RegistryResult registerItem(Identifier id, Supplier supplier) { - if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtil.of(CompatibleItemSettings.of()); + if (MCPitanLib.isItemBlackListed(id)) supplier = () -> ItemUtil.create(CompatibleItemSettings.of(CompatIdentifier.fromMinecraft(id))); RegistrySupplier registrySupplier = mcplr.registryItem(id, supplier); CreativeTabManager.register(id); return new RegistryResult<>(registrySupplier); } public RegistryResult registerBlock(Identifier id, Supplier supplier) { - if (MCPitanLib.isBlockBlackListed(id)) supplier = () -> BlockUtil.of(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); + if (MCPitanLib.isBlockBlackListed(id)) supplier = () -> BlockUtil.create(CompatibleBlockSettings.of(CompatibleMaterial.STONE)); return new RegistryResult<>(mcplr.registryBlock(id, supplier)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java index 695b04ad2..2992ecc0f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java @@ -6,11 +6,11 @@ import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.v2.CompatItem; import net.pitan76.mcpitanlib.api.util.CompatActionResult; -public class SimpleGuiItem extends ExtendItem implements SimpleScreenHandlerFactory { +public class SimpleGuiItem extends CompatItem implements SimpleScreenHandlerFactory { public ScreenHandlerFactory factory; public Text name; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index d55ad5890..ea9887b42 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -16,6 +16,7 @@ import net.minecraft.world.WorldAccess; import net.minecraft.world.block.WireOrientation; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; import net.pitan76.mcpitanlib.api.util.block.BlockHitResultUtil; public class BlockStateUtil { @@ -35,6 +36,10 @@ public static BlockSoundGroup getSoundGroup(BlockState state) { return state.getSoundGroup(); } + public static CompatBlockSoundGroup getCompatSoundGroup(BlockState state) { + return CompatBlockSoundGroup.of(getSoundGroup(state)); + } + public static BlockState getDefaultState(Block block) { return block.getDefaultState(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java index a2ae6c73f..5b5651bf7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -12,6 +12,7 @@ import java.util.List; +@Deprecated public class BlockUtil { /** * Get block from Identifier. diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java index 8aafc8174..dafd1d855 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java @@ -12,6 +12,8 @@ public class CompatIdentifier { private final String namespace; private final String path; + public static final CompatIdentifier EMPTY = CompatIdentifier.of("mcpitanlib:empty"); + /** * Creates a new Identifier with the given namespace and path. * @param namespace The namespace of the Identifier. @@ -144,10 +146,14 @@ public static CompatIdentifier fromMinecraft(Identifier id) { } public static CompatIdentifier empty() { - return of("mcpitanlib:empty"); + return EMPTY; } public boolean isEmpty() { - return this.equals("mcpitanlib:empty"); + return equals(EMPTY); + } + + public static boolean isMinecraftNamespace(CompatIdentifier id) { + return id.getNamespace().equals("minecraft"); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java index a1a46fe28..70cfe5a75 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemUtil.java @@ -12,6 +12,7 @@ import java.util.List; +@Deprecated public class ItemUtil { /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java new file mode 100644 index 000000000..d0b2969be --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java @@ -0,0 +1,225 @@ +package net.pitan76.mcpitanlib.api.util.block; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.text.TextComponent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.ArrayList; +import java.util.List; + +@SuppressWarnings("deprecation") +public class BlockUtil { + /** + * Check if two blocks are equal. + * @param block Block to compare. + * @param block2 Block to compare. + * @return If two blocks are equal. + */ + public static boolean isEqual(Block block, Block block2) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.isEqual(block, block2); + } + + /** + * Get block from CompatIdentifier. + * @param id CompatIdentifier of the block. + * @return Block of the CompatIdentifier. + */ + public static Block fromId(CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.fromId(id); + } + + public static Block fromId(String id) { + return fromId(CompatIdentifier.of(id)); + } + + public static Block fromId(String namespace, String path) { + return fromId(CompatIdentifier.of(namespace, path)); + } + + /** + * Get CompatIdentifier from Block. + * @param block Block to get CompatIdentifier. + * @return CompatIdentifier of the Block. + */ + public static CompatIdentifier toId(Block block) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.toCompatID(block); + } + + public static String toIdAsString(Block block) { + return toId(block).toString(); + } + + /** + * Check if the block exist. + * @param id CompatIdentifier of the block. + * @return If the block exist. + */ + public static boolean isExist(CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.isExist(id); + } + + public static boolean isExist(String id) { + return isExist(CompatIdentifier.of(id)); + } + + public static boolean isExist(String namespace, String path) { + return isExist(CompatIdentifier.of(namespace, path)); + } + + public static boolean isMinecraftBlock(Block block) { + return CompatIdentifier.isMinecraftNamespace(toId(block)); + } + + /** + * Create a new Block + * @param settings Block settings + * @return The new Block + */ + public static Block create(CompatibleBlockSettings settings) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.of(settings); + } + + /** + * Get all blocks. + * @return List of all blocks. + */ + public static List getBlocks() { + return net.pitan76.mcpitanlib.api.util.BlockUtil.getAllBlocks(); + } + + /** + * Get blocks from tag key. + * @param tagKey Tag key of the blocks. + * @return Blocks of the tag key. + */ + public static List getInTag(TagKey tagKey) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.getBlocks(tagKey); + } + + /** + * Get blocks from tag key. + * @param id CompatIdentifier of the tag key. + * @return Blocks of the tag key. + */ + public static List getInTag(CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.getBlocks(id.toMinecraft()); + } + + public static List getInTag(String id) { + return getInTag(CompatIdentifier.of(id)); + } + + public static List getInTag(String namespace, String path) { + return getInTag(CompatIdentifier.of(namespace, path)); + } + + /** + * Check if the block is in the tag. + * @param block Block to check. + * @param tagKey Tag key of the tag. + * @return If the block is in the tag. + */ + public static boolean isInTag(Block block, TagKey tagKey) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.isIn(block, tagKey); + } + + /** + * Check if the block is in the tag. + * @param block Block to check. + * @param id CompatIdentifier of the tag. + * @return If the block is in the tag. + */ + public static boolean isInTag(Block block, CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.isBlockInTag(block, id.toMinecraft()); + } + + public static boolean isInTag(Block block, String id) { + return isInTag(block, CompatIdentifier.of(id)); + } + + public static boolean isInTag(Block block, String namespace, String path) { + return isInTag(block, CompatIdentifier.of(namespace, path)); + } + + /** + * Get raw id of the block. + * @param block Block to get raw id. + * @return Raw id of the block. + */ + public static int getRawId(Block block) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.getRawId(block); + } + + /** + * Get block from raw id. + * @param rawId Raw id of the block. + * @return Block of the raw id. + */ + public static Block fromRawId(int rawId) { + return net.pitan76.mcpitanlib.api.util.BlockUtil.fromIndex(rawId); + } + + /** + * Get blocks in the namespace. + * @param namespace Namespace of the blocks. + * @return List of blocks in the namespace. + */ + public static List getBlocksInNamespace(String namespace) { + List blocks = new ArrayList<>(); + + for (Block block : getBlocks()) { + if (toId(block).getNamespace().equals(namespace)) { + blocks.add(block); + } + } + + return blocks; + } + + /** + * Get number of all blocks. + * @return Number of all blocks. + */ + public static int getNumberOfBlocks() { + return getBlocks().size(); + } + + /** + * Get item from block. + * @param block Block + * @return Item + */ + public static Item toItem(Block block) { + return block.asItem(); + } + + /** + * Get name of the block. + * @param block Block + * @return Name of the block. + */ + public static String getNameAsString(Block block) { + return block.getName().getString(); + } + + /** + * Get name of the block. + * @param block Block + * @return Name of the block. + */ + public static TextComponent getName(Block block) { + return new TextComponent(block.getName()); + } + + /** + * Get translation key of the block. + * @param block Block + * @return Translation key of the block. + */ + public static String getTranslationKey(Block block) { + return block.getTranslationKey(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemGroupUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemGroupUtil.java new file mode 100644 index 000000000..44138ad5e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemGroupUtil.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.api.util.item; + +import net.minecraft.item.ItemGroup; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class ItemGroupUtil { + public static Identifier toID(ItemGroup itemGroup) { + return Registries.ITEM_GROUP.getId(itemGroup); + } + + public static ItemGroup fromId(Identifier identifier) { + return Registries.ITEM_GROUP.get(identifier); + } + + public static boolean isExist(Identifier identifier) { + return Registries.ITEM_GROUP.containsId(identifier); + } + + public static CompatIdentifier toCompatID(ItemGroup itemGroup) { + return CompatIdentifier.fromMinecraft(toID(itemGroup)); + } + + public static ItemGroup fromId(CompatIdentifier identifier) { + return fromId(identifier.toMinecraft()); + } + + public static boolean isExist(CompatIdentifier identifier) { + return isExist(identifier.toMinecraft()); + } + + public static int getRawId(ItemGroup itemGroup) { + return Registries.ITEM_GROUP.getRawId(itemGroup); + } + + public static ItemGroup fromIndex(int index) { + return Registries.ITEM_GROUP.get(index); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java new file mode 100644 index 000000000..d608f7129 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java @@ -0,0 +1,250 @@ +package net.pitan76.mcpitanlib.api.util.item; + +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.text.TextComponent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.ArrayList; +import java.util.List; + +@SuppressWarnings("deprecation") +public class ItemUtil { + + /** + * Check if the item is equal. + * @param item Item to compare. + * @param item2 Item to compare. + * @return If the item is equal. + */ + public static boolean isEqual(Item item, Item item2) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.isEqual(item, item2); + } + + /** + * Get item from CompatIdentifier. + * @param id CompatIdentifier of the item. + * @return Item of the CompatIdentifier. + */ + public static Item fromId(CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.fromId(id); + } + + public static Item fromId(String id) { + return fromId(CompatIdentifier.of(id)); + } + + public static Item fromId(String namespace, String path) { + return fromId(CompatIdentifier.of(namespace, path)); + } + + /** + * Get CompatIdentifier from Item. + * @param item Item to get CompatIdentifier. + * @return CompatIdentifier of the Item. + */ + public static CompatIdentifier toId(Item item) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.toCompatID(item); + } + + public static String toIdAsString(Item item) { + return toId(item).toString(); + } + + /** + * Check if the item exist. + * @param id CompatIdentifier of the item. + * @return If the item exist. + */ + public static boolean isExist(CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.isExist(id); + } + + public static boolean isExist(String id) { + return isExist(CompatIdentifier.of(id)); + } + + public static boolean isExist(String namespace, String path) { + return isExist(CompatIdentifier.of(namespace, path)); + } + + public static boolean isMinecraftItem(Item item) { + return CompatIdentifier.isMinecraftNamespace(toId(item)); + } + + /** + * Create a new BlockItem. + * @param block Block to create BlockItem. + * @param settings CompatItemSettings of the BlockItem. + * @return The new BlockItem. + */ + public static BlockItem create(Block block, CompatibleItemSettings settings) { + if (!settings.changedTranslationKey) + settings.useBlockPrefixedTranslationKey(); + + return net.pitan76.mcpitanlib.api.util.ItemUtil.ofBlock(block, settings); + } + + /** + * Create a new Item. + * @param settings CompatItemSettings of the Item. + * @return The new Item. + */ + public static Item create(CompatibleItemSettings settings) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.of(settings); + } + + /** + * Get all items. + * @return List of all items. + */ + public static List getItems() { + return net.pitan76.mcpitanlib.api.util.ItemUtil.getAllItems(); + } + + /** + * Get items in the tag. + * @param tagKey TagKey of the items. + * @return List of items in the tag. + */ + public static List getInTag(TagKey tagKey) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.getItems(tagKey); + } + + /** + * Get items in the tag. + * @param id CompatIdentifier of the tag. + * @return List of items in the tag. + */ + public static List getInTag(CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.getItems(id); + } + + public static List getInTag(String id) { + return getInTag(CompatIdentifier.of(id)); + } + + public static List getInTag(String namespace, String path) { + return getInTag(CompatIdentifier.of(namespace, path)); + } + + /** + * Check if the item is in the tag. + * @param item Item to check. + * @param tagKey TagKey of the tag. + * @return If the item is in the tag. + */ + public static boolean isInTag(Item item, TagKey tagKey) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.isIn(item, tagKey); + } + + /** + * Check if the item is in the tag. + * @param item Item to check. + * @param id CompatIdentifier of the tag. + * @return If the item is in the tag. + */ + public static boolean isInTag(Item item, CompatIdentifier id) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.isItemInTag(item, id); + } + + public static boolean isInTag(Item item, String id) { + return isInTag(item, CompatIdentifier.of(id)); + } + + public static boolean isInTag(Item item, String namespace, String path) { + return isInTag(item, CompatIdentifier.of(namespace, path)); + } + + /** + * Get raw id of the item. + * @param item Item to get raw id. + * @return Raw id of the item. + */ + public static int toRawId(Item item) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.getRawId(item); + } + + /** + * Get item from raw id. + * @param rawId Raw id of the item. + * @return Item from raw id. + */ + public static Item fromRawId(int rawId) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.fromIndex(rawId); + } + + /** + * Get items by namespace. + * @param namespace Namespace of the items. + * @return List of items by namespace. + */ + public static List getItemsByNamespace(String namespace) { + List items = new ArrayList<>(); + + for (Item item : getItems()) { + if (toId(item).getNamespace().equals(namespace)) + items.add(item); + } + + return items; + } + + /** + * Get number of all items. + * @return Number of all items. + */ + public static int getNumberOfItems() { + return getItems().size(); + } + + /** + * Get item from stack. + * @param stack ItemStack to get item. + * @return Item of the stack. + */ + public static Item of(ItemStack stack) { + return stack.getItem(); + } + + /** + * Check if the item is of the item. + * @param stack ItemStack to check. + * @param item Item to check. + * @return If the item is of the item. + */ + public static boolean isOf(ItemStack stack, Item item) { + return net.pitan76.mcpitanlib.api.util.ItemUtil.isOf(stack, item); + } + + /** + * Get name of the item. + * @param item Item + * @return Name of the item. + */ + public static String getNameAsString(Item item) { + return item.getName().getString(); + } + + /** + * Get name of the item. + * @param item Item + * @return Name of the item. + */ + public static TextComponent getName(Item item) { + return new TextComponent(item.getName()); + } + + /** + * Get translation key of the item. + * @param item Item + * @return Translation key of the item. + */ + public static String getTranslationKey(Item item) { + return item.getTranslationKey(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java index 7f403b183..55e1cffd3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/debug/DebugTool.java @@ -1,18 +1,17 @@ package net.pitan76.mcpitanlib.debug; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.v2.CompatItem; -import static net.pitan76.mcpitanlib.MCPitanLib.id; -import static net.pitan76.mcpitanlib.MCPitanLib.registry; +import static net.pitan76.mcpitanlib.MCPitanLib.*; /** * A tool for debugging. * Example of condition: item instance DebugTool */ -public class DebugTool extends ExtendItem { +public class DebugTool extends CompatItem { - public static CompatibleItemSettings defaultSettings = CompatibleItemSettings.of(); + public static CompatibleItemSettings defaultSettings = CompatibleItemSettings.of(compatId("debug_tool")); public DebugTool() { super(defaultSettings); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java new file mode 100644 index 000000000..790e527e1 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java @@ -0,0 +1,57 @@ +package net.pitan76.mcpitanlib.midohra.block; + +import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; +import net.pitan76.mcpitanlib.api.util.BlockStateUtil; + +public class BlockState { + private final net.minecraft.block.BlockState state; + + private BlockWrapper blockWrapper; + + protected BlockState(net.minecraft.block.BlockState state) { + this.state = state; + } + + public static BlockState of(net.minecraft.block.BlockState state) { + return new BlockState(state); + } + + public static BlockState of(net.minecraft.block.Block block) { + if (block == null) + return of((net.minecraft.block.BlockState) null); + + return of(BlockStateUtil.getDefaultState(block)); + } + + public boolean isExist() { + return !isEmpty(); + } + + public boolean isEmpty() { + return state == null; + } + + public boolean isAir() { + return isEmpty() || BlockStateUtil.isAir(state); + } + + public CompatBlockSoundGroup getSoundGroup() { + return BlockStateUtil.getCompatSoundGroup(state); + } + + public BlockWrapper getBlock() { + if (blockWrapper == null) + blockWrapper = BlockWrapper.of(BlockStateUtil.getBlock(state)); + + return blockWrapper; + } + + public String getName() { + return getBlock().getName(); + } + + @Deprecated + public net.minecraft.block.BlockState toMinecraft() { + return state; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java new file mode 100644 index 000000000..5a0a77fa3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java @@ -0,0 +1,87 @@ +package net.pitan76.mcpitanlib.midohra.block; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.block.BlockUtil; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; + +public class BlockWrapper { + private final net.minecraft.block.Block block; + + protected BlockWrapper() { + this.block = null; + } + + protected BlockWrapper(net.minecraft.block.Block block) { + this.block = block; + } + + public static BlockWrapper of(net.minecraft.block.Block block) { + return new BlockWrapper(block); + } + + public static BlockWrapper of() { + return new BlockWrapper(); + } + + public static BlockWrapper of(CompatIdentifier id) { + if (BlockUtil.isExist(id)) + return of(BlockUtil.fromId(id)); + + return of(); + } + + public static BlockWrapper of(CompatIdentifier id, CompatIdentifier... ids) { + if (of(id).isExist()) return of(id); + + for (CompatIdentifier id1 : ids) { + if (of(id1).isExist()) + return of(id1); + } + + return of(); + } + + public boolean isExist() { + return !isEmpty(); + } + + public boolean isEmpty() { + return block == null; + } + + public net.minecraft.block.Block get() { + return block; + } + + public net.minecraft.block.Block gerOrDefault(net.minecraft.block.Block defaultItem) { + return isEmpty() ? defaultItem : block; + } + + public CompatIdentifier getId() { + if (isEmpty()) + return CompatIdentifier.empty(); + + return BlockUtil.toId(block); + } + + public String getName() { + if (isEmpty()) return ""; + return BlockUtil.getNameAsString(block); + } + + public String getTranslationKey() { + if (isEmpty()) return ""; + return BlockUtil.getTranslationKey(block); + } + + public ItemWrapper asItem() { + if (isEmpty()) + return ItemWrapper.of(); + + return ItemWrapper.of(BlockUtil.toItem(block)); + } + + public BlockState getDefaultState() { + return BlockState.of(block); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java new file mode 100644 index 000000000..fe6a0f5b8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java @@ -0,0 +1,53 @@ +package net.pitan76.mcpitanlib.midohra.item; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.item.ItemGroupUtil; + +public class ItemGroupWrapper { + private final net.minecraft.item.ItemGroup itemGroup; + + protected ItemGroupWrapper() { + this.itemGroup = null; + } + + protected ItemGroupWrapper(net.minecraft.item.ItemGroup itemGroup) { + this.itemGroup = itemGroup; + } + + public static ItemGroupWrapper of(net.minecraft.item.ItemGroup itemGroup) { + return new ItemGroupWrapper(itemGroup); + } + + public static ItemGroupWrapper of(CompatIdentifier id) { + if (ItemGroupUtil.isExist(id)) + return of(ItemGroupUtil.fromId(id)); + + return of(); + } + + public static ItemGroupWrapper of() { + return new ItemGroupWrapper(); + } + + public boolean isExist() { + return !isEmpty(); + } + + public boolean isEmpty() { + return itemGroup == null; + } + + public net.minecraft.item.ItemGroup get() { + return itemGroup; + } + + public CompatIdentifier getId() { + if (isEmpty()) return CompatIdentifier.empty(); + return ItemGroupUtil.toCompatID(itemGroup); + } + + public ItemStack getIcon() { + if (isEmpty()) return ItemStack.EMPTY; + return ItemStack.of(itemGroup.getIcon()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroups.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroups.java new file mode 100644 index 000000000..7ceefce5a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroups.java @@ -0,0 +1,30 @@ +package net.pitan76.mcpitanlib.midohra.item; + +import net.pitan76.mcpitanlib.api.item.DefaultItemGroups; + +public class ItemGroups { + public static final ItemGroupWrapper BUILDING_BLOCKS = of(DefaultItemGroups.BUILDING_BLOCKS); + public static final ItemGroupWrapper COLORED_BLOCKS = of(DefaultItemGroups.COLORED_BLOCKS); + public static final ItemGroupWrapper NATURAL = of(DefaultItemGroups.NATURAL); + public static final ItemGroupWrapper FUNCTIONAL = of(DefaultItemGroups.FUNCTIONAL); + public static final ItemGroupWrapper REDSTONE = of(DefaultItemGroups.REDSTONE); + public static final ItemGroupWrapper HOTBAR = of(DefaultItemGroups.HOTBAR); + public static final ItemGroupWrapper SEARCH = of(DefaultItemGroups.SEARCH); + public static final ItemGroupWrapper TOOLS = of(DefaultItemGroups.TOOLS); + public static final ItemGroupWrapper COMBAT = of(DefaultItemGroups.COMBAT); + public static final ItemGroupWrapper FOOD_AND_DRINK = of(DefaultItemGroups.FOOD_AND_DRINK); + public static final ItemGroupWrapper INGREDIENTS = of(DefaultItemGroups.INGREDIENTS); + public static final ItemGroupWrapper SPAWN_EGGS = of(DefaultItemGroups.SPAWN_EGGS); + public static final ItemGroupWrapper OPERATOR = of(DefaultItemGroups.OPERATOR); + public static final ItemGroupWrapper INVENTORY = of(DefaultItemGroups.INVENTORY); + + // - 1.19.2 Item Group + public static final ItemGroupWrapper BREWING = FOOD_AND_DRINK; + public static final ItemGroupWrapper TRANSPORTATION = FUNCTIONAL; + public static final ItemGroupWrapper DECORATIONS = NATURAL; + public static final ItemGroupWrapper MISC = INGREDIENTS; + + private static ItemGroupWrapper of(net.minecraft.item.ItemGroup itemGroup) { + return ItemGroupWrapper.of(itemGroup); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java index 9990142e2..0fef58538 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java @@ -11,6 +11,7 @@ public class ItemStack { private final net.minecraft.item.ItemStack stack; + public static final ItemStack EMPTY = of(ItemStackUtil.empty()); protected ItemStack(net.minecraft.item.ItemStack stack) { this.stack = stack; @@ -18,7 +19,7 @@ protected ItemStack(net.minecraft.item.ItemStack stack) { public static ItemStack of(net.minecraft.item.ItemStack stack) { if (stack == null) - return new ItemStack(ItemStackUtil.empty()); + return EMPTY; return new ItemStack(stack); } @@ -31,6 +32,10 @@ public static ItemStack of(ItemConvertible item, int count) { return new Builder().item(item).count(count).build(); } + public static ItemStack empty() { + return EMPTY; + } + public int getCount() { return stack.getCount(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java new file mode 100644 index 000000000..be03f87d9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java @@ -0,0 +1,105 @@ +package net.pitan76.mcpitanlib.midohra.item; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.util.item.ItemUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; + +public class ItemWrapper { + private final net.minecraft.item.Item item; + + protected ItemWrapper() { + this.item = null; + } + + protected ItemWrapper(net.minecraft.item.Item item) { + this.item = item; + } + + public static ItemWrapper of(net.minecraft.item.Item item) { + return new ItemWrapper(item); + } + + public static ItemWrapper of() { + return new ItemWrapper(); + } + + public static ItemWrapper of(CompatIdentifier id) { + if (ItemUtil.isExist(id)) + return of(ItemUtil.fromId(id)); + + return of(); + } + + public static ItemWrapper of(CompatIdentifier id, CompatIdentifier... ids) { + if (of(id).isExist()) return of(id); + + for (CompatIdentifier id1 : ids) { + if (of(id1).isExist()) + return of(id1); + } + + return of(); + } + + public boolean isExist() { + return !isEmpty(); + } + + public boolean isEmpty() { + return item == null; + } + + public boolean isAir() { + return isEmpty() || item == net.minecraft.item.Items.AIR; + } + + public net.minecraft.item.Item get() { + return item; + } + + public net.minecraft.item.Item gerOrDefault(net.minecraft.item.Item defaultItem) { + return isEmpty() ? defaultItem : item; + } + + public CompatIdentifier getId() { + if (isEmpty()) + return CompatIdentifier.empty(); + + return ItemUtil.toId(item); + } + + public String getName() { + if (isEmpty()) return ""; + return ItemUtil.getNameAsString(item); + } + + public String getTranslationKey() { + if (isEmpty()) return ""; + return ItemUtil.getTranslationKey(item); + } + + public ItemStack createStack(int count) { + if (isEmpty()) return ItemStack.EMPTY; + return ItemStack.of(ItemStackUtil.create(item, count)); + } + + public ItemStack createStack() { + return createStack(1); + } + + public boolean isInTag(CompatIdentifier id) { + return ItemUtil.isInTag(item, id); + } + + public boolean isBlock() { + return !isEmpty() && item instanceof net.minecraft.item.BlockItem; + } + + public BlockWrapper asBlock() { + if (!isBlock()) + return BlockWrapper.of(); + + return BlockWrapper.of(((net.minecraft.item.BlockItem) item).getBlock()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/Items.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/Items.java new file mode 100644 index 000000000..07adf908a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/Items.java @@ -0,0 +1,20 @@ +package net.pitan76.mcpitanlib.midohra.item; + +public class Items { + + public static ItemWrapper AIR = of(net.minecraft.item.Items.AIR); + public static ItemWrapper DIRT = of(net.minecraft.item.Items.DIRT); + public static ItemWrapper GRASS_BLOCK = of(net.minecraft.item.Items.GRASS_BLOCK); + public static ItemWrapper STONE = of(net.minecraft.item.Items.STONE); + public static ItemWrapper SAND = of(net.minecraft.item.Items.SAND); + public static ItemWrapper COBBLESTONE = of(net.minecraft.item.Items.COBBLESTONE); + public static ItemWrapper OAK_LOG = of(net.minecraft.item.Items.OAK_LOG); + public static ItemWrapper OAK_PLANKS = of(net.minecraft.item.Items.OAK_PLANKS); + public static ItemWrapper OAK_LEAVES = of(net.minecraft.item.Items.OAK_LEAVES); + public static ItemWrapper WHITE_WOOL = of(net.minecraft.item.Items.WHITE_WOOL); + public static ItemWrapper GLASS = of(net.minecraft.item.Items.GLASS); + + public static ItemWrapper of(net.minecraft.item.Item item) { + return ItemWrapper.of(item); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java index 56420c784..4641409f8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java @@ -2,16 +2,17 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlock; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; import net.pitan76.mcpitanlib.api.util.CompatActionResult; -public class ExampleGuiBlock extends ExtendBlock implements SimpleScreenHandlerFactory { +public class ExampleGuiBlock extends CompatBlock implements SimpleScreenHandlerFactory { - public ExampleGuiBlock(Settings settings) { + public ExampleGuiBlock(CompatibleBlockSettings settings) { super(settings); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java index 759f4fa20..1dcb5b230 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java @@ -6,12 +6,12 @@ import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.v2.CompatItem; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.TextUtil; -public class ExampleGuiItem extends ExtendItem implements SimpleScreenHandlerFactory { +public class ExampleGuiItem extends CompatItem implements SimpleScreenHandlerFactory { public ExampleGuiItem(CompatibleItemSettings settings) { super(settings); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java index 92ff67617..0f33c0938 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java @@ -4,21 +4,21 @@ import net.minecraft.item.Item; import net.minecraft.screen.ScreenHandlerType; import net.pitan76.mcpitanlib.api.CommonModInitializer; -import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; -import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlock; import net.pitan76.mcpitanlib.api.command.CommandRegistry; import net.pitan76.mcpitanlib.api.gui.SimpleScreenHandlerTypeBuilder; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.DefaultItemGroups; -import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.item.v2.CompatItem; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.simple.item.SimpleGuiItem; import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import net.pitan76.mcpitanlib.api.registry.result.SupplierResult; import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; -import net.pitan76.mcpitanlib.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.item.ItemUtil; import net.pitan76.mcpitanlib.guilib.GuiRegistry; +import net.pitan76.mcpitanlib.midohra.item.ItemGroups; public class ExampleMod extends CommonModInitializer { public static final String MOD_ID = "examplemod"; @@ -38,6 +38,13 @@ public class ExampleMod extends CommonModInitializer { public static RegistryResult EXAMPLE_GUI_BLOCK; public static RegistryResult EXAMPLE_GUI_BLOCK_ITEM; + public static CompatIdentifier EXAMPLE_ITEM_ID = _id("example_item"); + public static CompatIdentifier EXAMPLE_BLOCK_ID = _id("example_block"); + public static CompatIdentifier EXAMPLE_GUI_ITEM_ID = _id("example_gui_item"); + public static CompatIdentifier EXAMPLE_GUI_BLOCK_ID = _id("example_gui_block"); + public static CompatIdentifier EXAMPLE_CONTAINER_GUI_ITEM_ID = _id("example_container_gui_item"); + + public void init() { INSTANCE = this; registry = super.registry; @@ -46,18 +53,18 @@ public void init() { EXAMPLE_SCREENHANDLER = registry.registerScreenHandlerType(compatId("example_gui"), new SimpleScreenHandlerTypeBuilder<>(ExampleScreenHandler::new)); EXAMPLE_CONTAINER_GUI = GuiRegistry.register(registry, compatId("example_container_gui"), new SimpleScreenHandlerTypeBuilder<>(ExampleContainerGui::new)); - EXAMPLE_ITEM = registry.registerItem(compatId("example_item"), () -> new ExtendItem(new CompatibleItemSettings().addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_item")))); - EXAMPLE_BLOCK = registry.registerBlock(compatId("example_block"), () -> new ExtendBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE))); - EXAMPLE_BLOCK_ITEM = registry.registerItem(compatId("example_block"), () -> ItemUtil.ofBlock(EXAMPLE_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_block")))); + EXAMPLE_ITEM = registry.registerItem(EXAMPLE_ITEM_ID, () -> new CompatItem(CompatibleItemSettings.of(EXAMPLE_ITEM_ID).addGroup(ItemGroups.INGREDIENTS))); + EXAMPLE_BLOCK = registry.registerBlock(EXAMPLE_BLOCK_ID, () -> new CompatBlock(CompatibleBlockSettings.of(EXAMPLE_BLOCK_ID, CompatibleMaterial.STONE))); + EXAMPLE_BLOCK_ITEM = registry.registerItem(EXAMPLE_BLOCK_ID, () -> ItemUtil.create(EXAMPLE_BLOCK.supplier.get(), CompatibleItemSettings.of(EXAMPLE_BLOCK_ID).addGroup(ItemGroups.INGREDIENTS))); - EXAMPLE_GUI_ITEM = registry.registerItem(compatId("example_gui_item"), () -> new ExampleGuiItem(new CompatibleItemSettings().addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_gui_item")))); + EXAMPLE_GUI_ITEM = registry.registerItem(EXAMPLE_GUI_ITEM_ID, () -> new ExampleGuiItem(CompatibleItemSettings.of(EXAMPLE_GUI_ITEM_ID).addGroup(ItemGroups.INGREDIENTS))); - EXAMPLE_GUI_BLOCK = registry.registerBlock(compatId("example_gui_block"), () -> new ExampleGuiBlock(CompatibleBlockSettings.of(CompatibleMaterial.STONE).build())); - EXAMPLE_GUI_BLOCK_ITEM = registry.registerItem(compatId("example_gui_block"), () -> ItemUtil.ofBlock(EXAMPLE_GUI_BLOCK.supplier.get(), new CompatibleItemSettings().addGroup(() -> DefaultItemGroups.INGREDIENTS, compatId("example_gui_block")))); + EXAMPLE_GUI_BLOCK = registry.registerBlock(EXAMPLE_GUI_BLOCK_ID, () -> new ExampleGuiBlock(CompatibleBlockSettings.of(EXAMPLE_GUI_BLOCK_ID, CompatibleMaterial.STONE))); + EXAMPLE_GUI_BLOCK_ITEM = registry.registerItem(EXAMPLE_GUI_BLOCK_ID, () -> ItemUtil.create(EXAMPLE_GUI_BLOCK.supplier.get(), CompatibleItemSettings.of(EXAMPLE_GUI_BLOCK_ID).addGroup(ItemGroups.INGREDIENTS))); - EXAMPLE_CONTAINER_GUI_ITEM = registry.registerItem(compatId("example_container_gui_item"), - () -> new SimpleGuiItem(CompatibleItemSettings.of() - .addGroup(DefaultItemGroups.INGREDIENTS, compatId("example_container_gui_item")), + EXAMPLE_CONTAINER_GUI_ITEM = registry.registerItem(EXAMPLE_CONTAINER_GUI_ITEM_ID, + () -> new SimpleGuiItem(CompatibleItemSettings.of(EXAMPLE_CONTAINER_GUI_ITEM_ID) + .addGroup(ItemGroups.INGREDIENTS), ExampleContainerGui::new) ); diff --git a/info.properties b/info.properties index 798f3f3ca..d37f9da8b 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=2.5.3 +mod_version=3.0.0 maven_group=net.pitan76 -changelog= \ No newline at end of file +changelog=Support for 1.21.2 \ No newline at end of file From 69e3b5864e4734307ea190be3209ce918d65de8f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:42:40 +0900 Subject: [PATCH 407/622] add new CompatAPIs --- .../api/block/v2/BlockSettingsBuilder.java | 97 +++++++++++++++++++ .../mcpitanlib/api/item/ExtendItem.java | 6 ++ .../mcpitanlib/api/item/args/RarityArgs.java | 19 ++++ .../api/item/args/UseActionArgs.java | 27 ++++++ .../api/item/consume/CompatUseAction.java | 45 +++++++++ .../mcpitanlib/api/item/v2/CompatItem.java | 47 +++++++++ .../api/item/v2/CompatibleItemSettings.java | 14 +++ .../api/tag/item/RepairIngredientTag.java | 16 +++ .../api/util/CompatActionResult.java | 15 +++ .../mcpitanlib/api/util/CompatRarity.java | 54 +++++++++++ .../api/util/CompatStringIdentifiable.java | 17 ++++ .../mcpitanlib/api/util/InteractUtil.java | 11 +++ .../api/util/color/CompatBrightness.java | 40 ++++++++ .../api/util/color/CompatDyeColor.java | 46 +++++++++ .../api/util/color/CompatMapColor.java | 94 ++++++++++++++++++ 15 files changed, 548 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/args/RarityArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/args/UseActionArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatRarity.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatStringIdentifiable.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatBrightness.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java new file mode 100644 index 000000000..653f9b079 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java @@ -0,0 +1,97 @@ +package net.pitan76.mcpitanlib.api.block.v2; + +import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; +import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.color.CompatDyeColor; +import net.pitan76.mcpitanlib.api.util.color.CompatMapColor; +import net.pitan76.mcpitanlib.midohra.block.BlockState; + +import java.util.function.ToIntFunction; + +public class BlockSettingsBuilder { + + public CompatIdentifier id; + public float hardness; + public float resistance; + public CompatBlockSoundGroup blockSoundGroup; + public CompatibleMaterial material; + public CompatMapColor mapColor; + public CompatDyeColor dyeColor; + public boolean requiresTool; + public boolean dropsNothing; + public ToIntFunction luminance; + + public BlockSettingsBuilder(CompatIdentifier id) { + + } + + public BlockSettingsBuilder hardness(float hardness) { + this.hardness = hardness; + return this; + } + + public BlockSettingsBuilder resistance(float resistance) { + this.resistance = resistance; + return this; + } + + public BlockSettingsBuilder strength(float hardness, float resistance) { + this.hardness = hardness; + this.resistance = resistance; + return this; + } + + public BlockSettingsBuilder sounds(CompatBlockSoundGroup blockSoundGroup) { + this.blockSoundGroup = blockSoundGroup; + return this; + } + + public BlockSettingsBuilder material(CompatibleMaterial material) { + this.material = material; + return this; + } + + public BlockSettingsBuilder mapColor(CompatMapColor mapColor) { + this.mapColor = mapColor; + return this; + } + + public BlockSettingsBuilder dyeColor(CompatDyeColor dyeColor) { + this.dyeColor = dyeColor; + return this; + } + + public BlockSettingsBuilder requiresTool() { + this.requiresTool = true; + return this; + } + + public BlockSettingsBuilder dropsNothing() { + this.dropsNothing = true; + return this; + } + + public BlockSettingsBuilder luminance(ToIntFunction luminance) { + this.luminance = luminance; + return this; + } + + public CompatibleBlockSettings build() { + CompatibleBlockSettings settings = CompatibleBlockSettings.of(id); + if (material != null) + settings = CompatibleBlockSettings.of(id, material); + + if (mapColor != null) { + settings = settings.mapColor(mapColor.get()); + } else if (dyeColor != null) { + settings = settings.mapColor(dyeColor.get().getMapColor()); + } + + if (requiresTool) settings.requiresTool(); + if (dropsNothing) settings.dropsNothing(); + if (luminance != null) settings.luminance((state) -> luminance.applyAsInt(BlockState.of(state))); + + return settings.strength(hardness, resistance).sounds(blockSoundGroup); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index feac42a4a..3d8145095 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -3,6 +3,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.item.consume.UseAction; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -57,6 +58,11 @@ public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)).toActionResult(); } + @Override + public UseAction getUseAction(ItemStack stack) { + return super.getUseAction(stack); + } + @Deprecated //@Override public boolean hasRecipeRemainder() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/RarityArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/RarityArgs.java new file mode 100644 index 000000000..6db9d79f4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/RarityArgs.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.item.args; + +import net.minecraft.item.ItemStack; + +public class RarityArgs { + public ItemStack stack; + + public RarityArgs(ItemStack stack) { + this.stack = stack; + } + + public ItemStack getStack() { + return stack; + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/UseActionArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/UseActionArgs.java new file mode 100644 index 000000000..acdbd404d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/UseActionArgs.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.item.args; + +import net.minecraft.item.ItemStack; + +public class UseActionArgs { + public ItemStack stack; + + public UseActionArgs(ItemStack stack) { + this.stack = stack; + } + + public static UseActionArgs of(ItemStack stack) { + return new UseActionArgs(stack); + } + + public static UseActionArgs of(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return of(stack.toMinecraft()); + } + + public ItemStack getStack() { + return stack; + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java new file mode 100644 index 000000000..e3350697c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java @@ -0,0 +1,45 @@ +package net.pitan76.mcpitanlib.api.item.consume; + +import net.minecraft.item.consume.UseAction; +import net.pitan76.mcpitanlib.api.util.CompatStringIdentifiable; + +public class CompatUseAction implements CompatStringIdentifiable { + private final UseAction useAction; + + public static final CompatUseAction NONE = of(UseAction.NONE); + public static final CompatUseAction EAT = of(UseAction.EAT); + public static final CompatUseAction DRINK = of(UseAction.DRINK); + public static final CompatUseAction BLOCK = of(UseAction.BLOCK); + public static final CompatUseAction BOW = of(UseAction.BOW); + public static final CompatUseAction SPEAR = of(UseAction.SPEAR); + public static final CompatUseAction CROSSBOW = of(UseAction.CROSSBOW); + public static final CompatUseAction SPYGLASS = of(UseAction.SPYGLASS); + public static final CompatUseAction TOOT_HORN = of(UseAction.TOOT_HORN); + public static final CompatUseAction BRUSH = of(UseAction.BRUSH); + + public CompatUseAction(UseAction useAction) { + this.useAction = useAction; + } + + public static CompatUseAction of(UseAction useAction) { + return new CompatUseAction(useAction); + } + + @Deprecated + public UseAction get() { + return useAction; + } + + public int getId() { + return useAction.getId(); + } + + public String getName() { + return useAction.asString(); + } + + @Override + public String asString_compat() { + return getName(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java index 3245c52a8..5bde8f6ea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java @@ -1,6 +1,17 @@ package net.pitan76.mcpitanlib.api.item.v2; +import net.minecraft.item.ItemStack; +import net.minecraft.item.consume.UseAction; +import net.minecraft.util.Rarity; +import net.pitan76.mcpitanlib.api.event.item.CanRepairArgs; +import net.pitan76.mcpitanlib.api.event.item.EnchantabilityArgs; +import net.pitan76.mcpitanlib.api.event.item.EnchantableArgs; import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.item.args.RarityArgs; +import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; +import net.pitan76.mcpitanlib.api.item.consume.CompatUseAction; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; +import net.pitan76.mcpitanlib.api.util.CompatRarity; import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; public class CompatItem extends ExtendItem { @@ -19,4 +30,40 @@ public CompatibleItemSettings getCompatSettings() { public ItemWrapper getWrapper() { return ItemWrapper.of(this); } + + @Deprecated + @Override + public UseAction getUseAction(ItemStack stack) { + return getUseAction(new UseActionArgs(stack)).get(); + } + + public CompatUseAction getUseAction(UseActionArgs args) { + return CompatUseAction.of(super.getUseAction(args.stack)); + } + + @Deprecated + @Override + public Rarity getRarity(ItemStack stack) { + return getRarity(new RarityArgs(stack)).get(); + } + + public CompatRarity getRarity(RarityArgs args) { + return settings.rarity; + } + + @Override + public boolean isEnchantable(EnchantableArgs args) { + return settings.enchantability != -1; + } + + @Override + public int getEnchantability(EnchantabilityArgs args) { + return settings.enchantability; + } + + @Override + public boolean canRepair(CanRepairArgs args) { + RepairIngredientTag tag = settings.repairIngredientTag; + return tag != null && tag.contains(args.stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java index aa4dd42f1..31edd9e6a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java @@ -11,6 +11,7 @@ import net.pitan76.mcpitanlib.api.item.ExtendSettings; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.CompatRarity; import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; @@ -20,6 +21,9 @@ public class CompatibleItemSettings extends net.pitan76.mcpitanlib.api.item.CompatibleItemSettings { protected CompatIdentifier identifier = null; public boolean changedTranslationKey = false; + public CompatRarity rarity = CompatRarity.COMMON; + public int enchantability = -1; + public RepairIngredientTag repairIngredientTag = null; public CompatibleItemSettings(CompatIdentifier identifier) { super(); @@ -84,9 +88,17 @@ public CompatibleItemSettings recipeRemainder(ItemWrapper recipeRemainder) { return recipeRemainder(recipeRemainder.get()); } + @Deprecated @Override public CompatibleItemSettings rarity(Rarity rarity) { super.rarity(rarity); + this.rarity = CompatRarity.of(rarity); + return this; + } + + public CompatibleItemSettings rarity(CompatRarity rarity) { + super.rarity(rarity.get()); + this.rarity = rarity; return this; } @@ -116,11 +128,13 @@ public CompatibleItemSettings translationKey(String translationKey) { public CompatibleItemSettings enchantable(int enchantability) { settings.enchantable(enchantability); + this.enchantability = enchantability; return this; } public CompatibleItemSettings repairable(RepairIngredientTag tag) { settings.repairable(tag.getTag()); + this.repairIngredientTag = tag; return this; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java index b39a82dfe..ed91ce35e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java @@ -1,12 +1,14 @@ package net.pitan76.mcpitanlib.api.tag.item; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.IngredientUtil; +import net.pitan76.mcpitanlib.api.util.item.ItemUtil; public class RepairIngredientTag { @@ -45,4 +47,18 @@ public TagKey getTag() { public Ingredient getIngredient() { return IngredientUtil.fromTagByIdentifier(tag.id()); } + + public boolean contains(Item item) { + if (item == null || tag == null) + return false; + + return ItemUtil.isInTag(item, CompatIdentifier.fromMinecraft(tag.id())); + } + + public boolean contains(ItemStack stack) { + if (stack.isEmpty() || tag == null) + return false; + + return getIngredient().test(stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java index bf382e3ef..710d658ee 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java @@ -2,7 +2,11 @@ import net.minecraft.util.ActionResult; import net.pitan76.mcpitanlib.api.event.result.EventResult; +import net.pitan76.mcpitanlib.midohra.item.ItemStack; +import java.util.Optional; + +// TODO: CompatActionResultを継承してItemStackを持つverも作成する public class CompatActionResult { public static final CompatActionResult SUCCESS = new CompatActionResult(ActionResult.SUCCESS, EventResult.success()); public static final CompatActionResult PASS = new CompatActionResult(ActionResult.PASS, EventResult.pass()); @@ -28,6 +32,17 @@ public EventResult toEventResult() { return eventResult; } + public Optional getNewMidohraHandStack() { + return getNewHandStack().map(ItemStack::of); + } + + public Optional getNewHandStack() { + if (!(actionResult instanceof ActionResult.Success)) return Optional.empty(); + + ActionResult.Success success = (ActionResult.Success) actionResult; + return Optional.ofNullable(success.getNewHandStack()); + } + public static CompatActionResult of(ActionResult result) { if (result == ActionResult.SUCCESS) return SUCCESS; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatRarity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatRarity.java new file mode 100644 index 000000000..e11866da2 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatRarity.java @@ -0,0 +1,54 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.util.Formatting; +import net.minecraft.util.Rarity; + +public class CompatRarity implements CompatStringIdentifiable { + private final Rarity rarity; + + public static final CompatRarity NONE = of(Rarity.COMMON); + public static final CompatRarity COMMON = of(Rarity.COMMON); + public static final CompatRarity UNCOMMON = of(Rarity.UNCOMMON); + public static final CompatRarity RARE = of(Rarity.RARE); + public static final CompatRarity EPIC = of(Rarity.EPIC); + + public CompatRarity(Rarity rarity) { + this.rarity = rarity; + } + + public static CompatRarity of(Rarity rarity) { + return new CompatRarity(rarity); + } + + public Rarity get() { + return rarity; + } + + public Formatting getFormatting() { + return rarity.getFormatting(); + } + + public String getName() { + return rarity.name(); + } + + @Override + public String asString_compat() { + return getName(); + } + + public static CompatRarity fromString(String name) { + switch (name) { + case "common": + return COMMON; + case "uncommon": + return UNCOMMON; + case "rare": + return RARE; + case "epic": + return EPIC; + default: + return NONE; + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatStringIdentifiable.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatStringIdentifiable.java new file mode 100644 index 000000000..2fb01f76e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatStringIdentifiable.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.util.StringIdentifiable; + +public interface CompatStringIdentifiable extends StringIdentifiable { + @Deprecated + @Override + default String asString() { + return asString_compat(); + } + + String asString_compat(); + + default StringIdentifiable get() { + return this; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java index d031f33fe..1ec72c96b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java @@ -2,6 +2,7 @@ import net.minecraft.block.BlockState; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -11,6 +12,8 @@ import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; import net.pitan76.mcpitanlib.api.event.item.ItemUseOnEntityEvent; +import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; +import net.pitan76.mcpitanlib.api.item.consume.CompatUseAction; public class InteractUtil { @@ -30,6 +33,14 @@ public static CompatActionResult useItemOnEntity(Item item, ItemUseOnEntityEvent return CompatActionResult.create(item.useOnEntity(event.getStack(), event.getUser().getEntity(), event.getEntity(), event.getHand())); } + public static CompatUseAction getUseAction(Item item, UseActionArgs args) { + return CompatUseAction.of(item.getUseAction(args.stack)); + } + + public static CompatUseAction getUseAction(Item item, ItemStack stack) { + return CompatUseAction.of(item.getUseAction(stack)); + } + public static CompatActionResult useBlock(BlockState state, World world, Player player, BlockHitResult hitResult) { return BlockStateUtil.onUse(state, world, player, hitResult); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatBrightness.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatBrightness.java new file mode 100644 index 000000000..bb113ce46 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatBrightness.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.api.util.color; + +import net.minecraft.block.MapColor; + +public class CompatBrightness { + private final MapColor.Brightness brightness; + + public static final CompatBrightness LOW = of(MapColor.Brightness.LOW); + public static final CompatBrightness NORMAL = of(MapColor.Brightness.NORMAL); + public static final CompatBrightness HIGH = of(MapColor.Brightness.HIGH); + public static final CompatBrightness LOWEST = of(MapColor.Brightness.LOWEST); + + public CompatBrightness(MapColor.Brightness brightness) { + this.brightness = brightness; + } + + public static CompatBrightness of(MapColor.Brightness brightness) { + return new CompatBrightness(brightness); + } + + public MapColor.Brightness get() { + return brightness; + } + + public String getName() { + return get().name(); + } + + public int getId() { + return get().id; + } + + public int getBrightness() { + return get().brightness; + } + + + + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java new file mode 100644 index 000000000..b2ca1532d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java @@ -0,0 +1,46 @@ +package net.pitan76.mcpitanlib.api.util.color; + +import net.minecraft.util.DyeColor; +import net.pitan76.mcpitanlib.api.util.CompatStringIdentifiable; + +public class CompatDyeColor implements CompatStringIdentifiable { + private final DyeColor color; + + public static final CompatDyeColor WHITE = of(DyeColor.WHITE); + public static final CompatDyeColor ORANGE = of(DyeColor.ORANGE); + public static final CompatDyeColor MAGENTA = of(DyeColor.MAGENTA); + public static final CompatDyeColor LIGHT_BLUE = of(DyeColor.LIGHT_BLUE); + public static final CompatDyeColor YELLOW = of(DyeColor.YELLOW); + public static final CompatDyeColor LIME = of(DyeColor.LIME); + public static final CompatDyeColor PINK = of(DyeColor.PINK); + public static final CompatDyeColor GRAY = of(DyeColor.GRAY); + public static final CompatDyeColor LIGHT_GRAY = of(DyeColor.LIGHT_GRAY); + public static final CompatDyeColor CYAN = of(DyeColor.CYAN); + public static final CompatDyeColor PURPLE = of(DyeColor.PURPLE); + public static final CompatDyeColor BLUE = of(DyeColor.BLUE); + public static final CompatDyeColor BROWN = of(DyeColor.BROWN); + public static final CompatDyeColor GREEN = of(DyeColor.GREEN); + public static final CompatDyeColor RED = of(DyeColor.RED); + public static final CompatDyeColor BLACK = of(DyeColor.BLACK); + + public CompatDyeColor(DyeColor color) { + this.color = color; + } + + public static CompatDyeColor of(DyeColor color) { + return new CompatDyeColor(color); + } + + public DyeColor get() { + return color; + } + + public String getName() { + return color.getName(); + } + + @Override + public String asString_compat() { + return getName(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java new file mode 100644 index 000000000..1440230a5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java @@ -0,0 +1,94 @@ +package net.pitan76.mcpitanlib.api.util.color; + +import net.minecraft.block.MapColor; + +public class CompatMapColor { + private final MapColor color; + + public static final CompatMapColor CLEAR = of(MapColor.CLEAR); + public static final CompatMapColor PALE_GREEN = of(MapColor.PALE_GREEN); + public static final CompatMapColor PALE_YELLOW = of(MapColor.PALE_YELLOW); + public static final CompatMapColor WHITE_GRAY = of(MapColor.WHITE_GRAY); + public static final CompatMapColor BRIGHT_RED = of(MapColor.BRIGHT_RED); + public static final CompatMapColor PALE_PURPLE = of(MapColor.PALE_PURPLE); + public static final CompatMapColor IRON_GRAY = of(MapColor.IRON_GRAY); + public static final CompatMapColor DARK_GREEN = of(MapColor.DARK_GREEN); + public static final CompatMapColor WHITE = of(MapColor.WHITE); + public static final CompatMapColor LIGHT_BLUE_GRAY = of(MapColor.LIGHT_BLUE_GRAY); + public static final CompatMapColor DIRT_BROWN = of(MapColor.DIRT_BROWN); + public static final CompatMapColor STONE_GRAY = of(MapColor.STONE_GRAY); + public static final CompatMapColor WATER_BLUE = of(MapColor.WATER_BLUE); + public static final CompatMapColor OAK_TAN = of(MapColor.OAK_TAN); + public static final CompatMapColor OFF_WHITE = of(MapColor.OFF_WHITE); + public static final CompatMapColor ORANGE = of(MapColor.ORANGE); + public static final CompatMapColor MAGENTA = of(MapColor.MAGENTA); + public static final CompatMapColor LIGHT_BLUE = of(MapColor.LIGHT_BLUE); + public static final CompatMapColor YELLOW = of(MapColor.YELLOW); + public static final CompatMapColor LIME = of(MapColor.LIME); + public static final CompatMapColor PINK = of(MapColor.PINK); + public static final CompatMapColor GRAY = of(MapColor.GRAY); + public static final CompatMapColor LIGHT_GRAY = of(MapColor.LIGHT_GRAY); + public static final CompatMapColor CYAN = of(MapColor.CYAN); + public static final CompatMapColor PURPLE = of(MapColor.PURPLE); + public static final CompatMapColor BLUE = of(MapColor.BLUE); + public static final CompatMapColor BROWN = of(MapColor.BROWN); + public static final CompatMapColor GREEN = of(MapColor.GREEN); + public static final CompatMapColor RED = of(MapColor.RED); + public static final CompatMapColor BLACK = of(MapColor.BLACK); + public static final CompatMapColor GOLD = of(MapColor.GOLD); + public static final CompatMapColor DIAMOND_BLUE = of(MapColor.DIAMOND_BLUE); + public static final CompatMapColor LAPIS_BLUE = of(MapColor.LAPIS_BLUE); + public static final CompatMapColor EMERALD_GREEN = of(MapColor.EMERALD_GREEN); + public static final CompatMapColor SPRUCE_BROWN = of(MapColor.SPRUCE_BROWN); + public static final CompatMapColor DARK_RED = of(MapColor.DARK_RED); + public static final CompatMapColor TERRACOTTA_WHITE = of(MapColor.TERRACOTTA_WHITE); + public static final CompatMapColor TERRACOTTA_ORANGE = of(MapColor.TERRACOTTA_ORANGE); + public static final CompatMapColor TERRACOTTA_MAGENTA = of(MapColor.TERRACOTTA_MAGENTA); + public static final CompatMapColor TERRACOTTA_LIGHT_BLUE = of(MapColor.TERRACOTTA_LIGHT_BLUE); + public static final CompatMapColor TERRACOTTA_YELLOW = of(MapColor.TERRACOTTA_YELLOW); + public static final CompatMapColor TERRACOTTA_LIME = of(MapColor.TERRACOTTA_LIME); + public static final CompatMapColor TERRACOTTA_PINK = of(MapColor.TERRACOTTA_PINK); + public static final CompatMapColor TERRACOTTA_GRAY = of(MapColor.TERRACOTTA_GRAY); + public static final CompatMapColor TERRACOTTA_LIGHT_GRAY = of(MapColor.TERRACOTTA_LIGHT_GRAY); + public static final CompatMapColor TERRACOTTA_CYAN = of(MapColor.TERRACOTTA_CYAN); + public static final CompatMapColor TERRACOTTA_PURPLE = of(MapColor.TERRACOTTA_PURPLE); + public static final CompatMapColor TERRACOTTA_BLUE = of(MapColor.TERRACOTTA_BLUE); + public static final CompatMapColor TERRACOTTA_BROWN = of(MapColor.TERRACOTTA_BROWN); + public static final CompatMapColor TERRACOTTA_GREEN = of(MapColor.TERRACOTTA_GREEN); + public static final CompatMapColor TERRACOTTA_RED = of(MapColor.TERRACOTTA_RED); + public static final CompatMapColor TERRACOTTA_BLACK = of(MapColor.TERRACOTTA_BLACK); + public static final CompatMapColor DULL_RED = of(MapColor.DULL_RED); + public static final CompatMapColor DULL_PINK = of(MapColor.DULL_PINK); + public static final CompatMapColor DARK_CRIMSON = of(MapColor.DARK_CRIMSON); + public static final CompatMapColor TEAL = of(MapColor.TEAL); + public static final CompatMapColor DARK_AQUA = of(MapColor.DARK_AQUA); + public static final CompatMapColor DARK_DULL_PINK = of(MapColor.DARK_DULL_PINK); + public static final CompatMapColor BRIGHT_TEAL = of(MapColor.BRIGHT_TEAL); + public static final CompatMapColor DEEPSLATE_GRAY = of(MapColor.DEEPSLATE_GRAY); + public static final CompatMapColor RAW_IRON_PINK = of(MapColor.RAW_IRON_PINK); + public static final CompatMapColor LICHEN_GREEN = of(MapColor.LICHEN_GREEN); + + public CompatMapColor(MapColor color) { + this.color = color; + } + + public static CompatMapColor of(MapColor color) { + return new CompatMapColor(color); + } + + public MapColor get() { + return color; + } + + public int getId() { + return color.id; + } + + public int getRgb() { + return color.color; + } + + public int getRenderColor(CompatBrightness brightness) { + return color.getRenderColor(brightness.get()); + } +} From 1b66096ac5f1c1c80654d2459d75411339544deb Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 30 Oct 2024 12:07:10 +0900 Subject: [PATCH 408/622] fix MPLGuiLib --- .../java/net/pitan76/mcpitanlib/MCPitanLib.java | 2 +- .../net/pitan76/mcpitanlib/guilib/MPLGuiLib.java | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index c45645b66..7f23dd682 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -44,7 +44,7 @@ public class MCPitanLib { */ public static void init() { configInit(); - new MPLGuiLib().init(); + MPLGuiLib.init(); if (PlatformUtil.isDevelopmentEnvironment() || (config.has("debugMode") && config.getBoolean("debugMode"))) { System.out.println("MCPitanLib: Debug Mode"); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java index e18206e27..f3122c706 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/guilib/MPLGuiLib.java @@ -1,22 +1,13 @@ package net.pitan76.mcpitanlib.guilib; -import net.pitan76.mcpitanlib.api.CommonModInitializer; -import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.PlatformUtil; -public class MPLGuiLib extends CommonModInitializer { +public class MPLGuiLib { public static final String MOD_ID = "mplguilib"; public static final String MOD_NAME = "MPL GuiLib"; - public static MPLGuiLib INSTANCE; - public static CompatRegistryV2 registry; - - @Override - public void init() { - INSTANCE = this; - registry = super.registry; - + public static void init() { if (PlatformUtil.isClient()) MGLClientNetworks.init(); } @@ -30,12 +21,10 @@ public static CompatIdentifier _id(String path) { return CompatIdentifier.of(MOD_ID, path); } - @Override public String getId() { return MOD_ID; } - @Override public String getName() { return MOD_NAME; } From eb1f20f1f9a657a88b402b17c2f6ae8322b99cc4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 30 Oct 2024 15:42:55 +0900 Subject: [PATCH 409/622] fix MCPItanlib3 --- .../api/event/item/ItemUseEvent.java | 26 +++--- .../mcpitanlib/api/item/ExtendItem.java | 5 +- .../api/simple/item/SimpleGuiItem.java | 4 +- .../mcpitanlib/api/util/InteractUtil.java | 9 +- .../api/util/StackActionResult.java | 91 +++++++++++++++++++ .../mcpitanlib/test/ExampleGuiItem.java | 4 +- 6 files changed, 117 insertions(+), 22 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index 5805cccb4..e68921d9b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -2,12 +2,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; public class ItemUseEvent extends BaseEvent { @@ -47,20 +47,19 @@ public boolean isClient() { return world.isClient(); } - public CompatActionResult success(ItemStack stack) { - if (getStack() != stack) { - CompatActionResult.create(ActionResult.SUCCESS.withNewHandStack(stack)); - } + public StackActionResult success(ItemStack stack) { + if (getStack() != stack) + StackActionResult.success(stack); return success(); } - public CompatActionResult success(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + public StackActionResult success(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { return success(stack.toMinecraft()); } - public CompatActionResult success() { - return CompatActionResult.SUCCESS; + public StackActionResult success() { + return StackActionResult.create(CompatActionResult.SUCCESS); } public CompatActionResult fail() { @@ -71,10 +70,9 @@ public CompatActionResult pass() { return CompatActionResult.PASS; } - public CompatActionResult consume(ItemStack stack) { - if (getStack() != stack) { - CompatActionResult.create(ActionResult.CONSUME.withNewHandStack(stack)); - } + public StackActionResult consume(ItemStack stack) { + if (getStack() != stack) + StackActionResult.consume(stack); return consume(); } @@ -83,8 +81,8 @@ public CompatActionResult consume(net.pitan76.mcpitanlib.midohra.item.ItemStack return consume(stack.toMinecraft()); } - public CompatActionResult consume() { - return CompatActionResult.CONSUME; + public StackActionResult consume() { + return StackActionResult.create(CompatActionResult.CONSUME); } public boolean isSneaking() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 3d8145095..05f38f5bd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -18,6 +18,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; import net.pitan76.mcpitanlib.core.Dummy; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; @@ -99,8 +100,8 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos * @param event ItemUseEvent * @return ActionResultType */ - public CompatActionResult onRightClick(ItemUseEvent event) { - return CompatActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand)); + public StackActionResult onRightClick(ItemUseEvent event) { + return StackActionResult.create(CompatActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand)), event.stack); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java index 2992ecc0f..570410379 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/simple/item/SimpleGuiItem.java @@ -8,7 +8,7 @@ import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.v2.CompatItem; -import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; public class SimpleGuiItem extends CompatItem implements SimpleScreenHandlerFactory { @@ -31,7 +31,7 @@ public SimpleGuiItem(CompatibleItemSettings settings) { } @Override - public CompatActionResult onRightClick(ItemUseEvent e) { + public StackActionResult onRightClick(ItemUseEvent e) { if (!e.isClient()) e.user.openGuiScreen(this); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java index 1ec72c96b..ec99294b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java @@ -17,8 +17,9 @@ public class InteractUtil { - public static CompatActionResult useItem(Item item, ItemUseEvent event) { - return CompatActionResult.create(item.use(event.getWorld(), event.user.getEntity(), event.getHand())); + public static StackActionResult useItem(Item item, ItemUseEvent event) { + CompatActionResult result = CompatActionResult.create(item.use(event.getWorld(), event.user.getEntity(), event.getHand())); + return StackActionResult.create(result, event.getStack()); } public static CompatActionResult useItemOnBlock(Item item, ItemUsageContext context) { @@ -48,4 +49,8 @@ public static CompatActionResult useBlock(BlockState state, World world, Player public static CompatActionResult useBlock(BlockState state, World world, Player player, Direction dir, BlockPos blockPos) { return BlockStateUtil.onUse(state, world, player, dir, blockPos); } + + public static boolean onStoppingUsing(Item item, ItemStack stack, World world, Player player, int remainingUseTicks) { + return item.onStoppedUsing(stack, world, player.getEntity(), remainingUseTicks); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java new file mode 100644 index 000000000..c62d07b7e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java @@ -0,0 +1,91 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResult; +import net.pitan76.mcpitanlib.api.event.result.EventResult; + +import java.util.Optional; + +public class StackActionResult extends CompatActionResult { + private final ItemStack stack; + private final CompatActionResult compatActionResult; + + public StackActionResult(ActionResult actionResult, EventResult eventResult, ItemStack stack) { + this(new CompatActionResult(actionResult, eventResult), stack); + } + + public StackActionResult(CompatActionResult actionResult, ItemStack stack) { + super(null, null); + compatActionResult = actionResult; + this.stack = stack; + } + + @Override + public ActionResult toActionResult() { + return compatActionResult.toActionResult(); + } + + @Override + public EventResult toEventResult() { + return compatActionResult.toEventResult(); + } + + @Deprecated + @Override + public Optional getNewHandStack() { + if (hasNewStack()) + return compatActionResult.getNewHandStack(); + + return Optional.empty(); + } + + public boolean hasNewStack() { + return compatActionResult.getNewHandStack().isPresent(); + } + + public boolean hasStack() { + return getStack() != null; + } + + public CompatActionResult asCompatActionResult() { + return compatActionResult; + } + + public static StackActionResult create(CompatActionResult compatActionResult, ItemStack stack) { + if (compatActionResult.getNewHandStack().isPresent()) + return new StackActionResult(compatActionResult, compatActionResult.getNewHandStack().get()); + + return new StackActionResult(compatActionResult, stack); + } + + public static StackActionResult create(CompatActionResult compatActionResult) { + return new StackActionResult(compatActionResult, null); + } + + public static StackActionResult create(ActionResult actionResult, EventResult eventResult, ItemStack stack) { + return new StackActionResult(actionResult, eventResult, stack); + } + + public static StackActionResult create(ActionResult actionResult, ItemStack stack) { + return new StackActionResult(actionResult, null, stack); + } + + public static StackActionResult success(ItemStack stack) { + CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.SUCCESS.withNewHandStack(stack)); + return create(compatActionResult, stack); + } + + public static StackActionResult successServer(ItemStack stack) { + CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.SUCCESS_SERVER.withNewHandStack(stack)); + return create(compatActionResult, stack); + } + + public static StackActionResult consume(ItemStack stack) { + CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.CONSUME.withNewHandStack(stack)); + return create(compatActionResult, stack); + } + + public ItemStack getStack() { + return stack; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java index 1dcb5b230..7f3571e0a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiItem.java @@ -8,7 +8,7 @@ import net.pitan76.mcpitanlib.api.gui.v2.SimpleScreenHandlerFactory; import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.v2.CompatItem; -import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; import net.pitan76.mcpitanlib.api.util.TextUtil; public class ExampleGuiItem extends CompatItem implements SimpleScreenHandlerFactory { @@ -18,7 +18,7 @@ public ExampleGuiItem(CompatibleItemSettings settings) { } @Override - public CompatActionResult onRightClick(ItemUseEvent e) { + public StackActionResult onRightClick(ItemUseEvent e) { if (!e.isClient()) e.user.openGuiScreen(this); From ccb11d3fe24530238833dc28d82423fc2e11d194 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 30 Oct 2024 15:57:47 +0900 Subject: [PATCH 410/622] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index d37f9da8b..350c2af87 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib mod_version=3.0.0 maven_group=net.pitan76 -changelog=Support for 1.21.2 \ No newline at end of file +changelog=Support for 1.21.3 \ No newline at end of file From 56924ba6fdf041beee0aa4b60c2f8a6ad406840e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 31 Oct 2024 13:06:19 +0900 Subject: [PATCH 411/622] fix APIs 1211 --- .../api/block/CompatChestBlock.java | 2 +- .../mcpitanlib/api/block/ExtendBlock.java | 20 +++---- .../api/block/v2/CompatibleBlockSettings.java | 5 -- .../api/client/SimpleHandledScreen.java | 3 +- .../mcpitanlib/api/client/SimpleScreen.java | 3 +- .../event/listener/WorldRenderContext.java | 3 +- .../gui/screen/SimpleHandledScreen.java | 3 +- .../CompatibleTexturedButtonWidget.java | 4 +- .../api/enchantment/CompatEnchantment.java | 6 +- .../mcpitanlib/api/entity/CompatEntity.java | 7 --- .../api/entity/CompatThrownItemEntity.java | 6 +- .../mcpitanlib/api/entity/ExtendEntity.java | 5 -- .../api/entity/ExtendEntityType.java | 4 +- .../api/entity/effect/CompatStatusEffect.java | 7 ++- .../api/event/block/DroppedStacksArgs.java | 8 +-- .../api/event/block/NeighborUpdateEvent.java | 14 +---- .../block/StateForNeighborUpdateArgs.java | 21 +------ .../api/event/result/TypedEventResult.java | 9 +-- .../event/v0/InteractionEventRegistry.java | 22 ++++--- .../event/v0/event/RecipeManagerEvent.java | 42 ++++++++++--- .../api/item/ArmorEquipmentType.java | 20 +++---- .../api/item/CompatFoodComponent.java | 11 +++- .../api/item/CompatibleArmorItem.java | 7 +++ .../api/item/CompatibleArmorMaterial.java | 60 ++++++++++++------- .../mcpitanlib/api/item/ExtendBlockItem.java | 10 ++-- .../mcpitanlib/api/item/ExtendItem.java | 11 ++-- .../api/item/consume/CompatUseAction.java | 8 +-- .../api/item/tool/CompatibleAxeItem.java | 4 +- .../api/item/tool/CompatibleHoeItem.java | 4 +- .../item/tool/CompatibleMiningToolItem.java | 2 +- .../api/item/tool/CompatiblePickaxeItem.java | 4 +- .../api/item/tool/CompatibleShovelItem.java | 4 +- .../api/item/tool/CompatibleSwordItem.java | 4 +- .../api/item/tool/CompatibleToolItem.java | 17 +++--- .../api/item/tool/CompatibleToolMaterial.java | 39 +++++++++++- .../mcpitanlib/api/item/v2/CompatItem.java | 12 +++- .../api/item/v2/CompatibleItemSettings.java | 13 +--- .../api/item/v3/CompatArmorMaterial.java | 7 +-- .../api/item/v3/CompatToolMaterial.java | 5 +- .../api/recipe/CompatibleRecipeEntry.java | 4 +- .../api/recipe/input/CompatRecipeInput.java | 2 +- .../api/recipe/v2/CompatRecipeEntry.java | 6 +- .../api/tag/item/RepairIngredientTag.java | 33 +++++----- .../mcpitanlib/api/util/BlockStateUtil.java | 7 +-- .../api/util/CommandManagerUtil.java | 3 +- .../api/util/CompatActionResult.java | 16 +---- .../mcpitanlib/api/util/EntityUtil.java | 16 ++--- .../api/util/EquipMaterialUtil.java | 36 ++++++++++- .../mcpitanlib/api/util/IngredientUtil.java | 39 +++--------- .../mcpitanlib/api/util/InteractUtil.java | 6 +- .../pitan76/mcpitanlib/api/util/NbtUtil.java | 2 +- .../mcpitanlib/api/util/RecipeUtil.java | 59 ++++-------------- .../api/util/StackActionResult.java | 41 +++++++++---- .../mcpitanlib/api/util/WorldUtil.java | 2 +- .../api/util/block/entity/FurnaceUtil.java | 11 ++-- .../api/util/client/RenderUtil.java | 8 +-- .../api/util/client/ScreenUtil.java | 5 +- .../api/util/entity/SnowballEntityUtil.java | 6 +- .../api/util/event/ItemEventGenerator.java | 2 +- .../api/util/recipe/RecipeMatcherUtil.java | 24 +++----- .../recipe/input/CraftingRecipeInputUtil.java | 6 +- .../api/util/world/WorldViewUtil.java | 2 +- .../mcpitanlib/core/player/ItemCooldown.java | 4 +- .../core/registry/FuelRegistry.java | 10 ++-- .../mcpitanlib/mixin/AbstractBlockMixin.java | 4 +- .../mcpitanlib/mixin/RecipeManagerMixin.java | 21 ++++--- .../tags/items/diamond_tool_materials.json | 5 ++ .../tags/items/gold_tool_materials.json | 5 ++ .../tags/items/iron_tool_materials.json | 5 ++ .../tags/items/leather_armor_materials.json | 5 ++ .../tags/items/netherite_tool_materials.json | 5 ++ .../tags/items/stone_tool_materials.json | 7 +++ .../tags/items/turtle_helmet_materials.json | 5 ++ .../tags/items/wooden_tool_materials.json | 5 ++ .../neoforge/WorldRenderRegistryImpl.java | 15 ----- 75 files changed, 456 insertions(+), 412 deletions(-) create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/diamond_tool_materials.json create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/gold_tool_materials.json create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/iron_tool_materials.json create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/leather_armor_materials.json create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/netherite_tool_materials.json create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/stone_tool_materials.json create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/turtle_helmet_materials.json create mode 100644 common/src/main/resources/data/mcpitanlib/tags/items/wooden_tool_materials.json diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java index 05d6c307d..b507732c8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java @@ -12,7 +12,7 @@ public class CompatChestBlock extends ChestBlock { public CompatChestBlock(Settings settings, Supplier> supplier) { - super(supplier, settings); + super(settings, supplier); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java index 76712d7e0..d9eb90483 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/ExtendBlock.java @@ -14,7 +14,7 @@ import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; import net.minecraft.item.tooltip.TooltipType; -import net.minecraft.loot.context.LootWorldContext; +import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; @@ -29,9 +29,8 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import net.minecraft.world.block.WireOrientation; -import net.minecraft.world.tick.ScheduledTickView; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.block.*; import net.pitan76.mcpitanlib.api.event.block.result.BlockBreakResult; @@ -39,7 +38,6 @@ import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.TextUtil; -import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; import org.jetbrains.annotations.Nullable; @@ -214,7 +212,7 @@ public void onStateReplaced(StateReplacedEvent event) { @Deprecated @Override - public List getDroppedStacks(BlockState state, LootWorldContext.Builder builder) { + public List getDroppedStacks(BlockState state, LootContextParameterSet.Builder builder) { return getDroppedStacks(new DroppedStacksArgs(state, builder)); } @@ -229,8 +227,8 @@ public List getDroppedStacks(DroppedStacksArgs args) { @Deprecated @Override - public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, WireOrientation wireOrientation, boolean notify) { - neighborUpdate(new NeighborUpdateEvent(state, world, pos, sourceBlock, wireOrientation, notify)); + protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { + neighborUpdate(new NeighborUpdateEvent(state, world, pos, sourceBlock, sourcePos, notify)); } /** @@ -238,7 +236,7 @@ public void neighborUpdate(BlockState state, World world, BlockPos pos, Block so * @param event NeighborUpdateEvent */ public void neighborUpdate(NeighborUpdateEvent event) { - super.neighborUpdate(event.state, event.world, event.pos, event.sourceBlock, event.wireOrientation, event.notify); + super.neighborUpdate(event.state, event.world, event.pos, event.sourceBlock, event.sourcePos, event.notify); } @Deprecated @@ -352,12 +350,12 @@ public FluidState getFluidState(FluidStateArgs args) { @Deprecated @Override - protected BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { - return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos, tickView, new CompatRandom(random))); + protected BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos)); } public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { - return super.getStateForNeighborUpdate(args.state, args.world, args.tickView, args.pos, args.direction, args.neighborPos, args.neighborState, args.random.getMcRandom()); + return super.getStateForNeighborUpdate(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java index 651891fd0..912a7dcef 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java @@ -255,11 +255,6 @@ public CompatibleBlockSettings allowsSpawning(AbstractBlock.TypedContextPredicat public AbstractBlock.Settings build() { super.build(); - - if (identifier != null) { - settings.registryKey(RegistryKey.of(RegistryKeys.BLOCK, identifier.toMinecraft())); - } - return settings; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 9076e7feb..07ee4a084 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -8,7 +8,6 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; @@ -74,7 +73,7 @@ protected void drawForegroundOverride(DrawForegroundArgs args) { } public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { - drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, 256, 256); } public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index b6eed54f7..fa3ae6cf4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -7,7 +7,6 @@ import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -49,7 +48,7 @@ public CompatibleTexturedButtonWidget addDrawableCTBW(CompatibleTexturedButtonWi public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { //ScreenUtil.setBackground(GUI); //super.drawTexture(matrices, x, y, u, v, width, height); - drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, 256, 256); } public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java index 10f36d4fb..b82802399 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java @@ -12,7 +12,6 @@ import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; -import net.minecraft.util.profiler.Profiler; import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.util.VoxelShapeUtil; import org.jetbrains.annotations.Nullable; @@ -121,6 +120,6 @@ default void drawBox(Box box, float red, float green, float blue, float alpha) { if (!vertexConsumer.isPresent()) return; - VertexRendering.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); + WorldRenderer.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index 266fc9d96..bdeab3968 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -8,7 +8,6 @@ import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.HandledScreen; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.screen.ScreenHandler; @@ -85,7 +84,7 @@ protected void drawForegroundOverride(DrawForegroundArgs args) { } public void callDrawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, int u, int v, int width, int height) { - drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, 256, 256); } public void callDrawTexture(DrawObjectDM drawObjectDM, CompatIdentifier texture, int x, int y, int u, int v, int width, int height) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java index d69357a5e..570ccc957 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatibleTexturedButtonWidget.java @@ -4,7 +4,6 @@ import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TexturedButtonWidget; -import net.minecraft.client.render.RenderLayer; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; @@ -69,7 +68,6 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt } else if (this.isHovered()) { i += hoveredVOffset; } - - context.drawTexture(RenderLayer::getGuiTextured, texture, this.getX(), this.getY(), u, i, this.width, this.height, textureWidth, textureHeight); + context.drawTexture(texture, this.getX(), this.getY(), u, i, this.width, this.height, textureWidth, textureHeight); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java index 9a685a047..d20d4a2b4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/enchantment/CompatEnchantment.java @@ -50,10 +50,10 @@ public boolean equals(Object obj) { public RegistryEntry getEntry(@Nullable World world) { Optional> optionalEntry; if (world == null) { - optionalEntry = BuiltinRegistries.createWrapperLookup() - .getOptionalEntry(registryKey); + optionalEntry = BuiltinRegistries.createWrapperLookup().createRegistryLookup() + .getOptionalEntry(RegistryKeys.ENCHANTMENT, registryKey); } else { - optionalEntry = world.getRegistryManager().getOptionalEntry(registryKey); + optionalEntry = world.getRegistryManager().get(RegistryKeys.ENCHANTMENT).getEntry(registryKey); } return optionalEntry.orElseThrow(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java index 73593fd96..796da806b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java @@ -2,12 +2,10 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.damage.DamageSource; import net.minecraft.entity.data.DataTracker; import net.minecraft.nbt.NbtCompound; import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; -import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; @@ -24,11 +22,6 @@ public void initDataTracker(DataTracker.Builder builder) { initDataTracker(new InitDataTrackerArgs(builder)); } - @Override - public boolean damage(ServerWorld world, DamageSource source, float amount) { - return false; - } - public void initDataTracker(InitDataTrackerArgs args) { } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java index 3217ef58a..a7f71a891 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java @@ -7,6 +7,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; import net.minecraft.world.World; @@ -15,7 +16,6 @@ import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; -import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public abstract class CompatThrownItemEntity extends ThrownItemEntity { @@ -24,11 +24,11 @@ public CompatThrownItemEntity(EntityType entityType, } public CompatThrownItemEntity(EntityType entityType, double d, double e, double f, World world) { - super(entityType, d, e, f, world, ItemStackUtil.empty()); + super(entityType, d, e, f, world); } public CompatThrownItemEntity(EntityType entityType, LivingEntity livingEntity, World world) { - super(entityType, livingEntity, world, ItemStackUtil.empty()); + super(entityType, livingEntity, world); } public abstract Item getDefaultItemOverride(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java index 6217f4cf8..384c69012 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntity.java @@ -22,11 +22,6 @@ public void initDataTracker(DataTracker.Builder builder) { initDataTracker(); } - @Override - public boolean damage(ServerWorld world, DamageSource source, float amount) { - return false; - } - public void initDataTracker() { } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java index 38fee4052..8490f0e42 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/ExtendEntityType.java @@ -18,12 +18,12 @@ public class ExtendEntityType extends EntityType { @Deprecated public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, String translationKey, Optional> lootTable, Boolean alwaysUpdateVelocity) { - super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, translationKey, lootTable, FeatureFlags.DEFAULT_ENABLED_FEATURES); + super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); this.alwaysUpdateVelocity = alwaysUpdateVelocity; } public ExtendEntityType(EntityFactory factory, SpawnGroup spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet canSpawnBlocks, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, String translationKey, Optional> lootTable, Boolean alwaysUpdateVelocity) { - super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, 5, maxTrackDistance, trackTickInterval, translationKey, lootTable, FeatureFlags.DEFAULT_ENABLED_FEATURES); + super((factory::create), spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnBlocks, entityDimensions, 5, maxTrackDistance, trackTickInterval, FeatureFlags.DEFAULT_ENABLED_FEATURES); this.alwaysUpdateVelocity = alwaysUpdateVelocity; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java index 3b0b77435..a8e9d4a57 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/effect/CompatStatusEffect.java @@ -3,6 +3,7 @@ import net.minecraft.entity.effect.StatusEffect; import net.minecraft.registry.BuiltinRegistries; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Identifier; import net.minecraft.world.World; @@ -47,10 +48,10 @@ public boolean equals(Object obj) { public RegistryEntry getEntry(@Nullable World world) { Optional> optionalEntry; if (world == null) { - optionalEntry = BuiltinRegistries.createWrapperLookup() - .getOptionalEntry(registryKey); + optionalEntry = BuiltinRegistries.createWrapperLookup().createRegistryLookup() + .getOptionalEntry(RegistryKeys.STATUS_EFFECT, registryKey); } else { - optionalEntry = world.getRegistryManager().getOptionalEntry(registryKey); + optionalEntry = world.getRegistryManager().get(RegistryKeys.STATUS_EFFECT).getEntry(registryKey); } return optionalEntry.orElseThrow(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java index b2d322b87..edb85cb20 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/DroppedStacksArgs.java @@ -2,15 +2,15 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.loot.context.LootContextParameters; -import net.minecraft.loot.context.LootWorldContext; import net.pitan76.mcpitanlib.api.event.BaseEvent; public class DroppedStacksArgs extends BaseEvent { public BlockState state; - public LootWorldContext.Builder builder; + public LootContextParameterSet.Builder builder; - public DroppedStacksArgs(BlockState state, LootWorldContext.Builder builder) { + public DroppedStacksArgs(BlockState state, LootContextParameterSet.Builder builder) { this.state = state; this.builder = builder; } @@ -20,7 +20,7 @@ public BlockState getState() { } @Deprecated - public LootWorldContext.Builder getBuilder() { + public LootContextParameterSet.Builder getBuilder() { return builder; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java index e86a68fa3..fb10fd86c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java @@ -5,7 +5,6 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.block.WireOrientation; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; import org.jetbrains.annotations.Nullable; @@ -19,9 +18,6 @@ public class NeighborUpdateEvent extends BaseEvent { @Nullable public BlockPos sourcePos; - @Nullable - public WireOrientation wireOrientation; - public boolean notify; public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block sourceBlock, @Nullable BlockPos sourcePos, boolean notify) { @@ -33,9 +29,8 @@ public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block so this.notify = notify; } - public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block sourceBlock, @Nullable WireOrientation wireOrientation, boolean notify) { - this(state, world, pos, sourceBlock, (BlockPos) null, notify); - this.wireOrientation = wireOrientation; + public NeighborUpdateEvent(BlockState state, World world, BlockPos pos, Block sourceBlock, boolean notify) { + this(state, world, pos, sourceBlock, null, notify); } public BlockState getState() { @@ -73,9 +68,4 @@ public BlockEntity getBlockEntity() { public boolean hasBlockEntity() { return WorldUtil.hasBlockEntity(world, pos); } - - @Deprecated - public @Nullable WireOrientation getWireOrientation() { - return wireOrientation; - } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java index 034355d4c..65109040e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateForNeighborUpdateArgs.java @@ -6,17 +6,15 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import net.minecraft.world.tick.ScheduledTickView; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; public class StateForNeighborUpdateArgs { public BlockState state; public Direction direction; public BlockState neighborState; - public WorldView world; + public WorldAccess world; public BlockPos pos; public BlockPos neighborPos; - public ScheduledTickView tickView; public CompatRandom random; public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { @@ -26,17 +24,7 @@ public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockSt this.world = world; this.pos = pos; this.neighborPos = neighborPos; - } - - public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldView world, BlockPos pos, BlockPos neighborPos, ScheduledTickView tickView, CompatRandom random) { - this.state = state; - this.direction = direction; - this.neighborState = neighborState; - this.world = world; - this.pos = pos; - this.neighborPos = neighborPos; - this.tickView = tickView; - this.random = random; + this.random = CompatRandom.of(); } public BlockState getState() { @@ -78,9 +66,4 @@ public BlockPos getNeighborPos() { public CompatRandom getRandom() { return random; } - - @Deprecated - public ScheduledTickView getTickView() { - return tickView; - } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java index dacb8ca36..78487eedb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/result/TypedEventResult.java @@ -4,6 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; public class TypedEventResult { protected final dev.architectury.event.CompoundEventResult result; @@ -45,11 +46,11 @@ public CompatActionResult toCompatActionResult(ItemStack stack) { if (result.object() != stack) return toCompatActionResult(); - if (toActionResult() instanceof ActionResult.Success) { - ActionResult.Success success = (ActionResult.Success) toActionResult(); + if (toActionResult() == ActionResult.SUCCESS) + return StackActionResult.success(stack); - return CompatActionResult.create(success.withNewHandStack(stack)); - } + if (toActionResult() == ActionResult.CONSUME) + return StackActionResult.consume(stack); return toCompatActionResult(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java index 65a8d74b9..d31cf54c5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/InteractionEventRegistry.java @@ -1,22 +1,25 @@ package net.pitan76.mcpitanlib.api.event.v0; +import dev.architectury.event.CompoundEventResult; import dev.architectury.event.events.common.InteractionEvent; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.ActionResult; +import net.minecraft.item.ItemStack; import net.minecraft.util.Hand; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.result.EventResult; +import net.pitan76.mcpitanlib.api.event.result.TypedEventResult; import net.pitan76.mcpitanlib.api.event.v0.event.ClickBlockEvent; -import net.pitan76.mcpitanlib.api.util.CompatActionResult; public class InteractionEventRegistry { + @SuppressWarnings("deprecation") public static void registerRightClickBlock(RightClickBlock rightClickBlock) { - InteractionEvent.RIGHT_CLICK_BLOCK.register((player, hand, pos, direction) -> rightClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).toActionResult()); + InteractionEvent.RIGHT_CLICK_BLOCK.register((player, hand, pos, direction) -> rightClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).getResult()); } + @SuppressWarnings("deprecation") public static void registerLeftClickBlock(LeftClickBlock leftClickBlock) { - InteractionEvent.LEFT_CLICK_BLOCK.register((player, hand, pos, direction) -> leftClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).toActionResult()); + InteractionEvent.LEFT_CLICK_BLOCK.register((player, hand, pos, direction) -> leftClickBlock.click(new ClickBlockEvent(player, hand, pos, direction)).getResult()); } public static void registerRightClickItem(RightClickItem rightClickItem) { @@ -46,11 +49,12 @@ public interface RightClickBlock { } public interface RightClickItem { - default ActionResult click(PlayerEntity var1, Hand var2) { - return click(new Player(var1), var2).toActionResult(); + @SuppressWarnings("deprecation") + default CompoundEventResult click(PlayerEntity var1, Hand var2) { + return click(new Player(var1), var2).getResult(); } - CompatActionResult click(Player player, Hand hand); + TypedEventResult click(Player player, Hand hand); } public interface ClientLeftClickAir { @@ -72,9 +76,9 @@ default void click(PlayerEntity var1, Hand var2) { public interface InteractEntity { @SuppressWarnings("deprecation") default dev.architectury.event.EventResult interact(PlayerEntity var1, Entity var2, Hand var3) { - return interact(new Player(var1), var2, var3).toEventResult().getResult(); + return interact(new Player(var1), var2, var3).getResult(); } - CompatActionResult interact(Player player, Entity entity, Hand hand); + EventResult interact(Player player, Entity entity, Hand hand); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index c91e9235e..3ea708bfe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -1,26 +1,50 @@ package net.pitan76.mcpitanlib.api.event.v0.event; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; +import com.google.gson.JsonElement; import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeEntry; +import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; -import java.util.SortedMap; +import java.util.Map; public class RecipeManagerEvent { + public Map jsonMap; + public ResourceManager resourceManager; + public Profiler profiler; @Deprecated - private SortedMap> sortedMap; + public ImmutableMap.Builder> recipesById; - public ResourceManager resourceManager; - public Profiler profiler; + @Deprecated + public ImmutableMultimap.Builder, RecipeEntry> recipesByType; - public RecipeManagerEvent(SortedMap> sortedMap, ResourceManager resourceManager, Profiler profiler) { - this.sortedMap = sortedMap; + public RecipeManagerEvent(Map map, ResourceManager resourceManager, Profiler profiler, ImmutableMap.Builder> recipesById, ImmutableMultimap.Builder, RecipeEntry> recipesByType) { + this.jsonMap = map; this.resourceManager = resourceManager; this.profiler = profiler; + this.recipesById = recipesById; + this.recipesByType = recipesByType; + } + + public Map getJsonMap() { + return jsonMap; + } + + @Deprecated + public ImmutableMap.Builder> getRecipesById() { + return recipesById; + } + + @Deprecated + public ImmutableMultimap.Builder, RecipeEntry> getRecipesByType() { + return recipesByType; } public Profiler getProfiler() { @@ -36,10 +60,12 @@ public void putCompatibleRecipeEntry(Identifier id, CompatibleRecipeEntry entry) } public void putCompatibleRecipeEntry(CompatibleRecipeEntry entry) { - sortedMap.put(entry.getId(), entry.getRecipe()); + recipesById.put(entry.getId(), entry.getRecipeEntry()); + recipesByType.put(entry.getType(), entry.getRecipeEntry()); } public > void putCompatibleRecipeEntry(CompatRecipeEntry entry) { - sortedMap.put(entry.getId(), entry.getRecipe()); + recipesById.put(entry.getId(), entry.getRecipeEntry()); + recipesByType.put(entry.getType(), entry.getRecipeEntry()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java index 09198de39..c1ec04ae7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ArmorEquipmentType.java @@ -1,23 +1,23 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.entity.EquipmentSlot; -import net.minecraft.item.equipment.EquipmentType; +import net.minecraft.item.ArmorItem; import org.jetbrains.annotations.Nullable; public class ArmorEquipmentType { - public static ArmorEquipmentType HEAD = new ArmorEquipmentType(EquipmentSlot.HEAD, EquipmentType.HELMET); - public static ArmorEquipmentType CHEST = new ArmorEquipmentType(EquipmentSlot.CHEST, EquipmentType.CHESTPLATE); - public static ArmorEquipmentType LEGS = new ArmorEquipmentType(EquipmentSlot.LEGS, EquipmentType.LEGGINGS); - public static ArmorEquipmentType FEET = new ArmorEquipmentType(EquipmentSlot.FEET, EquipmentType.BOOTS); + public static ArmorEquipmentType HEAD = new ArmorEquipmentType(EquipmentSlot.HEAD, ArmorItem.Type.HELMET); + public static ArmorEquipmentType CHEST = new ArmorEquipmentType(EquipmentSlot.CHEST, ArmorItem.Type.CHESTPLATE); + public static ArmorEquipmentType LEGS = new ArmorEquipmentType(EquipmentSlot.LEGS, ArmorItem.Type.LEGGINGS); + public static ArmorEquipmentType FEET = new ArmorEquipmentType(EquipmentSlot.FEET, ArmorItem.Type.BOOTS); // New type for animals from 1.20.5 - public static ArmorEquipmentType BODY = new ArmorEquipmentType(EquipmentSlot.BODY, EquipmentType.BODY); + public static ArmorEquipmentType BODY = new ArmorEquipmentType(EquipmentSlot.BODY, ArmorItem.Type.BODY); protected final EquipmentSlot slot; - protected final EquipmentType type; + protected final ArmorItem.Type type; - protected ArmorEquipmentType(EquipmentSlot slot, EquipmentType type) { + protected ArmorEquipmentType(EquipmentSlot slot, ArmorItem.Type type) { this.slot = slot; this.type = type; } @@ -28,7 +28,7 @@ public EquipmentSlot getSlot() { } @Deprecated - public EquipmentType getType() { + public ArmorItem.Type getType() { return type; } @@ -54,7 +54,7 @@ public static ArmorEquipmentType of(EquipmentSlot slot) { } @Nullable - public static ArmorEquipmentType of(EquipmentType type) { + public static ArmorEquipmentType of(ArmorItem.Type type) { switch (type) { case HELMET -> { return HEAD; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java index c7cf23987..cc6115cad 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatFoodComponent.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.item; +import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; import net.minecraft.component.type.FoodComponent; import net.minecraft.entity.effect.StatusEffectInstance; @@ -7,6 +8,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; public class CompatFoodComponent { private int hunger; @@ -61,6 +63,11 @@ public FoodComponent.Builder getVanillaBuilder() { FoodComponent.Builder builder = new FoodComponent.Builder(); builder.nutrition(hunger).saturationModifier(saturation); if (alwaysEdible) builder.alwaysEdible(); + if (snack) builder.snack(); + //if (meat) builder.meat(); + for (Pair pair : statusEffects) { + builder.statusEffect(pair.getFirst(), pair.getSecond()); + } return builder; } @@ -68,10 +75,12 @@ public FoodComponent build() { if (latestComponent != null) return latestComponent; float eatSeconds = 1.6f; + ImmutableList.Builder effects = ImmutableList.builder(); + effects.addAll(statusEffects.stream().map(pair -> new FoodComponent.StatusEffectEntry(pair.getFirst(), pair.getSecond())).iterator()); if (snack) eatSeconds = 0.8f; if (meat) eatSeconds = 1.6f; - latestComponent = new FoodComponent(hunger, saturation, alwaysEdible); + latestComponent = new FoodComponent(hunger, saturation, alwaysEdible, eatSeconds, Optional.empty(), effects.build()); return latestComponent; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java index 29564914b..77764f373 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java @@ -1,11 +1,18 @@ package net.pitan76.mcpitanlib.api.item; import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; +import net.minecraft.registry.entry.RegistryEntry; + +import java.util.Map; public class CompatibleArmorItem extends ArmorItem implements ExtendItemProvider { public final ArmorEquipmentType type; public final CompatibleArmorMaterial material; + @Deprecated + public static final Map> CACHE = new java.util.HashMap<>(); + public CompatibleArmorItem(CompatibleArmorMaterial material, ArmorEquipmentType type, CompatibleItemSettings settings) { super(material.build(), type.getType(), settings.build()); this.type = type; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java index 0ac27dc81..19bb91e67 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorMaterial.java @@ -1,17 +1,19 @@ package net.pitan76.mcpitanlib.api.item; -import net.minecraft.item.Item; -import net.minecraft.item.equipment.ArmorMaterial; -import net.minecraft.item.equipment.EquipmentType; +import net.minecraft.item.ArmorItem; +import net.minecraft.item.ArmorMaterial; import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.registry.tag.ItemTags; -import net.minecraft.registry.tag.TagKey; import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; import net.minecraft.util.Identifier; -import net.pitan76.mcpitanlib.api.util.IngredientUtil; +import net.minecraft.util.Util; import java.util.EnumMap; +import java.util.List; +import java.util.function.Supplier; public interface CompatibleArmorMaterial { int getDurability(ArmorEquipmentType type); @@ -22,9 +24,7 @@ public interface CompatibleArmorMaterial { SoundEvent getEquipSound(); - default Ingredient getRepairIngredient() { - return IngredientUtil.fromTagByIdentifier(getRepairTag().id()); - } + Ingredient getRepairIngredient(); /** * @return the name of the material @@ -42,21 +42,39 @@ default String getName() { float getKnockbackResistance(); - default TagKey getRepairTag() { - return ItemTags.REPAIRS_IRON_ARMOR; + @Deprecated + default RegistryEntry build() { + if (CompatibleArmorItem.CACHE.containsKey(this)) { + return CompatibleArmorItem.CACHE.get(this); + } + + RegistryEntry entry = register(getId(), Util.make(new EnumMap<>(ArmorItem.Type.class), (map) -> { + map.put(ArmorItem.Type.HELMET, this.getProtection(ArmorEquipmentType.HEAD)); + map.put(ArmorItem.Type.CHESTPLATE, this.getProtection(ArmorEquipmentType.CHEST)); + map.put(ArmorItem.Type.LEGGINGS, this.getProtection(ArmorEquipmentType.LEGS)); + map.put(ArmorItem.Type.BOOTS, this.getProtection(ArmorEquipmentType.FEET)); + + map.put(ArmorItem.Type.BODY, this.getProtection(ArmorEquipmentType.BODY)); + }), getEnchantability(), SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, getToughness(), getKnockbackResistance(), + this::getRepairIngredient + ); + CompatibleArmorItem.CACHE.put(this, entry); + return entry; } - @Deprecated - default ArmorMaterial build() { - return new ArmorMaterial(0, getDefense(), getEnchantability(), RegistryEntry.of(getEquipSound()), getToughness(), getKnockbackResistance(), getRepairTag(), getId()); + private static RegistryEntry register(Identifier id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient) { + List list = List.of(new ArmorMaterial.Layer(id)); + return register(id, defense, enchantability, equipSound, toughness, knockbackResistance, repairIngredient, list); } - default EnumMap getDefense() { - EnumMap map = new EnumMap<>(EquipmentType.class); - map.put(EquipmentType.HELMET, this.getProtection(ArmorEquipmentType.HEAD)); - map.put(EquipmentType.CHESTPLATE, this.getProtection(ArmorEquipmentType.CHEST)); - map.put(EquipmentType.LEGGINGS, this.getProtection(ArmorEquipmentType.LEGS)); - map.put(EquipmentType.BOOTS, this.getProtection(ArmorEquipmentType.FEET)); - return map; + private static RegistryEntry register(Identifier id, EnumMap defense, int enchantability, RegistryEntry equipSound, float toughness, float knockbackResistance, Supplier repairIngredient, List layers) { + EnumMap enumMap = new EnumMap<>(ArmorItem.Type.class); + ArmorItem.Type[] var9 = ArmorItem.Type.values(); + + for (ArmorItem.Type type : var9) { + enumMap.put(type, defense.get(type)); + } + + return Registry.registerReference(Registries.ARMOR_MATERIAL, id, new ArmorMaterial(enumMap, enchantability, equipSound, repairIngredient, layers, toughness, knockbackResistance)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java index 927399070..1a1d0d7c0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java @@ -10,9 +10,11 @@ import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; import net.pitan76.mcpitanlib.core.Dummy; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; @@ -32,8 +34,8 @@ public ExtendBlockItem(Block block, CompatibleItemSettings settings) { // ExtendItem @Deprecated @Override - public ActionResult use(World world, PlayerEntity user, Hand hand) { - return onRightClick(new ItemUseEvent(world, user, hand)).toActionResult(); + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + return onRightClick(new ItemUseEvent(world, user, hand)).toTypedActionResult(); } @Deprecated @@ -80,8 +82,8 @@ public void onCraft(ItemStack stack, World world) { * @param event ItemUseEvent * @return ActionResultType */ - public CompatActionResult onRightClick(ItemUseEvent event) { - return CompatActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand)); + public StackActionResult onRightClick(ItemUseEvent event) { + return StackActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand)); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 05f38f5bd..a34296fa2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -3,7 +3,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; -import net.minecraft.item.consume.UseAction; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -11,9 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.text.Text; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.Rarity; +import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; @@ -36,8 +33,8 @@ public ExtendItem(CompatibleItemSettings settings) { @Deprecated @Override - public ActionResult use(World world, PlayerEntity user, Hand hand) { - return onRightClick(new ItemUseEvent(world, user, hand)).toActionResult(); + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + return onRightClick(new ItemUseEvent(world, user, hand)).toTypedActionResult(); } @Deprecated @@ -101,7 +98,7 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos * @return ActionResultType */ public StackActionResult onRightClick(ItemUseEvent event) { - return StackActionResult.create(CompatActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand)), event.stack); + return StackActionResult.create(CompatActionResult.create(super.use(event.world, event.user.getPlayerEntity(), event.hand).getResult()), event.stack); } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java index e3350697c..66aed1404 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/consume/CompatUseAction.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.api.item.consume; -import net.minecraft.item.consume.UseAction; +import net.minecraft.util.UseAction; import net.pitan76.mcpitanlib.api.util.CompatStringIdentifiable; public class CompatUseAction implements CompatStringIdentifiable { @@ -26,16 +26,16 @@ public static CompatUseAction of(UseAction useAction) { } @Deprecated - public UseAction get() { + public UseAction getUseAction() { return useAction; } public int getId() { - return useAction.getId(); + return -1; } public String getName() { - return useAction.asString(); + return useAction.name(); } @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index 01b90c26a..5e133bfc8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -15,11 +15,11 @@ public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material.build(), attackDamage, attackSpeed, settings.build()); + super(material.build(), settings.build()); } public CompatibleAxeItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index f3b3c45da..dfe15a81f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -15,11 +15,11 @@ public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material.build(), attackDamage, attackSpeed, settings.build()); + super(material.build(), settings.build()); } public CompatibleHoeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index 8f377ec89..d039a86e7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -18,7 +18,7 @@ public class CompatibleMiningToolItem extends MiningToolItem implements ExtendItemProvider { @Deprecated protected CompatibleMiningToolItem(float attackDamage, float attackSpeed, ToolMaterial material, net.minecraft.registry.tag.TagKey effectiveBlocks, Settings settings) { - super(material, effectiveBlocks, attackDamage, attackSpeed, settings); + super(material, effectiveBlocks, settings); } public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, TagKey tagKey, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index a2102fe83..a56bc279e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -15,11 +15,11 @@ public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material.build(), attackDamage, attackSpeed, settings.build()); + super(material.build(), settings.build()); } public CompatiblePickaxeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index 88717e768..39d94d223 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -15,11 +15,11 @@ public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material.build(), attackDamage, attackSpeed, settings.build()); + super(material.build(), settings.build()); } public CompatibleShovelItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index cf1f48f96..040f22cb6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -15,11 +15,11 @@ public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { - super(material.build(), attackDamage, attackSpeed, settings.build()); + super(material.build(), settings.build()); } public CompatibleSwordItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { - super(material, attackDamage, attackSpeed, settings.build()); + super(material, settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java index a8e189434..1e64a0b81 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java @@ -2,8 +2,9 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.ToolItem; +import net.minecraft.item.ToolMaterial; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; @@ -11,18 +12,14 @@ import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; -public class CompatibleToolItem extends Item implements ExtendItemProvider { - - public CompatibleToolMaterial material; - +public class CompatibleToolItem extends ToolItem implements ExtendItemProvider { @Deprecated - protected CompatibleToolItem(Settings settings) { - super(settings); + protected CompatibleToolItem(ToolMaterial material, Settings settings) { + super(material, settings); } public CompatibleToolItem(CompatibleToolMaterial material, CompatibleItemSettings settings) { - this(material.build().applyToolSettings(settings.build(), null, 0, 0)); - this.material = material; + this(material.build(), settings.build()); } public boolean overrideIsSuitableFor(BlockState state) { @@ -42,7 +39,7 @@ public float overrideGetMiningSpeedMultiplier(ItemStack stack, BlockState state) @Deprecated @Override public float getMiningSpeed(ItemStack stack, BlockState state) { - return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state) * material.getCompatMiningSpeedMultiplier(); + return overrideGetMiningSpeedMultiplier(stack, state) * super.getMiningSpeed(stack, state); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java index ab44f30bf..7559366c7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolMaterial.java @@ -30,6 +30,11 @@ default TagKey getInverseTag() { return level2inverseTag(getCompatMiningLevel()); } + @Deprecated + default TagKey _getInverseTag() { + return getInverseTag(); + } + public static TagKey level2inverseTag(int level) { switch (level) { case 1: @@ -76,10 +81,40 @@ default int getEnchantability() { } default TagKey getRepairTag() { - return ItemTags.IRON_TOOL_MATERIALS; + return ItemTags.IRON_ORES; } default ToolMaterial build() { - return new ToolMaterial(getInverseTag(), getCompatDurability(), getCompatMiningSpeedMultiplier(), getCompatAttackDamage(), getCompatEnchantability(), getRepairTag()); + return new ToolMaterial() { + @Override + public int getDurability() { + return getCompatDurability(); + } + + @Override + public float getMiningSpeedMultiplier() { + return getCompatMiningSpeedMultiplier(); + } + + @Override + public float getAttackDamage() { + return getCompatAttackDamage(); + } + + @Override + public TagKey getInverseTag() { + return _getInverseTag(); + } + + @Override + public int getEnchantability() { + return getCompatEnchantability(); + } + + @Override + public Ingredient getRepairIngredient() { + return getCompatRepairIngredient(); + } + }; } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java index 5bde8f6ea..93535f5d9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.api.item.v2; import net.minecraft.item.ItemStack; -import net.minecraft.item.consume.UseAction; import net.minecraft.util.Rarity; +import net.minecraft.util.UseAction; import net.pitan76.mcpitanlib.api.event.item.CanRepairArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantabilityArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantableArgs; @@ -34,7 +34,7 @@ public ItemWrapper getWrapper() { @Deprecated @Override public UseAction getUseAction(ItemStack stack) { - return getUseAction(new UseActionArgs(stack)).get(); + return getUseAction(new UseActionArgs(stack)).getUseAction(); } public CompatUseAction getUseAction(UseActionArgs args) { @@ -66,4 +66,12 @@ public boolean canRepair(CanRepairArgs args) { RepairIngredientTag tag = settings.repairIngredientTag; return tag != null && tag.contains(args.stack); } + + @Override + protected String getOrCreateTranslationKey() { + if (settings.changedTranslationKey) + return settings.translationKey; + + return super.getOrCreateTranslationKey(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java index 31edd9e6a..26491fdd7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java @@ -109,31 +109,29 @@ public CompatibleItemSettings food(CompatFoodComponent foodComponent) { } public CompatibleItemSettings useItemPrefixedTranslationKey() { - settings.useItemPrefixedTranslationKey(); changedTranslationKey = true; return this; } public CompatibleItemSettings useBlockPrefixedTranslationKey() { - settings.useBlockPrefixedTranslationKey(); changedTranslationKey = true; return this; } + public String translationKey = null; + public CompatibleItemSettings translationKey(String translationKey) { - settings.translationKey(translationKey); changedTranslationKey = true; + this.translationKey = translationKey; return this; } public CompatibleItemSettings enchantable(int enchantability) { - settings.enchantable(enchantability); this.enchantability = enchantability; return this; } public CompatibleItemSettings repairable(RepairIngredientTag tag) { - settings.repairable(tag.getTag()); this.repairIngredientTag = tag; return this; } @@ -141,11 +139,6 @@ public CompatibleItemSettings repairable(RepairIngredientTag tag) { @Override public ExtendSettings build() { super.build(); - - if (identifier != null) { - settings.registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier.toMinecraft())); - } - return settings; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java index 55365a246..069f4f278 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java @@ -1,7 +1,6 @@ package net.pitan76.mcpitanlib.api.item.v3; -import net.minecraft.item.Item; -import net.minecraft.registry.tag.TagKey; +import net.minecraft.recipe.Ingredient; import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; @@ -9,8 +8,8 @@ public interface CompatArmorMaterial extends CompatibleArmorMaterial { @Deprecated @Override - default TagKey getRepairTag() { - return getRepairIngredientTag().getTag(); + default Ingredient getRepairIngredient() { + return getRepairIngredientTag().getIngredient(); } RepairIngredientTag getRepairIngredientTag(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java index 2c568c16c..153f96262 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.item.v3; import net.minecraft.item.Item; +import net.minecraft.recipe.Ingredient; import net.minecraft.registry.tag.TagKey; import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; @@ -8,8 +9,8 @@ public interface CompatToolMaterial extends CompatibleArmorMaterial { @Deprecated @Override - default TagKey getRepairTag() { - return getRepairIngredientTag().getTag(); + default Ingredient getRepairIngredient() { + return getRepairIngredientTag().getIngredient(); } RepairIngredientTag getRepairIngredientTag(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java index 8a813adcd..efbea4147 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java @@ -20,7 +20,7 @@ public CompatibleRecipeEntry(RecipeEntry entry) { } public CompatibleRecipeEntry(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ShapelessRecipe shapelessRecipe) { - this.entry = new RecipeEntry<>(RegistryKey.of(RegistryKeys.RECIPE, id), shapelessRecipe); + this.entry = new RecipeEntry<>(id, shapelessRecipe); this.group = group; this.category = category; } @@ -43,7 +43,7 @@ public Recipe getRecipe() { } public Identifier getId() { - return entry.id().getValue(); + return entry.id(); } public CompatIdentifier getCompatId() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java index 5f97fc400..c7904361e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/input/CompatRecipeInput.java @@ -23,7 +23,7 @@ public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack(int slot) { } public int getSize() { - return input.size(); + return input.getSize(); } public boolean isEmpty() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java index f594f28d6..d9f19dede 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java @@ -1,8 +1,6 @@ package net.pitan76.mcpitanlib.api.recipe.v2; import net.minecraft.recipe.*; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.RecipeUtil; @@ -20,7 +18,7 @@ public CompatRecipeEntry(RecipeEntry entry) { } public CompatRecipeEntry(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, T recipe) { - this.entry = new RecipeEntry<>(RegistryKey.of(RegistryKeys.RECIPE, id), recipe); + this.entry = new RecipeEntry<>(id, recipe); this.group = group; this.category = category; } @@ -43,7 +41,7 @@ public T getRecipe() { } public Identifier getId() { - return entry.id().getValue(); + return entry.id(); } public CompatIdentifier getCompatId() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java index ed91ce35e..1e4c1a482 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/item/RepairIngredientTag.java @@ -6,29 +6,34 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.MCPitanLib; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.IngredientUtil; import net.pitan76.mcpitanlib.api.util.item.ItemUtil; public class RepairIngredientTag { - public static final RepairIngredientTag REPAIRS_LEATHER_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_LEATHER_ARMOR); - public static final RepairIngredientTag REPAIRS_CHAIN_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_CHAIN_ARMOR); - public static final RepairIngredientTag REPAIRS_IRON_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_IRON_ARMOR); - public static final RepairIngredientTag REPAIRS_GOLD_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_GOLD_ARMOR); - public static final RepairIngredientTag REPAIRS_DIAMOND_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_DIAMOND_ARMOR); - public static final RepairIngredientTag REPAIRS_NETHERITE_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_NETHERITE_ARMOR); - public static final RepairIngredientTag REPAIRS_TURTLE_HELMET = new RepairIngredientTag(ItemTags.REPAIRS_TURTLE_HELMET); - public static final RepairIngredientTag REPAIRS_WOLF_ARMOR = new RepairIngredientTag(ItemTags.REPAIRS_WOLF_ARMOR); - public static final RepairIngredientTag WOODEN_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.WOODEN_TOOL_MATERIALS); - public static final RepairIngredientTag STONE_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.STONE_TOOL_MATERIALS); - public static final RepairIngredientTag IRON_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.IRON_TOOL_MATERIALS); - public static final RepairIngredientTag GOLDEN_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.GOLD_TOOL_MATERIALS); - public static final RepairIngredientTag DIAMOND_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.DIAMOND_TOOL_MATERIALS); - public static final RepairIngredientTag NETHERITE_TOOL_MATERIALS = new RepairIngredientTag(ItemTags.NETHERITE_TOOL_MATERIALS); + public static final RepairIngredientTag REPAIRS_LEATHER_ARMOR = of("leather_armor_materials"); + public static final RepairIngredientTag REPAIRS_CHAIN_ARMOR = of("iron_tool_materials"); + public static final RepairIngredientTag REPAIRS_IRON_ARMOR = of("iron_tool_materials"); + public static final RepairIngredientTag REPAIRS_GOLD_ARMOR = of("golden_tool_materials"); + public static final RepairIngredientTag REPAIRS_DIAMOND_ARMOR = of("diamond_tool_materials"); + public static final RepairIngredientTag REPAIRS_NETHERITE_ARMOR = of("netherite_tool_materials"); + public static final RepairIngredientTag REPAIRS_TURTLE_HELMET = of("turtle_helmet_materials"); + public static final RepairIngredientTag REPAIRS_WOLF_ARMOR = of("leather_armor_materials"); + public static final RepairIngredientTag WOODEN_TOOL_MATERIALS = of("wooden_tool_materials"); + public static final RepairIngredientTag STONE_TOOL_MATERIALS = of("stone_tool_materials"); + public static final RepairIngredientTag IRON_TOOL_MATERIALS = of("iron_tool_materials"); + public static final RepairIngredientTag GOLDEN_TOOL_MATERIALS = of("golden_tool_materials"); + public static final RepairIngredientTag DIAMOND_TOOL_MATERIALS = of("diamond_tool_materials"); + public static final RepairIngredientTag NETHERITE_TOOL_MATERIALS = of("netherite_tool_materials"); private TagKey tag; + protected static RepairIngredientTag of(String path) { + return new RepairIngredientTag(CompatIdentifier.of(MCPitanLib.MOD_ID, path)); + } + public RepairIngredientTag(CompatIdentifier identifier) { this.tag = TagKey.of(RegistryKeys.ITEM, identifier.toMinecraft()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index ea9887b42..b3aa60d7f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -14,7 +14,6 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; -import net.minecraft.world.block.WireOrientation; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; import net.pitan76.mcpitanlib.api.util.block.BlockHitResultUtil; @@ -53,9 +52,7 @@ public static , V extends T> BlockState with(BlockState } public static void neighborUpdate(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean notify) { - WireOrientation wireOrientation = WireOrientation.of(pos.up() == fromPos ? Direction.UP : Direction.DOWN, pos.north() == fromPos ? Direction.NORTH : Direction.SOUTH, pos.east() == fromPos ? WireOrientation.SideBias.RIGHT : WireOrientation.SideBias.LEFT); - - state.neighborUpdate(world, pos, block, wireOrientation, notify); + state.neighborUpdate(world, pos, block, fromPos, notify); } public static void updateNeighbors(BlockState state, WorldAccess world, BlockPos pos, int flags) { @@ -79,7 +76,7 @@ public static CompatActionResult onUse(BlockState state, World world, Player pla } public static CompatActionResult onUseWithItem(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { - return CompatActionResult.create(state.onUseWithItem(stack, world, player, hand, hit)); + return CompatActionResult.create(state.onUseWithItem(stack, world, player, hand, hit).toActionResult()); } public static CompatActionResult onUseWithItem_actionResult(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java index 0b44d2194..30ef31a72 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CommandManagerUtil.java @@ -5,7 +5,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; -import net.minecraft.server.world.ServerWorld; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.core.command.CommandResult; @@ -76,7 +75,7 @@ public static ServerCommandSource getCommandSource(MinecraftServer server) { } public static ServerCommandSource getCommandSource(Player player) { - return player.getEntity().getCommandSource((ServerWorld) player.getWorld()); + return player.getEntity().getCommandSource(); } public static ServerCommandSource withLevel(ServerCommandSource source, int level) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java index 710d658ee..ec615e0b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java @@ -6,14 +6,13 @@ import java.util.Optional; -// TODO: CompatActionResultを継承してItemStackを持つverも作成する public class CompatActionResult { public static final CompatActionResult SUCCESS = new CompatActionResult(ActionResult.SUCCESS, EventResult.success()); public static final CompatActionResult PASS = new CompatActionResult(ActionResult.PASS, EventResult.pass()); public static final CompatActionResult FAIL = new CompatActionResult(ActionResult.FAIL, EventResult.fail()); public static final CompatActionResult CONSUME = new CompatActionResult(ActionResult.CONSUME, EventResult.success()); - public static final CompatActionResult PASS_TO_DEFAULT_BLOCK_ACTION = new CompatActionResult(ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION, EventResult.pass()); - public static final CompatActionResult SUCCESS_SERVER = new CompatActionResult(ActionResult.SUCCESS_SERVER, EventResult.success()); + public static final CompatActionResult PASS_TO_DEFAULT_BLOCK_ACTION = new CompatActionResult(ActionResult.PASS, EventResult.pass()); + public static final CompatActionResult SUCCESS_SERVER = new CompatActionResult(ActionResult.SUCCESS, EventResult.success()); public static final CompatActionResult STOP = new CompatActionResult(ActionResult.FAIL, EventResult.stop()); private final ActionResult actionResult; @@ -37,10 +36,7 @@ public Optional getNewMidohraHandStack() { } public Optional getNewHandStack() { - if (!(actionResult instanceof ActionResult.Success)) return Optional.empty(); - - ActionResult.Success success = (ActionResult.Success) actionResult; - return Optional.ofNullable(success.getNewHandStack()); + return Optional.empty(); } public static CompatActionResult of(ActionResult result) { @@ -56,12 +52,6 @@ public static CompatActionResult of(ActionResult result) { if (result == ActionResult.CONSUME) return CONSUME; - if (result == ActionResult.PASS_TO_DEFAULT_BLOCK_ACTION) - return PASS_TO_DEFAULT_BLOCK_ACTION; - - if (result == ActionResult.SUCCESS_SERVER) - return SUCCESS_SERVER; - return PASS; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 9f73f0089..f22aa08e4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -3,7 +3,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; -import net.minecraft.server.world.ServerWorld; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; @@ -15,23 +14,23 @@ public static World getWorld(Entity entity) { } public static boolean damage(Entity target, DamageSource damageSource, float amount) { - return target.damage((ServerWorld) target.getWorld(), damageSource, amount); + return target.damage(damageSource, amount); } public static boolean damageWithThrownProjectile(Entity target, float damageAmount, Entity projectile, Entity attacker) { - return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.thrownProjectile(projectile, attacker), damageAmount); + return target.damage(DamageSourceUtil.thrownProjectile(projectile, attacker), damageAmount); } public static boolean damageWithMobProjectile(Entity target, float damageAmount, Entity projectile, LivingEntity attacker) { - return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.mobProjectile(projectile, attacker), damageAmount); + return target.damage(DamageSourceUtil.mobProjectile(projectile, attacker), damageAmount); } public static boolean damageWithMobAttack(Entity target, float damageAmount, Entity source, LivingEntity attacker) { - return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.mobAttack(attacker, source), damageAmount); + return target.damage(DamageSourceUtil.mobAttack(attacker, source), damageAmount); } public static boolean damageWithPlayerAttack(Entity target, float damageAmount, Entity source, Player attacker) { - return target.damage((ServerWorld) target.getWorld(), DamageSourceUtil.playerAttack(attacker, source), damageAmount); + return target.damage(DamageSourceUtil.playerAttack(attacker, source), damageAmount); } public static void discard(Entity entity) { @@ -39,10 +38,7 @@ public static void discard(Entity entity) { } public static void kill(Entity entity) { - if (entity.getWorld() instanceof ServerWorld) - return; - - entity.kill((ServerWorld) entity.getWorld()); + entity.kill(); } public static void setVelocity(Entity entity, double x, double y, double z) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java index 2f97b2781..5cebfe51a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java @@ -1,8 +1,10 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.block.Block; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.tag.ItemTags; +import net.minecraft.registry.tag.TagKey; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; @@ -13,11 +15,41 @@ public class EquipMaterialUtil { @Deprecated public static ToolMaterial createToolMaterial(int durability, float miningSpeedMultiplier, float attackDamage, int miningLevel, int enchantability, Ingredient repairIngredient) { - return new ToolMaterial(CompatibleToolMaterial.level2inverseTag(miningLevel), durability, miningSpeedMultiplier, attackDamage, enchantability, ItemTags.IRON_TOOL_MATERIALS); + return createToolMaterial(durability, miningSpeedMultiplier, attackDamage, miningLevel, enchantability, RepairIngredientTag.IRON_TOOL_MATERIALS); } public static ToolMaterial createToolMaterial(int durability, float miningSpeedMultiplier, float attackDamage, int miningLevel, int enchantability, RepairIngredientTag ingredientTag) { - return new ToolMaterial(CompatibleToolMaterial.level2inverseTag(miningLevel), durability, miningSpeedMultiplier, attackDamage, enchantability, ingredientTag.getTag()); + return new ToolMaterial() { + @Override + public int getDurability() { + return durability; + } + + @Override + public float getMiningSpeedMultiplier() { + return miningSpeedMultiplier; + } + + @Override + public float getAttackDamage() { + return attackDamage; + } + + @Override + public TagKey getInverseTag() { + return CompatibleToolMaterial.level2inverseTag(miningLevel); + } + + @Override + public int getEnchantability() { + return enchantability; + } + + @Override + public Ingredient getRepairIngredient() { + return ingredientTag.getIngredient(); + } + }; } public static int toInt(ArmorEquipmentType type) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index 698fe8dac..bec9f4348 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -1,13 +1,10 @@ package net.pitan76.mcpitanlib.api.util; -import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.Registries; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.registry.entry.RegistryEntryList; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; @@ -17,16 +14,7 @@ public class IngredientUtil { public static Ingredient fromTagByIdentifier(Identifier id) { - List items = ItemUtil.getItems(id); - - List> entryList = new ArrayList<>(); - for (Item item : items) { - entryList.add(Registries.ITEM.getEntry(item)); - } - - RegistryEntryList entryList2 = RegistryEntryList.of(entryList); - - return Ingredient.fromTag(entryList2); + return Ingredient.fromTag(TagKey.of(Registries.ITEM.getKey(), id)); } public static Ingredient fromTagByString(String id) { @@ -39,22 +27,16 @@ public static Ingredient fromTagByIdentifier(CompatIdentifier id) { public static List getItems(Ingredient ingredient) { List items = new ArrayList<>(); - - for (RegistryEntry entry : ingredient.getMatchingItems()) { - items.add(entry.value()); + for (int rawId : ingredient.getMatchingItemIds()) { + try { + items.add(ItemUtil.fromIndex(rawId)); + } catch (Exception ignored) {} } - return items; } public static IntList getMatchingStacksIds(Ingredient ingredient) { - IntList ids = new IntArrayList(); - - for (Item item : getItems(ingredient)) { - ids.add(ItemUtil.getRawId(item)); - } - - return ids; + return ingredient.getMatchingItemIds(); } public static List getMatchingStacksAsList(Ingredient ingredient) { @@ -62,15 +44,10 @@ public static List getMatchingStacksAsList(Ingredient ingredient) { } public static ItemStack[] getMatchingStacks(Ingredient ingredient) { - List stacks = new ArrayList<>(); - for (Item item : getItems(ingredient)) { - stacks.add(new ItemStack(item)); - } - - return stacks.toArray(new ItemStack[0]); + return ingredient.getMatchingStacks(); } public static Ingredient empty() { - return null; + return Ingredient.EMPTY; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java index ec99294b9..74ad850d4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InteractUtil.java @@ -18,8 +18,7 @@ public class InteractUtil { public static StackActionResult useItem(Item item, ItemUseEvent event) { - CompatActionResult result = CompatActionResult.create(item.use(event.getWorld(), event.user.getEntity(), event.getHand())); - return StackActionResult.create(result, event.getStack()); + return StackActionResult.create(item.use(event.getWorld(), event.user.getEntity(), event.getHand())); } public static CompatActionResult useItemOnBlock(Item item, ItemUsageContext context) { @@ -51,6 +50,7 @@ public static CompatActionResult useBlock(BlockState state, World world, Player } public static boolean onStoppingUsing(Item item, ItemStack stack, World world, Player player, int remainingUseTicks) { - return item.onStoppedUsing(stack, world, player.getEntity(), remainingUseTicks); + item.onStoppedUsing(stack, world, player.getEntity(), remainingUseTicks); + return true; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index 50e3a81fb..91ddbd793 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -365,7 +365,7 @@ public static Vec3d getVec3d(NbtCompound nbt, String key) { } public static void putItemStack(NbtCompound nbt, String key, ItemStack stack, CompatRegistryLookup registryLookup) { - NbtElement stackNbt = stack.toNbt(registryLookup.getRegistryLookup()); + NbtElement stackNbt = stack.encode(registryLookup.getRegistryLookup()); put(nbt, key, stackNbt); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java index e7395b6fc..e0b96c244 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java @@ -4,11 +4,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.*; import net.minecraft.recipe.book.CraftingRecipeCategory; -import net.minecraft.recipe.input.CraftingRecipeInput; import net.minecraft.recipe.input.RecipeInput; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.minecraft.world.World; @@ -40,7 +36,7 @@ public static ItemStack craft_2(Recipe recipe, C inve @Deprecated public static ItemStack getOutput_2(Recipe recipe, World world) { - return craft_2(recipe, (C) CraftingRecipeInput.EMPTY, world); + return recipe.getResult(world.getRegistryManager()); } public static ItemStack craft(Recipe recipe, Inventory inventory, World world) { @@ -52,17 +48,11 @@ public static ItemStack craft(Recipe recipe, Inventory inventory, World world } public static ItemStack getOutput(Recipe recipe, World world) { - return recipe.craft(null, world.getRegistryManager()); + return recipe.getResult(world.getRegistryManager()); } public static List> getAllRecipes(World world) { - RecipeManager iRecipeManager = getRecipeManager(world); - if (!(iRecipeManager instanceof ServerRecipeManager)) - return new ArrayList<>(); - - ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; - - Collection> recipes = recipeManager.values(); + Collection> recipes = getRecipeManager(world).values(); List> outRecipes = new ArrayList<>(); for (Object recipeEntryObj : recipes) { if (recipeEntryObj instanceof RecipeEntry) { @@ -83,23 +73,13 @@ public static Identifier getId(Recipe recipe) { return IdentifierUtil.id(recipe.getClass().hashCode() + ""); } - public static > CompatRecipeEntry getFirstMatch(RecipeManager iRecipeManager, CompatRecipeType type, CompatRecipeInput input, World world) { - if (!(iRecipeManager instanceof ServerRecipeManager)) - return new CompatRecipeEntry<>(null); - - ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; - + public static > CompatRecipeEntry getFirstMatch(RecipeManager recipeManager, CompatRecipeType type, CompatRecipeInput input, World world) { Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world); return recipe.map(CompatRecipeEntry::new).orElseGet(() -> new CompatRecipeEntry<>(null)); } - public static > CompatRecipeEntry getFirstMatch(RecipeManager iRecipeManager, CompatRecipeType type, CompatRecipeInput input, World world, CompatIdentifier identifier) { - if (!(iRecipeManager instanceof ServerRecipeManager)) - return new CompatRecipeEntry<>(null); - - ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; - - Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world, RegistryKey.of(RegistryKeys.RECIPE, identifier.toMinecraft())); + public static > CompatRecipeEntry getFirstMatch(RecipeManager recipeManager, CompatRecipeType type, CompatRecipeInput input, World world, CompatIdentifier identifier) { + Optional> recipe = recipeManager.getFirstMatch(type.getType(), input.getInput(), world, identifier.toMinecraft()); return recipe.map(CompatRecipeEntry::new).orElseGet(() -> new CompatRecipeEntry<>(null)); } @@ -119,17 +99,13 @@ public Optional> get(World world, CompatIdentifier id) { return get(getRecipeManager(world), id); } - public Optional> get(RecipeManager iRecipeManager, CompatIdentifier id) { - if (!(iRecipeManager instanceof ServerRecipeManager)) - return Optional.empty(); - ServerRecipeManager recipeManager = (ServerRecipeManager) iRecipeManager; - - return recipeManager.get(RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft())); + public Optional> get(RecipeManager recipeManager, CompatIdentifier id) { + return recipeManager.get(id.toMinecraft()); } public static > MatchGetter createCachedMatchGetter(RecipeType type) { return (input, world) -> { - Optional> optional = ServerRecipeManager.createCachedMatchGetter(type).getFirstMatch(input.getInput(), (ServerWorld) world); + Optional> optional = RecipeManager.createCachedMatchGetter(type).getFirstMatch(input.getInput(), world); return optional.map(CompatRecipeEntry::new); }; } @@ -139,15 +115,7 @@ public static > MatchGetter cre } public static DefaultedList getInputs(Recipe recipe) { - List ingredients = recipe.getIngredientPlacement().getIngredients(); - - DefaultedList outIngredients = DefaultedList.ofSize(ingredients.size()); - - for (int i = 0; i < ingredients.size(); i++) { - outIngredients.set(i, ingredients.get(i)); - } - - return outIngredients; + return recipe.getIngredients(); } public static DefaultedList getInputs(CompatRecipeEntry recipeEntry) { @@ -168,11 +136,11 @@ public static ItemStackList getInputsAsStack(CompatRecipeEntry recipeEntry) { } public static ItemStack getOutput(Recipe recipe, CompatRegistryLookup registryLookup) { - return recipe.craft(null, registryLookup.getRegistryLookup()); + return recipe.getResult(registryLookup.getRegistryLookup()); } public static ItemStack getOutput(CompatRecipeEntry recipeEntry, CompatRegistryLookup registryLookup) { - return recipeEntry.getRecipe().craft(null, registryLookup.getRegistryLookup()); + return recipeEntry.getRecipe().getResult(registryLookup.getRegistryLookup()); } public static CompatRecipeType getType(CompatRecipeEntry recipeEntry) { @@ -180,8 +148,7 @@ public static CompatRecipeType getType(CompatRecipeEntry recipeEntry) { } public static > ItemStackList getRemainder(CompatRecipeEntry recipeEntry, CompatRecipeInput input) { - return ItemStackList.of(); - //return ItemStackList.of(recipeEntry.getRecipe().getRemainder(input.getInput())); + return ItemStackList.of(recipeEntry.getRecipe().getRemainder(input.getInput())); } public enum CompatibilityCraftingRecipeCategory { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java index c62d07b7e..b97944b9b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java @@ -2,6 +2,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; +import net.minecraft.util.TypedActionResult; import net.pitan76.mcpitanlib.api.event.result.EventResult; import java.util.Optional; @@ -9,6 +10,7 @@ public class StackActionResult extends CompatActionResult { private final ItemStack stack; private final CompatActionResult compatActionResult; + private boolean isNewStack = false; public StackActionResult(ActionResult actionResult, EventResult eventResult, ItemStack stack) { this(new CompatActionResult(actionResult, eventResult), stack); @@ -20,6 +22,10 @@ public StackActionResult(CompatActionResult actionResult, ItemStack stack) { this.stack = stack; } + public void setNewStack(boolean b) { + isNewStack = b; + } + @Override public ActionResult toActionResult() { return compatActionResult.toActionResult(); @@ -34,13 +40,13 @@ public EventResult toEventResult() { @Override public Optional getNewHandStack() { if (hasNewStack()) - return compatActionResult.getNewHandStack(); + return Optional.ofNullable(getStack()); return Optional.empty(); } public boolean hasNewStack() { - return compatActionResult.getNewHandStack().isPresent(); + return isNewStack; } public boolean hasStack() { @@ -52,9 +58,6 @@ public CompatActionResult asCompatActionResult() { } public static StackActionResult create(CompatActionResult compatActionResult, ItemStack stack) { - if (compatActionResult.getNewHandStack().isPresent()) - return new StackActionResult(compatActionResult, compatActionResult.getNewHandStack().get()); - return new StackActionResult(compatActionResult, stack); } @@ -70,19 +73,35 @@ public static StackActionResult create(ActionResult actionResult, ItemStack stac return new StackActionResult(actionResult, null, stack); } + public static StackActionResult create(TypedActionResult result) { + StackActionResult actionResult = create(CompatActionResult.create(result.getResult()), result.getValue()); + actionResult.setNewStack(true); + return actionResult; + } + public static StackActionResult success(ItemStack stack) { - CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.SUCCESS.withNewHandStack(stack)); - return create(compatActionResult, stack); + CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.SUCCESS); + StackActionResult actionResult = create(compatActionResult, stack); + actionResult.setNewStack(true); + return actionResult; } public static StackActionResult successServer(ItemStack stack) { - CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.SUCCESS_SERVER.withNewHandStack(stack)); - return create(compatActionResult, stack); + CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.SUCCESS); + StackActionResult actionResult = create(compatActionResult, stack); + actionResult.setNewStack(true); + return actionResult; } public static StackActionResult consume(ItemStack stack) { - CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.CONSUME.withNewHandStack(stack)); - return create(compatActionResult, stack); + CompatActionResult compatActionResult = CompatActionResult.create(ActionResult.CONSUME); + StackActionResult actionResult = create(compatActionResult, stack); + actionResult.setNewStack(true); + return actionResult; + } + + public TypedActionResult toTypedActionResult() { + return new TypedActionResult<>(toActionResult(), getStack()); } public ItemStack getStack() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 85f65521e..4e3c95b5b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -180,7 +180,7 @@ public static int getBottomY(World world) { } public static int getTopY(World world) { - return world.getTopYInclusive(); + return world.getTopY(); } public static int getDimensionHeight(World world) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java index 20199a63e..1a6fd78a8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/entity/FurnaceUtil.java @@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.AbstractCookingRecipe; import net.minecraft.recipe.input.SingleStackRecipeInput; -import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.recipe.MatchGetter; @@ -17,16 +16,16 @@ public static int getDefaultCookTime() { return AbstractFurnaceBlockEntity.DEFAULT_COOK_TIME; } - public static boolean canUseAsFuel(net.pitan76.mcpitanlib.midohra.item.ItemStack stack, World world) { - return canUseAsFuel(stack.toMinecraft(), world); + public static boolean canUseAsFuel(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return canUseAsFuel(stack.toMinecraft()); } - public static boolean canUseAsFuel(ItemStack stack, World world) { - return world.getFuelRegistry().isFuel(stack); + public static boolean canUseAsFuel(ItemStack stack) { + return AbstractFurnaceBlockEntity.canUseAsFuel(stack); } public static void tick(World world, BlockPos pos, AbstractFurnaceBlockEntity blockEntity) { - AbstractFurnaceBlockEntity.tick((ServerWorld) world, pos, WorldUtil.getBlockState(world, pos), blockEntity); + AbstractFurnaceBlockEntity.tick(world, pos, WorldUtil.getBlockState(world, pos), blockEntity); } public static int getCookTime(World world, AbstractFurnaceBlockEntity furnace, MatchGetter matchGetter) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java index 59f466f23..0632da0b3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/RenderUtil.java @@ -1,18 +1,12 @@ package net.pitan76.mcpitanlib.api.util.client; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.gl.ShaderProgram; -import net.minecraft.client.gl.ShaderProgramKey; -import net.minecraft.client.gl.ShaderProgramKeys; -import net.minecraft.client.gui.screen.ingame.AbstractFurnaceScreen; import net.minecraft.client.render.GameRenderer; import net.minecraft.util.Identifier; public class RenderUtil { public static void setShaderToPositionTexProgram() { - try (ShaderProgram program = RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX)) { - RenderSystem.setShader(program); - } + RenderSystem.setShader(GameRenderer::getPositionTexProgram); } public static void setShaderColor(float red, float green, float blue, float alpha) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java index 829deb8e1..7ba434766 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ScreenUtil.java @@ -6,7 +6,6 @@ import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.render.RenderLayer; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.OrderedText; import net.minecraft.text.Text; @@ -149,11 +148,11 @@ public static int drawText(TextRenderer renderer, DrawObjectDM drawObjectDM, Ord } public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, float u, float v, int width, int height, int textureWidth, int textureHeight) { - drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, textureWidth, textureHeight); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, textureWidth, textureHeight); } public static void drawTexture(DrawObjectDM drawObjectDM, Identifier texture, int x, int y, float u, float v, int width, int height) { - drawObjectDM.getContext().drawTexture(RenderLayer::getGuiTextured, texture, x, y, u, v, width, height, 256, 256); + drawObjectDM.getContext().drawTexture(texture, x, y, u, v, width, height, 256, 256); } public static TextRenderer getTextRenderer() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java index 9d5fd3085..272bf5fdc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/SnowballEntityUtil.java @@ -7,11 +7,13 @@ public class SnowballEntityUtil { public static SnowballEntity create(World world, double x, double y, double z) { - return new SnowballEntity(world, x, y, z, ItemStackUtil.empty()); + return new SnowballEntity(world, x, y, z); } public static SnowballEntity create(World world, double x, double y, double z, ItemStack stack) { - return new SnowballEntity(world, x, y, z, stack); + SnowballEntity entity = create(world, x, y, z); + entity.setItem(stack); + return entity; } public static void setVelocity(SnowballEntity entity, double x, double y, double z, float velocity, float divergence) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java index 8983bd5d4..82bffcfb1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/event/ItemEventGenerator.java @@ -6,6 +6,6 @@ public class ItemEventGenerator { public static CompatActionResult onRightClick(Item item, ItemUseEvent e) { - return CompatActionResult.create(item.use(e.world, e.user.getPlayerEntity(), e.hand)); + return CompatActionResult.create(item.use(e.world, e.user.getPlayerEntity(), e.hand).getResult()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java index 2c6844f07..6143cfd33 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeMatcherUtil.java @@ -5,39 +5,33 @@ import net.minecraft.recipe.Recipe; import net.minecraft.recipe.RecipeMatcher; import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; -import net.pitan76.mcpitanlib.api.util.ItemStackUtil; -import net.pitan76.mcpitanlib.api.util.ItemUtil; public class RecipeMatcherUtil { public static ItemStack getStackFromId(int itemId) { - return ItemStackUtil.create(ItemUtil.fromIndex(itemId)); + return RecipeMatcher.getStackFromId(itemId); } public static int getItemId(ItemStack stack) { - return ItemUtil.getRawId(stack.getItem()); + return RecipeMatcher.getItemId(stack); } - public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output) { + public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output) { return match(matcher, entry.getRecipe(), output); } - public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output, int multiplier) { + public static boolean match(RecipeMatcher matcher, CompatibleRecipeEntry entry, IntList output, int multiplier) { return match(matcher, entry.getRecipe(), output, multiplier); } - @Deprecated - public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output) { - return false; - //return matcher.match(recipe, output); + public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output) { + return matcher.match(recipe, output); } - @Deprecated - public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output, int multiplier) { - return false; - //return matcher.match(recipe, output, multiplier); + public static boolean match(RecipeMatcher matcher, Recipe recipe, IntList output, int multiplier) { + return matcher.match(recipe, output, multiplier); } - public static void clear(RecipeMatcher matcher) { + public static void clear(RecipeMatcher matcher) { matcher.clear(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java index 694e4c3b1..130d63767 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/input/CraftingRecipeInputUtil.java @@ -1,7 +1,7 @@ package net.pitan76.mcpitanlib.api.util.recipe.input; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.RecipeFinder; +import net.minecraft.recipe.RecipeMatcher; import net.minecraft.recipe.input.CraftingRecipeInput; import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; @@ -40,11 +40,11 @@ public static net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack(Comp return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStack(input, x, y)); } - public static RecipeFinder getRecipeMatcher(CraftingRecipeInput input) { + public static RecipeMatcher getRecipeMatcher(CraftingRecipeInput input) { return input.getRecipeMatcher(); } - public static RecipeFinder getRecipeMatcher(CompatRecipeInput input) { + public static RecipeMatcher getRecipeMatcher(CompatRecipeInput input) { Optional recipeInput = get(input); if (!recipeInput.isPresent()) return null; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java index 5c0c9adfe..abe0d816e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java @@ -41,7 +41,7 @@ public static int getBottomY(WorldView world) { } public static int getTopY(WorldView world) { - return world.getTopYInclusive(); + return world.getTopY(); } public static boolean isChunkLoaded(WorldView world, BlockPos pos) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java index 00902072b..7a1572db1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/player/ItemCooldown.java @@ -14,7 +14,7 @@ public ItemCooldown(Player player) { public boolean isCoolingDown(Item item) { for (ItemStack stack : player.getMain()) { if (stack.getItem() == item) { - return player.getItemCooldownManager().isCoolingDown(stack); + return player.getItemCooldownManager().isCoolingDown(item); } } @@ -24,7 +24,7 @@ public boolean isCoolingDown(Item item) { public void set(Item item, int duration) { for (ItemStack stack : player.getMain()) { if (stack.getItem() == item) { - player.getItemCooldownManager().set(stack, duration); + player.getItemCooldownManager().set(item, duration); } } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java index 47f69c5f9..245d20fff 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java @@ -10,18 +10,16 @@ private FuelRegistry() { } - // TODO: 1.21.2 public static void register(int time, ItemConvertible... item) { - //dev.architectury.registry.fuel.FuelRegistry.register(time, item); + dev.architectury.registry.fuel.FuelRegistry.register(time, item); } - // TODO: 1.21.2 + @Deprecated public static int get(ItemStack stack) { - return 0; - //return dev.architectury.registry.fuel.FuelRegistry.get(stack); + return dev.architectury.registry.fuel.FuelRegistry.get(stack); } public static int get(World world, ItemStack stack) { - return world.getFuelRegistry().getFuelTicks(stack); + return dev.architectury.registry.fuel.FuelRegistry.get(stack); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java index 33dbde8bf..72946654e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.loot.context.LootWorldContext; +import net.minecraft.loot.context.LootContextParameterSet; import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.SimpleNamedScreenHandlerFactory; import net.minecraft.server.world.ServerWorld; @@ -98,7 +98,7 @@ public class AbstractBlockMixin { } @Inject(method = "getDroppedStacks", at = @At("HEAD"), cancellable = true) - private void mcpitanlib$inject_getDroppedStacks(BlockState state, LootWorldContext.Builder builder, CallbackInfoReturnable> cir) { + private void mcpitanlib$inject_getDroppedStacks(BlockState state, LootContextParameterSet.Builder builder, CallbackInfoReturnable> cir) { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java index 24bc30cb4..9a79a2f02 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeManagerMixin.java @@ -1,7 +1,11 @@ package net.pitan76.mcpitanlib.mixin; -import com.llamalad7.mixinextras.sugar.Local; -import net.minecraft.recipe.*; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; +import com.google.gson.JsonElement; +import net.minecraft.recipe.RecipeEntry; +import net.minecraft.recipe.RecipeManager; +import net.minecraft.recipe.RecipeType; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import net.minecraft.util.profiler.Profiler; @@ -10,18 +14,19 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import java.util.SortedMap; +import java.util.Map; -@Mixin(ServerRecipeManager.class) +@Mixin(RecipeManager.class) public class RecipeManagerMixin { - @Inject(method = "prepare(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)Lnet/minecraft/recipe/PreparedRecipes;", + @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/util/profiler/Profiler;)V", locals = LocalCapture.CAPTURE_FAILHARD, at = @At(value = "TAIL")) - private void mcpitanlib$invokeApply(ResourceManager resourceManager, Profiler profiler, CallbackInfoReturnable cir, @Local SortedMap> sortedMap) { + private void mcpitanlib$invokeApply(Map map, ResourceManager resourceManager, Profiler profiler, CallbackInfo ci, ImmutableMultimap.Builder, RecipeEntry> builder, ImmutableMap.Builder> builder2) { if (RecipeManagerRegistry.managers.isEmpty()) return; - RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(sortedMap, resourceManager, profiler))); + RecipeManagerRegistry.managers.forEach((manager) -> manager.apply(new RecipeManagerEvent(map, resourceManager, profiler, builder2, builder))); } } diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/diamond_tool_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/diamond_tool_materials.json new file mode 100644 index 000000000..f44f30dd5 --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/diamond_tool_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:diamond" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/gold_tool_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/gold_tool_materials.json new file mode 100644 index 000000000..07e9f66a3 --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/gold_tool_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gold_ingot" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/iron_tool_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/iron_tool_materials.json new file mode 100644 index 000000000..c656021bd --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/iron_tool_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:iron_ingot" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/leather_armor_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/leather_armor_materials.json new file mode 100644 index 000000000..71b797d35 --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/leather_armor_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:leather" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/netherite_tool_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/netherite_tool_materials.json new file mode 100644 index 000000000..bd6929df7 --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/netherite_tool_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherite_ingot" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/stone_tool_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/stone_tool_materials.json new file mode 100644 index 000000000..e579c141b --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/stone_tool_materials.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:cobblestone", + "minecraft:blackstone", + "minecraft:cobbled_deepslate" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/turtle_helmet_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/turtle_helmet_materials.json new file mode 100644 index 000000000..d1d4c27fb --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/turtle_helmet_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:turtle_scute" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/mcpitanlib/tags/items/wooden_tool_materials.json b/common/src/main/resources/data/mcpitanlib/tags/items/wooden_tool_materials.json new file mode 100644 index 000000000..97fee2c01 --- /dev/null +++ b/common/src/main/resources/data/mcpitanlib/tags/items/wooden_tool_materials.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:planks" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java index 1143f4ca7..421bd6016 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/event/neoforge/WorldRenderRegistryImpl.java @@ -65,11 +65,6 @@ public ClientWorld getWorld() { return MinecraftClient.getInstance().world; } - @Override - public Profiler getProfiler() { - return MinecraftClient.getInstance().getProfiler(); - } - @Deprecated @Override public boolean isAdvancedTranslucency() { @@ -138,11 +133,6 @@ public ClientWorld getWorld() { return MinecraftClient.getInstance().world; } - @Override - public Profiler getProfiler() { - return MinecraftClient.getInstance().getProfiler(); - } - @Deprecated @Override public boolean isAdvancedTranslucency() { @@ -208,11 +198,6 @@ public ClientWorld getWorld() { return MinecraftClient.getInstance().world; } - @Override - public Profiler getProfiler() { - return MinecraftClient.getInstance().getProfiler(); - } - @Deprecated @Override public boolean isAdvancedTranslucency() { From 049f0aa2bd417b3eb0f098231fac0c8deee2866c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:01:35 +0900 Subject: [PATCH 412/622] fix APIs m 1211 --- .../api/block/CompatChestBlock.java | 15 ++- .../api/block/CompatPillarBlock.java | 16 ++- .../mcpitanlib/api/block/CompatSlabBlock.java | 18 ++- .../api/block/CompatStairsBlock.java | 29 +++-- .../api/block/v2/BlockSettingsBuilder.java | 18 +++ .../mcpitanlib/api/block/v2/CompatBlock.java | 1 - .../api/block/v2/CompatBlockProvider.java | 13 ++ .../api/event/block/OutlineShapeEvent.java | 4 + .../mcpitanlib/api/item/ExtendBlockItem.java | 5 +- .../mcpitanlib/api/item/ExtendItem.java | 1 - .../api/item/ExtendItemProvider.java | 3 +- .../pitan76/mcpitanlib/api/item/FoodItem.java | 28 +++++ .../mcpitanlib/api/item/v2/CompatItem.java | 6 + .../api/item/v2/CompatItemProvider.java | 43 +++++++ .../api/item/v2/CompatibleItemSettings.java | 2 + .../api/item/v2/ItemSettingsBuilder.java | 116 ++++++++++++++++++ .../pitan76/mcpitanlib/mixin/ItemMixin.java | 14 +++ .../mcpitanlib/test/ExampleGuiBlock.java | 2 +- 18 files changed, 305 insertions(+), 29 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/FoodItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java index b507732c8..f33d401dd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatChestBlock.java @@ -6,15 +6,23 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.entity.ChestBlockEntity; import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import java.util.function.Supplier; -public class CompatChestBlock extends ChestBlock { +public class CompatChestBlock extends ChestBlock implements CompatBlockProvider { public CompatChestBlock(Settings settings, Supplier> supplier) { super(settings, supplier); } + public CompatibleBlockSettings compatSettings; + + public CompatChestBlock(CompatibleBlockSettings settings, Supplier> supplier) { + this(settings.build(), supplier); + } + /** * @deprecated Use {@link #createBlockEntity(TileCreateEvent)} instead. */ @@ -30,4 +38,9 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { public BlockEntity createBlockEntity(TileCreateEvent event) { return super.createBlockEntity(event.getBlockPos(), event.getBlockState()); } + + @Override + public CompatibleBlockSettings getCompatSettings() { + return compatSettings; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java index 8f273e2b0..f85fc2079 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java @@ -8,20 +8,30 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.EnumProperty; import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; -public class CompatPillarBlock extends PillarBlock implements ExtendBlockProvider { +public class CompatPillarBlock extends PillarBlock implements CompatBlockProvider { public static final EnumProperty AXIS = PillarBlock.AXIS; + public CompatibleBlockSettings settings; + + @Override + public CompatibleBlockSettings getCompatSettings() { + return settings; + } + public CompatPillarBlock(Settings settings) { super(settings); } public CompatPillarBlock(CompatibleBlockSettings settings) { this(settings.build()); + this.settings = settings; } public void appendProperties(AppendPropertiesArgs args) { @@ -48,13 +58,13 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { @Deprecated @Override public void appendProperties(AppendPropertiesArgs args, Options options) { - ExtendBlockProvider.super.appendProperties(args, options); + CompatBlockProvider.super.appendProperties(args, options); } @Deprecated @Override public BlockState getPlacementState(PlacementStateArgs args, Options options) { - return ExtendBlockProvider.super.getPlacementState(args, options); + return CompatBlockProvider.super.getPlacementState(args, options); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java index 8adfe296a..f00c541eb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java @@ -4,23 +4,31 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.SlabBlock; -import net.minecraft.block.StairsBlock; import net.minecraft.block.enums.SlabType; import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.EnumProperty; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.CanPathfindThroughArgs; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; -public class CompatSlabBlock extends SlabBlock implements ExtendBlockProvider { +public class CompatSlabBlock extends SlabBlock implements CompatBlockProvider { public static final EnumProperty TYPE = SlabBlock.TYPE; public static final BooleanProperty WATERLOGGED = SlabBlock.WATERLOGGED; + public CompatibleBlockSettings settings; + + @Override + public CompatibleBlockSettings getCompatSettings() { + return settings; + } + public CompatSlabBlock(Settings settings) { super(settings); } @@ -53,13 +61,13 @@ public BlockState getPlacementState(ItemPlacementContext ctx) { @Deprecated @Override public void appendProperties(AppendPropertiesArgs args, Options options) { - ExtendBlockProvider.super.appendProperties(args, options); + CompatBlockProvider.super.appendProperties(args, options); } @Deprecated @Override public BlockState getPlacementState(PlacementStateArgs args, Options options) { - return ExtendBlockProvider.super.getPlacementState(args, options); + return CompatBlockProvider.super.getPlacementState(args, options); } @Deprecated @@ -84,6 +92,6 @@ public boolean canPathfindThrough(CanPathfindThroughArgs args) { @Override public Boolean canPathfindThrough(CanPathfindThroughArgs args, Options options) { - return ExtendBlockProvider.super.canPathfindThrough(args, options); + return CompatBlockProvider.super.canPathfindThrough(args, options); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java index f879b58ca..6ad2e57ab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatStairsBlock.java @@ -9,6 +9,8 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.EnumProperty; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; @@ -20,7 +22,7 @@ import net.pitan76.mcpitanlib.api.state.property.DirectionProperty; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; -public class CompatStairsBlock extends StairsBlock implements ExtendBlockProvider { +public class CompatStairsBlock extends StairsBlock implements CompatBlockProvider { public static final DirectionProperty FACING = CompatProperties.HORIZONTAL_FACING; public static final EnumProperty HALF = StairsBlock.HALF; @@ -29,6 +31,15 @@ public class CompatStairsBlock extends StairsBlock implements ExtendBlockProvide public CompatibleBlockSettings compatSettings; + /** + * get compatible block settings + * @return CompatibleBlockSettings + */ + @Override + public CompatibleBlockSettings getCompatSettings() { + return compatSettings; + } + public CompatStairsBlock(BlockState baseBlockState, Settings settings) { super(baseBlockState, settings); } @@ -38,14 +49,6 @@ public CompatStairsBlock(BlockState baseBlockState, CompatibleBlockSettings sett this.compatSettings = settings; } - /** - * get compatible block settings - * @return CompatibleBlockSettings - */ - public CompatibleBlockSettings getCompatSettings() { - return compatSettings; - } - public VoxelShape getOutlineShape(OutlineShapeEvent event) { return super.getOutlineShape(event.state, event.world, event.pos, event.context); } @@ -80,19 +83,19 @@ protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos @Deprecated @Override public void appendProperties(AppendPropertiesArgs args, Options options) { - ExtendBlockProvider.super.appendProperties(args, options); + CompatBlockProvider.super.appendProperties(args, options); } @Deprecated @Override public BlockState getPlacementState(PlacementStateArgs args, Options options) { - return ExtendBlockProvider.super.getPlacementState(args, options); + return CompatBlockProvider.super.getPlacementState(args, options); } @Deprecated @Override public VoxelShape getOutlineShape(OutlineShapeEvent event, Options options) { - return ExtendBlockProvider.super.getOutlineShape(event, options); + return CompatBlockProvider.super.getOutlineShape(event, options); } @Deprecated @@ -117,7 +120,7 @@ public boolean canPathfindThrough(CanPathfindThroughArgs args) { @Override public Boolean canPathfindThrough(CanPathfindThroughArgs args, Options options) { - return ExtendBlockProvider.super.canPathfindThrough(args, options); + return CompatBlockProvider.super.canPathfindThrough(args, options); } public BlockState getBaseBlockState() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java index 653f9b079..e0d04ee8b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.block.v2; +import net.minecraft.block.AbstractBlock; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; @@ -23,6 +24,10 @@ public class BlockSettingsBuilder { public ToIntFunction luminance; public BlockSettingsBuilder(CompatIdentifier id) { + this.id = id; + } + + public BlockSettingsBuilder() { } @@ -78,6 +83,15 @@ public BlockSettingsBuilder luminance(ToIntFunction luminance) { } public CompatibleBlockSettings build() { + return build(id); + } + + public AbstractBlock.Settings _build() { + return build().build(); + } + + public CompatibleBlockSettings build(CompatIdentifier id) { + CompatibleBlockSettings settings = CompatibleBlockSettings.of(id); if (material != null) settings = CompatibleBlockSettings.of(id, material); @@ -94,4 +108,8 @@ public CompatibleBlockSettings build() { return settings.strength(hardness, resistance).sounds(blockSoundGroup); } + + public AbstractBlock.Settings _build(CompatIdentifier id) { + return build(id).build(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index aabdcb251..57f75cc60 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.block.v2; -import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java new file mode 100644 index 000000000..5a5d7fe80 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.block.v2; + +import net.minecraft.block.Block; +import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; + +public interface CompatBlockProvider extends ExtendBlockProvider { + CompatibleBlockSettings getCompatSettings(); + + default BlockWrapper getWrapper() { + return this instanceof Block ? BlockWrapper.of((Block) this) : BlockWrapper.of(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java index c4586bfb7..3eec1b815 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java @@ -39,4 +39,8 @@ public ShapeContext getContext() { public > T getProperty(Property property) { return state.get(property); } + + public > boolean containsProperty(Property property) { + return state.contains(property); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java index 1a1d0d7c0..fc5304c1d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java @@ -20,7 +20,8 @@ import java.util.List; -public class ExtendBlockItem extends BlockItem { +public class ExtendBlockItem extends BlockItem implements ExtendItemProvider { + public ExtendBlockItem(Block block, Settings settings) { super(block, settings); } @@ -29,8 +30,6 @@ public ExtendBlockItem(Block block, CompatibleItemSettings settings) { super(block, settings.build()); } - - // ExtendItem @Deprecated @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index a34296fa2..1857c754b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -133,7 +133,6 @@ public CompatActionResult onRightClickOnEntity(ItemUseOnEntityEvent event) { * @param dummy Dummy * @return boolean */ - // TODO: Remove this method in 1.21.2 public boolean hasRecipeRemainder(Dummy dummy) { return false; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java index 76a6dc6de..7742fa05e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItemProvider.java @@ -4,6 +4,7 @@ import net.minecraft.util.Rarity; import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; public interface ExtendItemProvider { @@ -13,7 +14,7 @@ public interface ExtendItemProvider { * @param event ItemUseEvent * @return ActionResultType */ - default CompatActionResult onRightClick(ItemUseEvent event, Options options) { + default StackActionResult onRightClick(ItemUseEvent event, Options options) { options.cancel = false; return null; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/FoodItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/FoodItem.java new file mode 100644 index 000000000..a188233b2 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/FoodItem.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.api.item; + +import net.pitan76.mcpitanlib.api.item.v2.CompatItem; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.v2.ItemSettingsBuilder; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class FoodItem extends CompatItem { + public FoodItem(int hunger, float saturation, CompatIdentifier id) { + this(new ItemSettingsBuilder().foodComponent(CompatFoodComponent.create().setHunger(hunger).setSaturation(saturation)).build(id)); + } + + public FoodItem(CompatFoodComponent component, CompatIdentifier id) { + this(new ItemSettingsBuilder().foodComponent(component).build(id)); + } + + public FoodItem(CompatFoodComponent component, ItemSettingsBuilder builder, CompatIdentifier id) { + this(builder.foodComponent(component).build(id)); + } + + public FoodItem(CompatFoodComponent component, CompatibleItemSettings settings) { + this(settings.food(component)); + } + + public FoodItem(CompatibleItemSettings settings) { + super(settings); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java index 93535f5d9..4c00d415a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java @@ -12,6 +12,7 @@ import net.pitan76.mcpitanlib.api.item.consume.CompatUseAction; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; import net.pitan76.mcpitanlib.api.util.CompatRarity; +import net.pitan76.mcpitanlib.core.Dummy; import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; public class CompatItem extends ExtendItem { @@ -67,6 +68,11 @@ public boolean canRepair(CanRepairArgs args) { return tag != null && tag.contains(args.stack); } + @Override + public boolean hasRecipeRemainder(Dummy dummy) { + return settings.recipeRemainder != null; + } + @Override protected String getOrCreateTranslationKey() { if (settings.changedTranslationKey) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java new file mode 100644 index 000000000..9b115e77c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java @@ -0,0 +1,43 @@ +package net.pitan76.mcpitanlib.api.item.v2; + +import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.event.item.CanRepairArgs; +import net.pitan76.mcpitanlib.api.event.item.EnchantabilityArgs; +import net.pitan76.mcpitanlib.api.event.item.EnchantableArgs; +import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.args.RarityArgs; +import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; +import net.pitan76.mcpitanlib.api.item.consume.CompatUseAction; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; +import net.pitan76.mcpitanlib.api.util.CompatRarity; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; + +public interface CompatItemProvider extends ExtendItemProvider { + CompatibleItemSettings getCompatSettings(); + + default ItemWrapper getWrapper() { + return this instanceof Item ? ItemWrapper.of((Item) this) : ItemWrapper.of(); + } + + default CompatUseAction getUseAction(UseActionArgs args, Options options) { + options.cancel = false; + return null; + } + + default CompatRarity getRarity(RarityArgs args) { + return getCompatSettings().rarity; + } + + default boolean isEnchantable(EnchantableArgs args) { + return getCompatSettings().enchantability != -1; + } + + default int getEnchantability(EnchantabilityArgs args) { + return getCompatSettings().enchantability; + } + + default boolean canRepair(CanRepairArgs args) { + RepairIngredientTag tag = getCompatSettings().repairIngredientTag; + return tag != null && tag.contains(args.stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java index 26491fdd7..1f4ef9c75 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java @@ -24,6 +24,7 @@ public class CompatibleItemSettings extends net.pitan76.mcpitanlib.api.item.Comp public CompatRarity rarity = CompatRarity.COMMON; public int enchantability = -1; public RepairIngredientTag repairIngredientTag = null; + public Item recipeRemainder = null; public CompatibleItemSettings(CompatIdentifier identifier) { super(); @@ -81,6 +82,7 @@ public CompatibleItemSettings maxDamageIfAbsent(int maxDamage) { @Override public CompatibleItemSettings recipeRemainder(Item recipeRemainder) { super.recipeRemainder(recipeRemainder); + this.recipeRemainder = recipeRemainder; return this; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java new file mode 100644 index 000000000..da754ba07 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java @@ -0,0 +1,116 @@ +package net.pitan76.mcpitanlib.api.item.v2; + +import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; +import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; +import net.pitan76.mcpitanlib.api.item.ExtendSettings; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.CompatRarity; +import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; + +public class ItemSettingsBuilder { + + public CompatIdentifier id; + public int maxCount = -1; + public int maxDamage = -1; + public int maxDamageIfAbsent = -1; + public int enchantability = -1; + public RepairIngredientTag repairIngredientTag; + public CompatFoodComponent foodComponent; + public CompatRarity rarity; + + public ItemGroupWrapper itemGroupWrapper; + public CreativeTabBuilder itemGroupBuilder; + + public ItemSettingsBuilder(CompatIdentifier id) { + this.id = id; + } + + public ItemSettingsBuilder() { + + } + + public ItemSettingsBuilder addGroup(ItemGroupWrapper itemGroup) { + itemGroupWrapper = itemGroup; + return this; + } + + public ItemSettingsBuilder addGroup(CreativeTabBuilder itemGroup) { + itemGroupBuilder = itemGroup; + return this; + } + + public ItemSettingsBuilder maxCount(int maxCount) { + this.maxCount = maxCount; + return this; + } + + public ItemSettingsBuilder maxDamage(int maxDamage) { + this.maxDamage = maxDamage; + return this; + } + + public ItemSettingsBuilder maxDamageIfAbsent(int maxDamage) { + this.maxDamageIfAbsent = maxDamage; + return this; + } + + public ItemSettingsBuilder enchantability(int enchantability) { + this.enchantability = enchantability; + return this; + } + + public ItemSettingsBuilder repairable(RepairIngredientTag repairIngredientTag) { + this.repairIngredientTag = repairIngredientTag; + return this; + } + + public ItemSettingsBuilder repairable(CompatIdentifier repairIngredientTag) { + this.repairIngredientTag = new RepairIngredientTag(repairIngredientTag); + return this; + } + + public ItemSettingsBuilder foodComponent(CompatFoodComponent foodComponent) { + this.foodComponent = foodComponent; + return this; + } + + public ItemSettingsBuilder rarity(CompatRarity rarity) { + this.rarity = rarity; + return this; + } + + public CompatibleItemSettings build() { + return build(id); + } + + public ExtendSettings _build() { + return build().build(); + } + + public CompatibleItemSettings build(CompatIdentifier id) { + CompatibleItemSettings settings = new CompatibleItemSettings(id); + + if (itemGroupWrapper != null) settings.addGroup(itemGroupWrapper); + if (itemGroupBuilder != null) settings.addGroup(itemGroupBuilder); + + if (maxCount != -1) settings.maxCount(maxCount); + + if (maxDamage != -1) settings.maxDamage(maxDamage); + + if (maxDamageIfAbsent != -1) settings.maxDamageIfAbsent(maxDamageIfAbsent); + + if (rarity != null) settings.rarity(rarity); + if (foodComponent != null) settings.food(foodComponent); + + if (enchantability != -1) settings.enchantable(enchantability); + + if (repairIngredientTag != null) settings.repairable(repairIngredientTag); + + return settings; + } + + public ExtendSettings _build(CompatIdentifier id) { + return build(id).build(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index dd857bee0..8862357ae 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -3,6 +3,7 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.item.consume.UseAction; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -17,6 +18,8 @@ import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider.Options; +import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -198,4 +201,15 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } + + @Inject(method = "getUseAction", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getUseAction(ItemStack stack, CallbackInfoReturnable cir) { + if (this instanceof CompatItemProvider) { + CompatItemProvider provider = (CompatItemProvider) this; + Options options = new Options(); + UseAction returnValue = provider.getUseAction(new UseActionArgs(stack), options).get(); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java index 4641409f8..7a52d1587 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/test/ExampleGuiBlock.java @@ -2,7 +2,7 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.text.Text; -import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.v2.CompatBlock; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; import net.pitan76.mcpitanlib.api.event.container.factory.DisplayNameArgs; From b8b28e3132b80786765d8d077609439aa2f8c101 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:17:26 +0900 Subject: [PATCH 413/622] fix-1211-2 --- .../pitan76/mcpitanlib/api/entity/Player.java | 30 ------------------- .../mcpitanlib/api/item/ExtendBlockItem.java | 2 -- .../mcpitanlib/api/item/ExtendItem.java | 13 ++++---- .../pitan76/mcpitanlib/mixin/ItemMixin.java | 4 +-- 4 files changed, 7 insertions(+), 42 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 9a12763a1..f2382012d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -344,11 +344,6 @@ public Direction getHorizontalFacing() { return getEntity().getHorizontalFacing(); } - // TODO: 1.21.2 - public void eatFood(World world, ItemStack stack, CompatFoodComponent foodComponentBuilder) { - //getEntity().eatFood(world, stack, foodComponentBuilder.build()); - } - public double getX() { return getEntity().getX(); } @@ -478,35 +473,10 @@ public void setTotalExperience(int experience) { getEntity().totalExperience = experience; } - // TODO: 1.21.2 - public boolean isFallFlying() { - return false; - } - public boolean isSwimming() { return getEntity().isSwimming(); } - // TODO: 1.21.2 - public void startFallFlying() { - - } - - // TODO: 1.21.2 - public void stopFallFlying() { - - } - - // TODO: 1.21.2 - public int getFallFlyingTicks() { - return 0; - } - - // TODO: 1.21.2 - public boolean checkFallFlying() { - return false; - } - public void setStackInHand(Hand hand, ItemStack stack) { getEntity().setStackInHand(hand, stack); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java index fc5304c1d..226e8ed29 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendBlockItem.java @@ -56,9 +56,7 @@ public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)).toActionResult(); } - // TODO: Remove this method @Deprecated - //@Override public boolean hasRecipeRemainder() { return hasRecipeRemainder(new Dummy()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java index 1857c754b..28b8af8e0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/ExtendItem.java @@ -62,7 +62,7 @@ public UseAction getUseAction(ItemStack stack) { } @Deprecated - //@Override + @Override public boolean hasRecipeRemainder() { return hasRecipeRemainder(new Dummy()); } @@ -176,9 +176,8 @@ public Rarity getRarity(ItemStack stack) { return Rarity.COMMON; } - // TODO: 1.21.2 @Deprecated - //@Override + @Override public boolean isEnchantable(ItemStack stack) { return isEnchantable(new EnchantableArgs(stack)); } @@ -187,9 +186,8 @@ public boolean isEnchantable(EnchantableArgs args) { return false; } - // TODO: 1.21.2 @Deprecated - //@Override + @Override public int getEnchantability() { return getEnchantability(new EnchantabilityArgs()); } @@ -238,15 +236,14 @@ public float getBonusAttackDamage(BonusAttackDamageArgs args) { return super.getBonusAttackDamage(args.target, args.baseAttackDamage, args.damageSource); } - // TODO: 1.21.2 @Deprecated - //@Override + @Override public boolean canRepair(ItemStack stack, ItemStack ingredient) { return canRepair(new CanRepairArgs(stack, ingredient)); } public boolean canRepair(CanRepairArgs args) { - return false; + return super.canRepair(args.stack, args.ingredient); } @Deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 8862357ae..aa79880b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -3,7 +3,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.damage.DamageSource; -import net.minecraft.item.consume.UseAction; import net.minecraft.item.tooltip.TooltipType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -13,6 +12,7 @@ import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.UseAction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; @@ -207,7 +207,7 @@ public class ItemMixin { if (this instanceof CompatItemProvider) { CompatItemProvider provider = (CompatItemProvider) this; Options options = new Options(); - UseAction returnValue = provider.getUseAction(new UseActionArgs(stack), options).get(); + UseAction returnValue = provider.getUseAction(new UseActionArgs(stack), options).getUseAction(); if (options.cancel) cir.setReturnValue(returnValue); } From 621e6f02ed69b84ce45f4bd57965e8ce95fd97a5 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:18:30 +0900 Subject: [PATCH 414/622] fix-1211-3 --- .../java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java index 245d20fff..42062ef4e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java @@ -2,7 +2,6 @@ import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; -import net.minecraft.resource.featuretoggle.FeatureSet; import net.minecraft.world.World; public class FuelRegistry { From f29626377a67688faa3d817f3b860e4af6640a60 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:21:48 +0900 Subject: [PATCH 415/622] use compatitemprovider --- .../api/item/CompatibleArmorItem.java | 14 +++++++++++++- .../api/item/tool/CompatibleAxeItem.java | 16 +++++++++++++--- .../api/item/tool/CompatibleHoeItem.java | 16 +++++++++++++--- .../item/tool/CompatibleMiningToolItem.java | 15 ++++++++++++--- .../api/item/tool/CompatiblePickaxeItem.java | 16 +++++++++++++--- .../api/item/tool/CompatibleShearsItem.java | 16 +++++++++++++--- .../api/item/tool/CompatibleShovelItem.java | 14 +++++++++++--- .../api/item/tool/CompatibleSwordItem.java | 16 +++++++++++++--- .../api/item/tool/CompatibleToolItem.java | 15 ++++++++++++--- .../api/item/v2/ExtendBlockItem.java | 18 +++++++++++++----- 10 files changed, 126 insertions(+), 30 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java index 77764f373..95a8bc572 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java @@ -5,18 +5,30 @@ import net.minecraft.registry.entry.RegistryEntry; import java.util.Map; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; -public class CompatibleArmorItem extends ArmorItem implements ExtendItemProvider { +public class CompatibleArmorItem extends ArmorItem implements CompatItemProvider { public final ArmorEquipmentType type; public final CompatibleArmorMaterial material; @Deprecated public static final Map> CACHE = new java.util.HashMap<>(); + + public CompatibleItemSettings settings; + public CompatibleArmorItem(CompatibleArmorMaterial material, ArmorEquipmentType type, CompatibleItemSettings settings) { super(material.build(), type.getType(), settings.build()); this.type = type; this.material = material; + + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java index 5e133bfc8..708c87ca5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleAxeItem.java @@ -9,17 +9,27 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; -public class CompatibleAxeItem extends AxeItem implements ExtendItemProvider { +public class CompatibleAxeItem extends AxeItem implements CompatItemProvider { + + public CompatibleItemSettings settings; + public CompatibleAxeItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material.build(), settings.build()); + this.settings = settings; } public CompatibleAxeItem(float attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, settings.build()); + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java index dfe15a81f..252146370 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleHoeItem.java @@ -9,17 +9,27 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; + +public class CompatibleHoeItem extends HoeItem implements CompatItemProvider { + + public CompatibleItemSettings settings; -public class CompatibleHoeItem extends HoeItem implements ExtendItemProvider { public CompatibleHoeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material.build(), settings.build()); + this.settings = settings; } public CompatibleHoeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, settings.build()); + this.settings = settings; + } + + @Override + public net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings getCompatSettings() { + return settings; } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index d039a86e7..afdc2a73d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -10,12 +10,15 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; -public class CompatibleMiningToolItem extends MiningToolItem implements ExtendItemProvider { +public class CompatibleMiningToolItem extends MiningToolItem implements CompatItemProvider { + + public CompatibleItemSettings settings; + @Deprecated protected CompatibleMiningToolItem(float attackDamage, float attackSpeed, ToolMaterial material, net.minecraft.registry.tag.TagKey effectiveBlocks, Settings settings) { super(material, effectiveBlocks, settings); @@ -23,6 +26,12 @@ protected CompatibleMiningToolItem(float attackDamage, float attackSpeed, ToolMa public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, TagKey tagKey, CompatibleItemSettings settings) { this(attackDamage, attackSpeed, material.build(), tagKey.getTagKey(), settings.build()); + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java index a56bc279e..cd0752d20 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatiblePickaxeItem.java @@ -9,17 +9,27 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; + +public class CompatiblePickaxeItem extends PickaxeItem implements CompatItemProvider { + + public CompatibleItemSettings settings; -public class CompatiblePickaxeItem extends PickaxeItem implements ExtendItemProvider { public CompatiblePickaxeItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material.build(), settings.build()); + this.settings = settings; } public CompatiblePickaxeItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, settings.build()); + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java index e1cd419c5..9b3b190c3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShearsItem.java @@ -8,17 +8,27 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; -public class CompatibleShearsItem extends ShearsItem implements ExtendItemProvider { +public class CompatibleShearsItem extends ShearsItem implements CompatItemProvider { + + public CompatibleItemSettings settings; + + @Deprecated public CompatibleShearsItem(Settings settings) { super(settings); } public CompatibleShearsItem(CompatibleItemSettings settings) { this(settings.build()); + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java index 39d94d223..e9b2df5d1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleShovelItem.java @@ -9,11 +9,14 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; -public class CompatibleShovelItem extends ShovelItem implements ExtendItemProvider { +public class CompatibleShovelItem extends ShovelItem implements CompatItemProvider { + + public CompatibleItemSettings settings; + public CompatibleShovelItem(CompatibleToolMaterial material, float attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material.build(), settings.build()); } @@ -22,6 +25,11 @@ public CompatibleShovelItem(float attackDamage, float attackSpeed, ToolMaterial super(material, settings.build()); } + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; + } + public boolean overrideIsSuitableFor(BlockState state) { return super.isCorrectForDrops(getDefaultStack(), state); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java index 040f22cb6..1fa2f0ea3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleSwordItem.java @@ -9,17 +9,27 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; + +public class CompatibleSwordItem extends SwordItem implements CompatItemProvider { + + public CompatibleItemSettings settings; -public class CompatibleSwordItem extends SwordItem implements ExtendItemProvider { public CompatibleSwordItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatibleItemSettings settings) { super(material.build(), settings.build()); + this.settings = settings; } public CompatibleSwordItem(int attackDamage, float attackSpeed, ToolMaterial material, CompatibleItemSettings settings) { super(material, settings.build()); + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java index 1e64a0b81..f9649951d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleToolItem.java @@ -9,10 +9,13 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; + +public class CompatibleToolItem extends ToolItem implements CompatItemProvider { + + public CompatibleItemSettings settings; -public class CompatibleToolItem extends ToolItem implements ExtendItemProvider { @Deprecated protected CompatibleToolItem(ToolMaterial material, Settings settings) { super(material, settings); @@ -20,6 +23,12 @@ protected CompatibleToolItem(ToolMaterial material, Settings settings) { public CompatibleToolItem(CompatibleToolMaterial material, CompatibleItemSettings settings) { this(material.build(), settings.build()); + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } public boolean overrideIsSuitableFor(BlockState state) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java index 9f852fa6a..518062201 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ExtendBlockItem.java @@ -9,20 +9,28 @@ import net.minecraft.util.ActionResult; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; -import net.pitan76.mcpitanlib.api.item.CompatibleItemSettings; -import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; import java.util.List; -public class ExtendBlockItem extends BlockItem implements ExtendItemProvider { +public class ExtendBlockItem extends BlockItem implements CompatItemProvider { + + public CompatibleItemSettings settings; + + @Deprecated public ExtendBlockItem(Block block, Settings settings) { super(block, settings); } public ExtendBlockItem(Block block, CompatibleItemSettings settings) { this(block, settings.build()); + this.settings = settings; + } + + @Override + public CompatibleItemSettings getCompatSettings() { + return settings; } @Deprecated @@ -35,7 +43,7 @@ public ActionResult useOnBlock(ItemUsageContext context) { @Deprecated @Override public CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent event, Options options) { - return ExtendItemProvider.super.onRightClickOnBlock(event, options); + return CompatItemProvider.super.onRightClickOnBlock(event, options); } public CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent event) { @@ -51,7 +59,7 @@ public void appendTooltip(ItemStack stack, TooltipContext context, List to @Deprecated @Override public void appendTooltip(ItemAppendTooltipEvent event, Options options) { - ExtendItemProvider.super.appendTooltip(event, options); + CompatItemProvider.super.appendTooltip(event, options); } public void appendTooltip(ItemAppendTooltipEvent event) { From edf813709458fdeef9362e5377ad66c0ecacbd5a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:21:48 +0900 Subject: [PATCH 416/622] fix 1231 --- .../pitan76/mcpitanlib/api/item/CompatibleArmorItem.java | 1 - .../pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java | 6 ++---- .../mcpitanlib/api/recipe/CompatibleRecipeEntry.java | 2 -- .../net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java | 1 - 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java index 95a8bc572..adb91a906 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleArmorItem.java @@ -15,7 +15,6 @@ public class CompatibleArmorItem extends ArmorItem implements CompatItemProvider @Deprecated public static final Map> CACHE = new java.util.HashMap<>(); - public CompatibleItemSettings settings; public CompatibleArmorItem(CompatibleArmorMaterial material, ArmorEquipmentType type, CompatibleItemSettings settings) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java index 153f96262..02070e0f2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatToolMaterial.java @@ -1,12 +1,10 @@ package net.pitan76.mcpitanlib.api.item.v3; -import net.minecraft.item.Item; import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.tag.TagKey; -import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; +import net.pitan76.mcpitanlib.api.item.tool.CompatibleToolMaterial; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; -public interface CompatToolMaterial extends CompatibleArmorMaterial { +public interface CompatToolMaterial extends CompatibleToolMaterial { @Deprecated @Override default Ingredient getRepairIngredient() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java index efbea4147..2a3d8935d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java @@ -1,8 +1,6 @@ package net.pitan76.mcpitanlib.api.recipe; import net.minecraft.recipe.*; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.RecipeUtil; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java index 5cebfe51a..e99799b58 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EquipMaterialUtil.java @@ -3,7 +3,6 @@ import net.minecraft.block.Block; import net.minecraft.item.ToolMaterial; import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import net.minecraft.sound.SoundEvent; import net.minecraft.util.Identifier; From 6d99c57cfa3026be14462efb93a1c89dcf954d23 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 9 Nov 2024 16:26:37 +0900 Subject: [PATCH 417/622] fix mixin --- .../main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index aa79880b9..fa837542c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -75,7 +75,6 @@ public class ItemMixin { } } - /* @Inject(method = "hasRecipeRemainder", at = @At("HEAD"), cancellable = true) private void mcpitanlib$hasRecipeRemainder(CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { @@ -86,7 +85,6 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } - */ @Inject(method = "appendTooltip", at = @At("HEAD"), cancellable = true) private void mcpitanlib$appendTooltip(ItemStack stack, Item.TooltipContext context, List tooltip, TooltipType type, CallbackInfo ci) { @@ -132,7 +130,6 @@ public class ItemMixin { } } - /* @Inject(method = "isEnchantable", at = @At("HEAD"), cancellable = true) private void mcpitanlib$isEnchantable(ItemStack stack, CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { @@ -143,9 +140,7 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } - */ - /* @Inject(method = "getEnchantability", at = @At("HEAD"), cancellable = true) private void mcpitanlib$getEnchantability(CallbackInfoReturnable cir) { if (this instanceof ExtendItemProvider) { @@ -156,7 +151,6 @@ public class ItemMixin { cir.setReturnValue(returnValue); } } - */ @Inject(method = "getItemBarColor", at = @At("HEAD"), cancellable = true) private void mcpitanlib$getItemBarColor(ItemStack stack, CallbackInfoReturnable cir) { From a4df4062b650033fb11e0f0bd86098795d326e96 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sat, 9 Nov 2024 17:17:23 +0900 Subject: [PATCH 418/622] add TagAPI and Fix CompatColor --- .../api/block/v2/BlockSettingsBuilder.java | 4 +- .../api/block/v2/CompatibleBlockSettings.java | 17 +++++++ .../api/item/v2/CompatArmorMaterial.java | 1 + .../api/item/v3/CompatArmorMaterial.java | 3 +- .../mcpitanlib/api/tag/v2/CompatTagKey.java | 29 +++++++++++ .../api/tag/v2/CompatTagKeyType.java | 48 +++++++++++++++++++ .../api/tag/v2/typed/BlockTagKey.java | 25 ++++++++++ .../api/tag/v2/typed/EntityTagKey.java | 20 ++++++++ .../api/tag/v2/typed/FluidTagKey.java | 18 +++++++ .../api/tag/v2/typed/ItemTagKey.java | 31 ++++++++++++ .../api/util/color/CompatDyeColor.java | 2 +- .../api/util/color/CompatMapColor.java | 2 +- 12 files changed, 194 insertions(+), 6 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKey.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKeyType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/BlockTagKey.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/EntityTagKey.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/FluidTagKey.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/ItemTagKey.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java index e0d04ee8b..fa012ed4e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java @@ -97,9 +97,9 @@ public CompatibleBlockSettings build(CompatIdentifier id) { settings = CompatibleBlockSettings.of(id, material); if (mapColor != null) { - settings = settings.mapColor(mapColor.get()); + settings = settings.mapColor(mapColor.getColor()); } else if (dyeColor != null) { - settings = settings.mapColor(dyeColor.get().getMapColor()); + settings = settings.mapColor(dyeColor.getColor().getMapColor()); } if (requiresTool) settings.requiresTool(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java index 912a7dcef..8b1ffdc2b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatibleBlockSettings.java @@ -12,6 +12,8 @@ import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.color.CompatDyeColor; +import net.pitan76.mcpitanlib.api.util.color.CompatMapColor; import java.util.function.Function; import java.util.function.ToIntFunction; @@ -142,11 +144,26 @@ public CompatibleBlockSettings mapColor(DyeColor color) { return this; } + public CompatibleBlockSettings mapColor(CompatMapColor color) { + super.mapColor(color.getColor()); + return this; + } + + public CompatibleBlockSettings mapColor(CompatDyeColor color) { + super.mapColor(color.getColor()); + return this; + } + public CompatibleBlockSettings mapColor(Function color) { super.mapColor(color); return this; } + public CompatibleBlockSettings compatMapColor(Function color) { + super.mapColor(state -> color.apply(net.pitan76.mcpitanlib.midohra.block.BlockState.of(state)).getColor()); + return this; + } + @Deprecated public CompatibleBlockSettings dropsLike(Block source) { super.dropsLike(source); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java index 219e3400a..8d757d099 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatArmorMaterial.java @@ -6,6 +6,7 @@ import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +@Deprecated public interface CompatArmorMaterial extends CompatibleArmorMaterial { @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java index 069f4f278..4981d29fa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/CompatArmorMaterial.java @@ -1,10 +1,9 @@ package net.pitan76.mcpitanlib.api.item.v3; import net.minecraft.recipe.Ingredient; -import net.pitan76.mcpitanlib.api.item.CompatibleArmorMaterial; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; -public interface CompatArmorMaterial extends CompatibleArmorMaterial { +public interface CompatArmorMaterial extends net.pitan76.mcpitanlib.api.item.v2.CompatArmorMaterial { @Deprecated @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKey.java new file mode 100644 index 000000000..63f4df308 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKey.java @@ -0,0 +1,29 @@ +package net.pitan76.mcpitanlib.api.tag.v2; + +import net.minecraft.registry.entry.RegistryEntry; +import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class CompatTagKey extends TagKey { + @Deprecated + public CompatTagKey(net.minecraft.registry.tag.TagKey tagKey) { + super(tagKey); + } + + @Deprecated + public static CompatTagKey of(net.minecraft.registry.tag.TagKey tagKey) { + return new CompatTagKey<>(tagKey); + } + + public static CompatTagKey of(CompatTagKeyType type, CompatIdentifier identifier) { + return of(net.minecraft.registry.tag.TagKey.of(type.getRegistryKey(), identifier.toMinecraft())); + } + + public boolean isOf(T value) { + return RegistryEntry.of(value).isIn(getTagKey()); + } + + public CompatIdentifier getId() { + return CompatIdentifier.fromMinecraft(getTagKey().id()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKeyType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKeyType.java new file mode 100644 index 000000000..2a0dabc61 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/CompatTagKeyType.java @@ -0,0 +1,48 @@ +package net.pitan76.mcpitanlib.api.tag.v2; + +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.EntityType; +import net.minecraft.fluid.Fluid; +import net.minecraft.item.Item; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.screen.ScreenHandlerType; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class CompatTagKeyType { + public static final CompatTagKeyType BLOCK = of(RegistryKeys.BLOCK); + public static final CompatTagKeyType ITEM = new CompatTagKeyType<>(RegistryKeys.ITEM); + public static final CompatTagKeyType FLUID = new CompatTagKeyType<>(RegistryKeys.FLUID); + public static final CompatTagKeyType> ENTITY_TYPE = new CompatTagKeyType<>(RegistryKeys.ENTITY_TYPE); + public static final CompatTagKeyType> BLOCK_ENTITY_TYPE = new CompatTagKeyType<>(RegistryKeys.BLOCK_ENTITY_TYPE); + public static final CompatTagKeyType> SCREEN_HANDLER = new CompatTagKeyType<>(RegistryKeys.SCREEN_HANDLER); + + public final CompatIdentifier id; + + protected CompatTagKeyType(CompatIdentifier id) { + this.id = id; + } + + public static CompatTagKeyType of(CompatIdentifier id) { + return new CompatTagKeyType<>(id); + } + + // RegistryKey + private RegistryKey> key; + + protected CompatTagKeyType(RegistryKey> key) { + this.id = CompatIdentifier.fromMinecraft(key.getRegistry()); + this.key = key; + } + + public static CompatTagKeyType of(RegistryKey> key) { + return new CompatTagKeyType<>(key); + } + + @Deprecated + public RegistryKey> getRegistryKey() { + return key; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/BlockTagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/BlockTagKey.java new file mode 100644 index 000000000..382e101b8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/BlockTagKey.java @@ -0,0 +1,25 @@ +package net.pitan76.mcpitanlib.api.tag.v2.typed; + +import net.minecraft.block.Block; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKeyType; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.block.BlockUtil; + +import java.util.List; + +public class BlockTagKey extends CompatTagKey { + @Deprecated + public BlockTagKey(TagKey tagKey) { + super(tagKey); + } + + public static BlockTagKey of(CompatIdentifier identifier) { + return new BlockTagKey(TagKey.of(CompatTagKeyType.BLOCK.getRegistryKey(), identifier.toMinecraft())); + } + + public List values() { + return BlockUtil.getInTag(this); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/EntityTagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/EntityTagKey.java new file mode 100644 index 000000000..61d57fee9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/EntityTagKey.java @@ -0,0 +1,20 @@ +package net.pitan76.mcpitanlib.api.tag.v2.typed; + +import net.minecraft.entity.EntityType; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKeyType; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.List; + +public class EntityTagKey extends CompatTagKey> { + @Deprecated + public EntityTagKey(TagKey> tagKey) { + super(tagKey); + } + + public static EntityTagKey of(CompatIdentifier identifier) { + return new EntityTagKey(TagKey.of(CompatTagKeyType.ENTITY_TYPE.getRegistryKey(), identifier.toMinecraft())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/FluidTagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/FluidTagKey.java new file mode 100644 index 000000000..03cdeb507 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/FluidTagKey.java @@ -0,0 +1,18 @@ +package net.pitan76.mcpitanlib.api.tag.v2.typed; + +import net.minecraft.fluid.Fluid; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKeyType; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class FluidTagKey extends CompatTagKey { + @Deprecated + public FluidTagKey(TagKey tagKey) { + super(tagKey); + } + + public static FluidTagKey of(CompatIdentifier identifier) { + return new FluidTagKey(TagKey.of(CompatTagKeyType.FLUID.getRegistryKey(), identifier.toMinecraft())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/ItemTagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/ItemTagKey.java new file mode 100644 index 000000000..cce0a7cb2 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/v2/typed/ItemTagKey.java @@ -0,0 +1,31 @@ +package net.pitan76.mcpitanlib.api.tag.v2.typed; + +import net.minecraft.item.Item; +import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKeyType; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IngredientUtil; +import net.pitan76.mcpitanlib.api.util.item.ItemUtil; + +import java.util.List; + +public class ItemTagKey extends CompatTagKey { + @Deprecated + public ItemTagKey(TagKey tagKey) { + super(tagKey); + } + + public static ItemTagKey of(CompatIdentifier identifier) { + return new ItemTagKey(net.minecraft.registry.tag.TagKey.of(CompatTagKeyType.ITEM.getRegistryKey(), identifier.toMinecraft())); + } + + public Ingredient asIngredient() { + return IngredientUtil.fromTagByIdentifier(getTagKey().id()); + } + + public List values() { + return ItemUtil.getInTag(this); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java index b2ca1532d..82c31796e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatDyeColor.java @@ -31,7 +31,7 @@ public static CompatDyeColor of(DyeColor color) { return new CompatDyeColor(color); } - public DyeColor get() { + public DyeColor getColor() { return color; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java index 1440230a5..08c7084cc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/color/CompatMapColor.java @@ -76,7 +76,7 @@ public static CompatMapColor of(MapColor color) { return new CompatMapColor(color); } - public MapColor get() { + public MapColor getColor() { return color; } From f962031b446ba8147104a4f5ad08d00f1ab34c3b Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 9 Nov 2024 18:07:48 +0900 Subject: [PATCH 419/622] back TypedActionResult --- .../main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index fa837542c..b391f7c08 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -12,6 +12,7 @@ import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; import net.minecraft.util.UseAction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -31,11 +32,11 @@ @Mixin(Item.class) public class ItemMixin { @Inject(method = "use", at = @At("HEAD"), cancellable = true) - private void mcpitanlib$use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable cir) { + private void mcpitanlib$use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> cir) { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); - ActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options).toActionResult(); + TypedActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options).toTypedActionResult(); if (options.cancel && returnValue != null) cir.setReturnValue(returnValue); } From 5a7cc33810cd3cf543a9a1fee45a183e52707fdb Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 9 Nov 2024 22:31:17 +0900 Subject: [PATCH 420/622] add Midohra Easy Builder API --- .../api/event/item/ItemUseEvent.java | 16 +- .../api/item/v2/ItemSettingsBuilder.java | 9 ++ .../api/util/StackActionResult.java | 16 ++ .../midohra/block/BlockWrapper.java | 16 +- .../midohra/block/SupplierBlockWrapper.java | 22 +++ .../midohra/easybuilder/BlockBuilder.java | 132 +++++++++++++++++ .../midohra/easybuilder/BuiltBlock.java | 69 +++++++++ .../midohra/easybuilder/BuiltItem.java | 72 +++++++++ .../midohra/easybuilder/ItemBuilder.java | 138 ++++++++++++++++++ .../mcpitanlib/midohra/item/ItemWrapper.java | 22 +-- .../midohra/item/SupplierItemWrapper.java | 22 +++ .../midohra/util/math/BlockPos.java | 81 ++++++++++ .../midohra/util/math/Direction.java | 96 ++++++++++++ 13 files changed, 690 insertions(+), 21 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/item/SupplierItemWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index e68921d9b..518e75148 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -62,12 +62,20 @@ public StackActionResult success() { return StackActionResult.create(CompatActionResult.SUCCESS); } - public CompatActionResult fail() { - return CompatActionResult.FAIL; + public StackActionResult fail() { + return StackActionResult.fail(); } - public CompatActionResult pass() { - return CompatActionResult.PASS; + public StackActionResult fail(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return StackActionResult.fail(stack.toMinecraft()); + } + + public StackActionResult pass() { + return StackActionResult.pass(); + } + + public StackActionResult pass(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return StackActionResult.pass(stack.toMinecraft()); } public StackActionResult consume(ItemStack stack) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java index da754ba07..6100b0839 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java @@ -7,6 +7,7 @@ import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.CompatRarity; import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; public class ItemSettingsBuilder { @@ -18,6 +19,7 @@ public class ItemSettingsBuilder { public RepairIngredientTag repairIngredientTag; public CompatFoodComponent foodComponent; public CompatRarity rarity; + public ItemWrapper recipeRemainder; public ItemGroupWrapper itemGroupWrapper; public CreativeTabBuilder itemGroupBuilder; @@ -55,6 +57,11 @@ public ItemSettingsBuilder maxDamageIfAbsent(int maxDamage) { return this; } + public ItemSettingsBuilder recipeRemainder(ItemWrapper recipeRemainder) { + this.recipeRemainder = recipeRemainder; + return this; + } + public ItemSettingsBuilder enchantability(int enchantability) { this.enchantability = enchantability; return this; @@ -103,6 +110,8 @@ public CompatibleItemSettings build(CompatIdentifier id) { if (rarity != null) settings.rarity(rarity); if (foodComponent != null) settings.food(foodComponent); + if (recipeRemainder != null) settings.recipeRemainder(recipeRemainder); + if (enchantability != -1) settings.enchantable(enchantability); if (repairIngredientTag != null) settings.repairable(repairIngredientTag); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java index b97944b9b..3711e987f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/StackActionResult.java @@ -104,6 +104,22 @@ public TypedActionResult toTypedActionResult() { return new TypedActionResult<>(toActionResult(), getStack()); } + public static StackActionResult pass(ItemStack stack) { + return create(CompatActionResult.PASS, stack); + } + + public static StackActionResult pass() { + return create(CompatActionResult.PASS); + } + + public static StackActionResult fail(ItemStack stack) { + return create(CompatActionResult.FAIL, stack); + } + + public static StackActionResult fail() { + return create(CompatActionResult.FAIL); + } + public ItemStack getStack() { return stack; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java index 5a0a77fa3..06df6ce68 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java @@ -3,6 +3,7 @@ import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.block.BlockUtil; import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import org.jetbrains.annotations.Nullable; public class BlockWrapper { private final net.minecraft.block.Block block; @@ -46,42 +47,43 @@ public boolean isExist() { } public boolean isEmpty() { - return block == null; + return get() == null; } + @Nullable public net.minecraft.block.Block get() { return block; } public net.minecraft.block.Block gerOrDefault(net.minecraft.block.Block defaultItem) { - return isEmpty() ? defaultItem : block; + return isEmpty() ? defaultItem : get(); } public CompatIdentifier getId() { if (isEmpty()) return CompatIdentifier.empty(); - return BlockUtil.toId(block); + return BlockUtil.toId(get()); } public String getName() { if (isEmpty()) return ""; - return BlockUtil.getNameAsString(block); + return BlockUtil.getNameAsString(get()); } public String getTranslationKey() { if (isEmpty()) return ""; - return BlockUtil.getTranslationKey(block); + return BlockUtil.getTranslationKey(get()); } public ItemWrapper asItem() { if (isEmpty()) return ItemWrapper.of(); - return ItemWrapper.of(BlockUtil.toItem(block)); + return ItemWrapper.of(BlockUtil.toItem(get())); } public BlockState getDefaultState() { - return BlockState.of(block); + return BlockState.of(get()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java new file mode 100644 index 000000000..776e5664b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java @@ -0,0 +1,22 @@ +package net.pitan76.mcpitanlib.midohra.block; + +import net.minecraft.block.Block; + +import java.util.function.Supplier; + +public class SupplierBlockWrapper extends BlockWrapper { + private final Supplier supplier; + + protected SupplierBlockWrapper(Supplier supplier) { + this.supplier = supplier; + } + + public static SupplierBlockWrapper of(Supplier supplier) { + return new SupplierBlockWrapper(supplier); + } + + @Override + public Block get() { + return supplier.get(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java new file mode 100644 index 000000000..1386fa12a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -0,0 +1,132 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder; + +import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.block.v2.BlockSettingsBuilder; +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; +import net.pitan76.mcpitanlib.api.event.block.StateReplacedEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.color.CompatDyeColor; +import net.pitan76.mcpitanlib.api.util.color.CompatMapColor; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; + +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.function.ToIntFunction; + +public class BlockBuilder { + + public BlockSettingsBuilder settingsBuilder; + public Function onRightClick; + public Consumer onStateReplaced; + public Consumer onAppendTooltip; + public Consumer onAppendProperties; + + public BlockBuilder(BlockSettingsBuilder settingsBuilder) { + this.settingsBuilder = settingsBuilder; + } + + public BlockBuilder(CompatIdentifier id) { + this(new BlockSettingsBuilder(id)); + } + + public static BlockBuilder of(CompatIdentifier id) { + return new BlockBuilder(id); + } + + public static BlockBuilder of(BlockSettingsBuilder settingsBuilder) { + return new BlockBuilder(settingsBuilder); + } + + public SupplierBlockWrapper build(CompatRegistryV2 registry) { + if (settingsBuilder.id == null) + throw new IllegalStateException("Block id is not set. hint: use build(CompatRegistryV2, CompatIdentifier)"); + + Supplier result = registry.registerExtendBlock(settingsBuilder.id, () -> new BuiltBlock(this)); + + return SupplierBlockWrapper.of(result::get); + } + + public SupplierBlockWrapper build(CompatRegistryV2 registry, CompatIdentifier id) { + Supplier result = registry.registerExtendBlock(settingsBuilder.id, () -> new BuiltBlock(this, id)); + + return SupplierBlockWrapper.of(result::get); + } + + public BlockBuilder material(CompatibleMaterial material) { + settingsBuilder.material(material); + return this; + } + + public BlockBuilder sounds(CompatBlockSoundGroup sounds) { + settingsBuilder.sounds(sounds); + return this; + } + + public BlockBuilder strength(float hardness, float resistance) { + settingsBuilder.strength(hardness, resistance); + return this; + } + + public BlockBuilder strength(float hardness) { + settingsBuilder.hardness(hardness); + return this; + } + + public BlockBuilder resistance(float resistance) { + settingsBuilder.resistance(resistance); + return this; + } + + public BlockBuilder mapColor(CompatMapColor color) { + settingsBuilder.mapColor(color); + return this; + } + + public BlockBuilder mapColor(CompatDyeColor color) { + settingsBuilder.dyeColor(color); + return this; + } + + public BlockBuilder luminance(ToIntFunction luminance) { + settingsBuilder.luminance(luminance); + return this; + } + + public BlockBuilder requiresTool() { + settingsBuilder.requiresTool(); + return this; + } + + public BlockBuilder dropsNothing() { + settingsBuilder.dropsNothing(); + return this; + } + + public BlockBuilder onRightClick(Function onRightClick) { + this.onRightClick = onRightClick; + return this; + } + + public BlockBuilder onStateReplaced(Consumer onStateReplaced) { + this.onStateReplaced = onStateReplaced; + return this; + } + + public BlockBuilder onAppendTooltip(Consumer onAppendTooltip) { + this.onAppendTooltip = onAppendTooltip; + return this; + } + + public BlockBuilder onAppendProperties(Consumer onAppendProperties) { + this.onAppendProperties = onAppendProperties; + return this; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java new file mode 100644 index 000000000..837d1c5ac --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java @@ -0,0 +1,69 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder; + +import net.pitan76.mcpitanlib.api.block.v2.CompatBlock; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; +import net.pitan76.mcpitanlib.api.event.block.StateReplacedEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.function.Consumer; +import java.util.function.Function; + +public class BuiltBlock extends CompatBlock { + + protected Function onRightClick; + protected Consumer onStateReplaced; + protected Consumer onAppendTooltip; + protected Consumer onAppendProperties; + + public BuiltBlock(CompatibleBlockSettings settings) { + super(settings); + } + + public BuiltBlock(BlockBuilder builder) { + this(builder.settingsBuilder.build()); + + this.onRightClick = builder.onRightClick; + this.onStateReplaced = builder.onStateReplaced; + this.onAppendTooltip = builder.onAppendTooltip; + this.onAppendProperties = builder.onAppendProperties; + } + + public BuiltBlock(BlockBuilder builder, CompatIdentifier id) { + this(builder.settingsBuilder.build(id)); + + this.onRightClick = builder.onRightClick; + this.onStateReplaced = builder.onStateReplaced; + this.onAppendTooltip = builder.onAppendTooltip; + this.onAppendProperties = builder.onAppendProperties; + } + + @Override + public CompatActionResult onRightClick(BlockUseEvent e) { + if (onRightClick == null) + return e.pass(); + + return onRightClick.apply(e); + } + + @Override + public void onStateReplaced(StateReplacedEvent e) { + if (onStateReplaced != null) + onStateReplaced.accept(e); + } + + @Override + public void appendTooltip(ItemAppendTooltipEvent e) { + if (onAppendTooltip != null) + onAppendTooltip.accept(e); + } + + @Override + public void appendProperties(AppendPropertiesArgs args) { + if (onAppendProperties != null) + onAppendProperties.accept(args); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java new file mode 100644 index 000000000..b52a3d32e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java @@ -0,0 +1,72 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder; + +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnEntityEvent; +import net.pitan76.mcpitanlib.api.item.v2.CompatItem; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.StackActionResult; + +import java.util.function.Consumer; +import java.util.function.Function; + +public class BuiltItem extends CompatItem { + + protected Function onRightClick; + protected Function onRightClickOnBlock; + protected Function onRightClickOnEntity; + protected Consumer onAppendTooltip; + + protected BuiltItem(CompatibleItemSettings settings) { + super(settings); + } + + public BuiltItem(ItemBuilder builder) { + this(builder.settingsBuilder.build()); + + this.onRightClick = builder.onRightClick; + this.onRightClickOnBlock = builder.onRightClickOnBlock; + this.onAppendTooltip = builder.onAppendTooltip; + } + + public BuiltItem(ItemBuilder builder, CompatIdentifier id) { + this(builder.settingsBuilder.build(id)); + + this.onRightClick = builder.onRightClick; + this.onRightClickOnBlock = builder.onRightClickOnBlock; + this.onAppendTooltip = builder.onAppendTooltip; + } + + @Override + public StackActionResult onRightClick(ItemUseEvent e) { + if (onRightClick == null) + return e.pass(); + + return onRightClick.apply(e); + } + + @Override + public CompatActionResult onRightClickOnBlock(ItemUseOnBlockEvent e) { + if (onRightClickOnBlock == null) + return e.pass(); + + return onRightClickOnBlock.apply(e); + } + + @Override + public CompatActionResult onRightClickOnEntity(ItemUseOnEntityEvent e) { + if (onRightClickOnEntity == null) + return e.pass(); + + return onRightClickOnEntity.apply(e); + } + + @Override + public void appendTooltip(ItemAppendTooltipEvent e) { + if (onAppendTooltip != null) + onAppendTooltip.accept(e); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java new file mode 100644 index 000000000..9598cf0fc --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java @@ -0,0 +1,138 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder; + +import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnEntityEvent; +import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; +import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; +import net.pitan76.mcpitanlib.api.item.ExtendItem; +import net.pitan76.mcpitanlib.api.item.v2.ItemSettingsBuilder; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.CompatRarity; +import net.pitan76.mcpitanlib.api.util.StackActionResult; +import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; + +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; + +public class ItemBuilder { + + public ItemSettingsBuilder settingsBuilder; + public Function onRightClick; + public Function onRightClickOnBlock; + public Function onRightClickOnEntity; + public Consumer onAppendTooltip; + + public ItemBuilder(ItemSettingsBuilder settingsBuilder) { + this.settingsBuilder = settingsBuilder; + } + + public ItemBuilder(CompatIdentifier id) { + this(new ItemSettingsBuilder(id)); + } + + public static ItemBuilder of(CompatIdentifier id) { + return new ItemBuilder(id); + } + + public static ItemBuilder of(ItemSettingsBuilder settingsBuilder) { + return new ItemBuilder(settingsBuilder); + } + + public SupplierItemWrapper build(CompatRegistryV2 registry) { + if (settingsBuilder.id == null) + throw new IllegalStateException("Item id is not set. hint: use build(CompatRegistryV2, CompatIdentifier)"); + + Supplier result = registry.registerExtendItem(settingsBuilder.id, () -> new BuiltItem(this)); + + return SupplierItemWrapper.of(result::get); + } + + public SupplierItemWrapper build(CompatRegistryV2 registry, CompatIdentifier id) { + Supplier result = registry.registerExtendItem(settingsBuilder.id, () -> new BuiltItem(this, id)); + + return SupplierItemWrapper.of(result::get); + } + + public ItemBuilder maxCount(int maxCount) { + settingsBuilder.maxCount(maxCount); + return this; + } + + public ItemBuilder maxDamage(int maxDamage) { + settingsBuilder.maxDamage(maxDamage); + return this; + } + + public ItemBuilder maxDamageIfAbsent(int maxDamage) { + settingsBuilder.maxDamageIfAbsent(maxDamage); + return this; + } + + public ItemBuilder food(CompatFoodComponent foodComponent) { + settingsBuilder.foodComponent(foodComponent); + return this; + } + + public ItemBuilder recipeRemainder(ItemWrapper recipeRemainder) { + settingsBuilder.recipeRemainder(recipeRemainder); + return this; + } + + public ItemBuilder enchantability(int enchantability) { + settingsBuilder.enchantability(enchantability); + return this; + } + + public ItemBuilder repairable(CompatIdentifier repairIngredientTag) { + settingsBuilder.repairable(repairIngredientTag); + return this; + } + + public ItemBuilder repairable(RepairIngredientTag repairIngredientTag) { + settingsBuilder.repairable(repairIngredientTag); + return this; + } + + public ItemBuilder rarity(CompatRarity rarity) { + settingsBuilder.rarity(rarity); + return this; + } + + public ItemBuilder group(ItemGroupWrapper itemGroup) { + settingsBuilder.addGroup(itemGroup); + return this; + } + + public ItemBuilder group(CreativeTabBuilder itemGroup) { + settingsBuilder.addGroup(itemGroup); + return this; + } + + public ItemBuilder onRightClick(Function onRightClick) { + this.onRightClick = onRightClick; + return this; + } + + public ItemBuilder onRightClickOnBlock(Function onRightClickOnBlock) { + this.onRightClickOnBlock = onRightClickOnBlock; + return this; + } + + public ItemBuilder onRightClickOnEntity(Function onRightClickOnEntity) { + this.onRightClickOnEntity = onRightClickOnEntity; + return this; + } + + public ItemBuilder onAppendTooltip(Consumer onAppendTooltip) { + this.onAppendTooltip = onAppendTooltip; + return this; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java index be03f87d9..69fe742c2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java @@ -4,6 +4,7 @@ import net.pitan76.mcpitanlib.api.util.ItemStackUtil; import net.pitan76.mcpitanlib.api.util.item.ItemUtil; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import org.jetbrains.annotations.Nullable; public class ItemWrapper { private final net.minecraft.item.Item item; @@ -47,41 +48,42 @@ public boolean isExist() { } public boolean isEmpty() { - return item == null; + return get() == null; } public boolean isAir() { - return isEmpty() || item == net.minecraft.item.Items.AIR; + return isEmpty() || get() == net.minecraft.item.Items.AIR; } + @Nullable public net.minecraft.item.Item get() { return item; } public net.minecraft.item.Item gerOrDefault(net.minecraft.item.Item defaultItem) { - return isEmpty() ? defaultItem : item; + return isEmpty() ? defaultItem : get(); } public CompatIdentifier getId() { if (isEmpty()) return CompatIdentifier.empty(); - return ItemUtil.toId(item); + return ItemUtil.toId(get()); } public String getName() { if (isEmpty()) return ""; - return ItemUtil.getNameAsString(item); + return ItemUtil.getNameAsString(get()); } public String getTranslationKey() { if (isEmpty()) return ""; - return ItemUtil.getTranslationKey(item); + return ItemUtil.getTranslationKey(get()); } public ItemStack createStack(int count) { if (isEmpty()) return ItemStack.EMPTY; - return ItemStack.of(ItemStackUtil.create(item, count)); + return ItemStack.of(ItemStackUtil.create(get(), count)); } public ItemStack createStack() { @@ -89,17 +91,17 @@ public ItemStack createStack() { } public boolean isInTag(CompatIdentifier id) { - return ItemUtil.isInTag(item, id); + return ItemUtil.isInTag(get(), id); } public boolean isBlock() { - return !isEmpty() && item instanceof net.minecraft.item.BlockItem; + return !isEmpty() && get() instanceof net.minecraft.item.BlockItem; } public BlockWrapper asBlock() { if (!isBlock()) return BlockWrapper.of(); - return BlockWrapper.of(((net.minecraft.item.BlockItem) item).getBlock()); + return BlockWrapper.of(((net.minecraft.item.BlockItem) get()).getBlock()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/SupplierItemWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/SupplierItemWrapper.java new file mode 100644 index 000000000..c39629242 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/SupplierItemWrapper.java @@ -0,0 +1,22 @@ +package net.pitan76.mcpitanlib.midohra.item; + +import net.minecraft.item.Item; + +import java.util.function.Supplier; + +public class SupplierItemWrapper extends ItemWrapper { + private final Supplier supplier; + + protected SupplierItemWrapper(Supplier supplier) { + this.supplier = supplier; + } + + public static SupplierItemWrapper of(Supplier supplier) { + return new SupplierItemWrapper(supplier); + } + + @Override + public Item get() { + return supplier.get(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java new file mode 100644 index 000000000..5211c0b87 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java @@ -0,0 +1,81 @@ +package net.pitan76.mcpitanlib.midohra.util.math; + +import net.minecraft.util.math.Vec3i; + +public class BlockPos { + private final net.minecraft.util.math.BlockPos blockPos; + + protected BlockPos(net.minecraft.util.math.BlockPos blockPos) { + this.blockPos = blockPos; + } + + public static BlockPos of(net.minecraft.util.math.BlockPos blockPos) { + return new BlockPos(blockPos); + } + + public static BlockPos of(int x, int y, int z) { + return new BlockPos(new net.minecraft.util.math.BlockPos(x, y, z)); + } + + public int getX() { + return blockPos.getX(); + } + + public int getY() { + return blockPos.getY(); + } + + public int getZ() { + return blockPos.getZ(); + } + + @Deprecated + public net.minecraft.util.math.BlockPos toMinecraft() { + return blockPos; + } + + public BlockPos add(int x, int y, int z) { + return new BlockPos(blockPos.add(x, y, z)); + } + + public BlockPos add(BlockPos pos) { + return new BlockPos(blockPos.add(pos.blockPos)); + } + + public BlockPos subtract(int x, int y, int z) { + return new BlockPos(blockPos.subtract(new Vec3i(x, y, z))); + } + + public BlockPos subtract(BlockPos pos) { + return new BlockPos(blockPos.subtract(pos.blockPos)); + } + + public BlockPos up() { + return new BlockPos(blockPos.up()); + } + + public BlockPos down() { + return new BlockPos(blockPos.down()); + } + + public BlockPos north() { + return new BlockPos(blockPos.north()); + } + + public BlockPos south() { + return new BlockPos(blockPos.south()); + } + + public BlockPos east() { + return new BlockPos(blockPos.east()); + } + + public BlockPos west() { + return new BlockPos(blockPos.west()); + } + + public BlockPos offset(Direction direction, int amount) { + return new BlockPos(blockPos.offset(direction.toMinecraft(), amount)); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java new file mode 100644 index 000000000..30965cd5a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java @@ -0,0 +1,96 @@ +package net.pitan76.mcpitanlib.midohra.util.math; + +public class Direction { + + public static final Direction UP = of(net.minecraft.util.math.Direction.UP); + public static final Direction DOWN = of(net.minecraft.util.math.Direction.DOWN); + public static final Direction NORTH = of(net.minecraft.util.math.Direction.NORTH); + public static final Direction SOUTH = of(net.minecraft.util.math.Direction.SOUTH); + public static final Direction EAST = of(net.minecraft.util.math.Direction.EAST); + public static final Direction WEST = of(net.minecraft.util.math.Direction.WEST); + + private final net.minecraft.util.math.Direction direction; + + protected Direction(net.minecraft.util.math.Direction direction) { + this.direction = direction; + } + + public static Direction of(net.minecraft.util.math.Direction direction) { + switch (direction) { + case UP: + return UP; + case DOWN: + return DOWN; + case NORTH: + return NORTH; + case SOUTH: + return SOUTH; + case EAST: + return EAST; + case WEST: + return WEST; + default: + return new Direction(direction); + } + } + + public Direction getOpposite() { + switch (direction) { + case UP: + return DOWN; + case DOWN: + return UP; + case NORTH: + return SOUTH; + case SOUTH: + return NORTH; + case EAST: + return WEST; + case WEST: + return EAST; + default: + return null; + } + } + + public net.minecraft.util.math.Direction toMinecraft() { + return direction; + } + + public boolean isHorizontal() { + return direction.getAxis().isHorizontal(); + } + + public boolean isVertical() { + return direction.getAxis().isVertical(); + } + + public boolean isPositive() { + return direction.getDirection() == net.minecraft.util.math.Direction.AxisDirection.POSITIVE; + } + + public boolean isNegative() { + return direction.getDirection() == net.minecraft.util.math.Direction.AxisDirection.NEGATIVE; + } + + public int getOffsetX() { + return direction.getOffsetX(); + } + + public int getOffsetY() { + return direction.getOffsetY(); + } + + public int getOffsetZ() { + return direction.getOffsetZ(); + } + + public Direction rotateYClockwise() { + return of(direction.rotateYClockwise()); + } + + public Direction rotateYCounterclockwise() { + return of(direction.rotateYCounterclockwise()); + } + +} From fb5e027a5f4f347d60d82a7d8c6906822277b13f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 9 Nov 2024 22:37:03 +0900 Subject: [PATCH 421/622] fix StackActionResult --- .../pitan76/mcpitanlib/api/event/item/ItemUseEvent.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index 518e75148..1fb17b585 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -59,11 +59,11 @@ public StackActionResult success(net.pitan76.mcpitanlib.midohra.item.ItemStack s } public StackActionResult success() { - return StackActionResult.create(CompatActionResult.SUCCESS); + return StackActionResult.create(CompatActionResult.SUCCESS, stack); } public StackActionResult fail() { - return StackActionResult.fail(); + return new StackActionResult(CompatActionResult.FAIL, stack); } public StackActionResult fail(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { @@ -71,7 +71,7 @@ public StackActionResult fail(net.pitan76.mcpitanlib.midohra.item.ItemStack stac } public StackActionResult pass() { - return StackActionResult.pass(); + return new StackActionResult(CompatActionResult.PASS, stack); } public StackActionResult pass(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { @@ -90,7 +90,7 @@ public CompatActionResult consume(net.pitan76.mcpitanlib.midohra.item.ItemStack } public StackActionResult consume() { - return StackActionResult.create(CompatActionResult.CONSUME); + return StackActionResult.create(CompatActionResult.CONSUME, stack); } public boolean isSneaking() { From d74e617916b6529732a6bd171d6732c57029dcf9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 10 Nov 2024 13:20:53 +0900 Subject: [PATCH 422/622] gradle --- gradle.properties | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8247cd7fa..7c19b2d52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,28 +1,26 @@ org.gradle.jvmargs=-Xmx3G -minecraft_version=1.21 +minecraft_version=1.21.1 # https://www.curseforge.com/minecraft/mc-mods/architectury-api -architectury_version=13.0.2 +architectury_version=13.0.8 # https://fabricmc.net/develop/ -fabric_loader_version=0.15.11 -yarn_mappings=1.21+build.7 -fabric_api_version=0.100.4+1.21 - -# Fabric API +fabric_loader_version=0.16.9 +yarn_mappings=1.21.1+build.3 +fabric_api_version=0.107.0+1.21.1 # https://files.minecraftforge.net/net/minecraftforge/forge/ -forge_version=1.21-51.0.21 +forge_version=1.21.1-52.0.27 # https://lambdaurora.dev/tools/import_quilt.html quilt_loader_version=0.23.1 quilt_fabric_api_version=6.0.2 # https://projects.neoforged.net/neoforged/neoforge -neoforge_version=21.0.42-beta +neoforge_version=21.1.76 -cloth_config_version=15.0.127 +cloth_config_version=15.0.140 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ compatdatapacks76_version=1.0.10.210 From 4d3293fb95a6f07d18977fe2b4094168b6a329a9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sun, 10 Nov 2024 17:22:22 +0900 Subject: [PATCH 423/622] fix APIs --- .../api/item/args/StoppedUsingArgs.java | 80 +++++++++++++++++++ .../mcpitanlib/api/item/v2/CompatItem.java | 14 ++++ .../core/serialization/CompatMapCodec.java | 24 ++++-- .../codecs/CompatBlockMapCodecUtil.java | 57 +++++++++++++ .../midohra/easybuilder/BlockBuilder.java | 24 +++++- info.properties | 2 +- 6 files changed, 193 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/args/StoppedUsingArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/core/serialization/codecs/CompatBlockMapCodecUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/StoppedUsingArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/StoppedUsingArgs.java new file mode 100644 index 000000000..e7c9e8446 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/args/StoppedUsingArgs.java @@ -0,0 +1,80 @@ +package net.pitan76.mcpitanlib.api.item.args; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; + +import java.util.Optional; + +public class StoppedUsingArgs { + + public ItemStack stack; + public World world; + public LivingEntity user; + public int remainingUseTicks; + + public StoppedUsingArgs(ItemStack stack, World world, LivingEntity user, int remainingUseTicks) { + this.stack = stack; + this.world = world; + this.user = user; + this.remainingUseTicks = remainingUseTicks; + } + + public StoppedUsingArgs(ItemStack stack, World world, LivingEntity user) { + this(stack, world, user, 0); + } + + public StoppedUsingArgs(ItemStack stack, World world, Player player, int remainingUseTicks) { + this(stack, world, player.getEntity(), remainingUseTicks); + } + + public StoppedUsingArgs(ItemStack stack, World world, Player player) { + this(stack, world, player, 0); + } + + public ItemStack getStack() { + return stack; + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStack() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(stack); + } + + public World getWorld() { + return world; + } + + public LivingEntity getUser() { + return user; + } + + public int getRemainingUseTicks() { + return remainingUseTicks; + } + + public boolean hasRemainingUseTicks() { + return remainingUseTicks > 0; + } + + public boolean hasNoRemainingUseTicks() { + return !hasRemainingUseTicks(); + } + + public boolean isClient() { + return world.isClient(); + } + + public boolean isServer() { + return !isClient(); + } + + public boolean isPlayer() { + return user instanceof PlayerEntity; + } + + public Optional getPlayer() { + return isPlayer() ? Optional.of(new Player((PlayerEntity) user)) : Optional.empty(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java index 4c00d415a..79d34227e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java @@ -1,13 +1,16 @@ package net.pitan76.mcpitanlib.api.item.v2; +import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Rarity; import net.minecraft.util.UseAction; +import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.CanRepairArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantabilityArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantableArgs; import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.item.args.RarityArgs; +import net.pitan76.mcpitanlib.api.item.args.StoppedUsingArgs; import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; import net.pitan76.mcpitanlib.api.item.consume.CompatUseAction; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; @@ -80,4 +83,15 @@ protected String getOrCreateTranslationKey() { return super.getOrCreateTranslationKey(); } + + @Deprecated + @Override + public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int remainingUseTicks) { + onStoppedUsing(new StoppedUsingArgs(stack, world, user, remainingUseTicks)); + } + + public boolean onStoppedUsing(StoppedUsingArgs args) { + super.onStoppedUsing(args.stack, args.world, args.user, args.remainingUseTicks); + return false; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java index 8406b748c..a5a70af11 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/CompatMapCodec.java @@ -6,8 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.pitan76.mcpitanlib.api.block.CompatStairsBlock; -import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlock; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.core.serialization.codecs.CompatBlockMapCodecUtil; import java.util.function.BiFunction; import java.util.function.Function; @@ -47,18 +49,28 @@ public static CompatMapCodec createCodec(Function instance.group(createSettingsCodec()).apply(instance, blockFromSettings))); } - public static RecordCodecBuilder createCompatSettingsCodec() { - return CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(ExtendBlock::getCompatSettings); + @Deprecated + public static RecordCodecBuilder createCompatSettingsCodec() { + return net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(ExtendBlock::getCompatSettings); } - public static CompatMapCodec createCodecOfExtendBlock(Function blockFromSettings) { + @Deprecated + public static CompatMapCodec createCodecOfExtendBlock(Function blockFromSettings) { return of(RecordCodecBuilder.mapCodec((instance) -> instance.group(createCompatSettingsCodec()).apply(instance, blockFromSettings))); } - public static CompatMapCodec createCodecOfCompatStairsBlock(BiFunction createFunction) { + public static RecordCodecBuilder createCompatSettingsV2Codec() { + return CompatBlockMapCodecUtil.createSettingsCodec(); + } + + public static CompatMapCodec createCodecOfCompatBlock(Function blockFromSettings) { + return CompatBlockMapCodecUtil.createCodec(blockFromSettings); + } + + public static CompatMapCodec createCodecOfCompatStairsBlock(BiFunction createFunction) { return of(RecordCodecBuilder.mapCodec((instance) -> instance.group( BlockState.CODEC.fieldOf("base_state").forGetter(CompatStairsBlock::getBaseBlockState), - CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatStairsBlock::getCompatSettings) + net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatStairsBlock::getCompatSettings) ).apply(instance, createFunction))); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/codecs/CompatBlockMapCodecUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/codecs/CompatBlockMapCodecUtil.java new file mode 100644 index 000000000..12d5880b6 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/serialization/codecs/CompatBlockMapCodecUtil.java @@ -0,0 +1,57 @@ +package net.pitan76.mcpitanlib.core.serialization.codecs; + +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.pitan76.mcpitanlib.api.block.CompatChestBlock; +import net.pitan76.mcpitanlib.api.block.CompatPillarBlock; +import net.pitan76.mcpitanlib.api.block.CompatSlabBlock; +import net.pitan76.mcpitanlib.api.block.CompatStairsBlock; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlock; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; + +import java.util.function.BiFunction; +import java.util.function.Function; + +public class CompatBlockMapCodecUtil { + + @Deprecated + protected static CompatMapCodec of(MapCodec codec) { + return new CompatMapCodec<>(codec); + } + + public static RecordCodecBuilder createSettingsCodec() { + return CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatBlock::getCompatSettings); + } + + public static CompatMapCodec createCodec(Function blockFromSettings) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group(createSettingsCodec()).apply(instance, blockFromSettings))); + } + + public static CompatMapCodec createCodecOfStairsBlock(BiFunction createFunction) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group( + BlockState.CODEC.fieldOf("base_state").forGetter(CompatStairsBlock::getBaseBlockState), + CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatStairsBlock::getCompatSettings) + ).apply(instance, createFunction))); + } + + public static CompatMapCodec createCodecOfSlabBlock(Function createFunction) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group( + CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatSlabBlock::getCompatSettings) + ).apply(instance, createFunction))); + } + + public static CompatMapCodec createCodecOfPillarBlock(Function createFunction) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group( + CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatPillarBlock::getCompatSettings) + ).apply(instance, createFunction))); + } + + public static CompatMapCodec createCodecOfChestBlock(Function createFunction) { + return of(RecordCodecBuilder.mapCodec((instance) -> instance.group( + CompatibleBlockSettings.CODEC.fieldOf("properties").forGetter(CompatChestBlock::getCompatSettings) + ).apply(instance, createFunction))); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index 1386fa12a..cd1b5e9fe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; +import net.minecraft.item.Item; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.block.v2.BlockSettingsBuilder; @@ -7,14 +8,19 @@ import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; import net.pitan76.mcpitanlib.api.event.block.StateReplacedEvent; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; +import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.color.CompatDyeColor; import net.pitan76.mcpitanlib.api.util.color.CompatMapColor; +import net.pitan76.mcpitanlib.api.util.item.ItemUtil; +import net.pitan76.mcpitanlib.core.datafixer.Pair; import net.pitan76.mcpitanlib.midohra.block.BlockState; import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; +import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; import java.util.function.Consumer; import java.util.function.Function; @@ -55,11 +61,27 @@ public SupplierBlockWrapper build(CompatRegistryV2 registry) { } public SupplierBlockWrapper build(CompatRegistryV2 registry, CompatIdentifier id) { - Supplier result = registry.registerExtendBlock(settingsBuilder.id, () -> new BuiltBlock(this, id)); + Supplier result = registry.registerExtendBlock(id, () -> new BuiltBlock(this, id)); return SupplierBlockWrapper.of(result::get); } + public Pair buildWithItem(CompatRegistryV2 registry, CompatibleItemSettings settings) { + SupplierBlockWrapper block = build(registry); + + RegistryResult result = registry.registerItem(settingsBuilder.id, () -> ItemUtil.create(block.get(), settings)); + + return Pair.of(block, SupplierItemWrapper.of(result::get)); + } + + public Pair buildWithItem(CompatRegistryV2 registry, CompatIdentifier id, CompatibleItemSettings settings) { + SupplierBlockWrapper block = build(registry, id); + + RegistryResult result = registry.registerItem(id, () -> ItemUtil.create(block.get(), settings.setId(id))); + + return Pair.of(block, SupplierItemWrapper.of(result::get)); + } + public BlockBuilder material(CompatibleMaterial material) { settingsBuilder.material(material); return this; diff --git a/info.properties b/info.properties index 350c2af87..62a89ebf1 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.0 +mod_version=3.0.1 maven_group=net.pitan76 changelog=Support for 1.21.3 \ No newline at end of file From fc492610b8373736328bb561eef56d0831e6f9ea Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sun, 10 Nov 2024 22:03:17 +0900 Subject: [PATCH 424/622] Fix recipe api --- .../api/recipe/v2/CompatRecipeNonEntry.java | 24 +++++++++++++++++++ .../mcpitanlib/api/util/RecipeUtil.java | 14 +++++++++-- info.properties | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java new file mode 100644 index 000000000..67e094cc1 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java @@ -0,0 +1,24 @@ +package net.pitan76.mcpitanlib.api.recipe.v2; + +import net.minecraft.recipe.Recipe; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.RecipeUtil; + +public class CompatRecipeNonEntry> extends CompatRecipeEntry { + public CompatRecipeNonEntry(T recipe) { + super(CompatIdentifier.EMPTY, "", RecipeUtil.CompatibilityCraftingRecipeCategory.MISC, recipe); + } + + public static CompatRecipeNonEntry create(Recipe recipe) { + return new CompatRecipeNonEntry<>(recipe); + } + + @Override + public T getRecipe() { + return super.getRecipe(); + } + + public Recipe getRawRecipe() { + return super.getRecipe(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java index e0b96c244..d296477f0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/RecipeUtil.java @@ -12,6 +12,7 @@ import net.pitan76.mcpitanlib.api.recipe.MatchGetter; import net.pitan76.mcpitanlib.api.recipe.input.CompatRecipeInput; import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; +import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeNonEntry; import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; @@ -48,7 +49,7 @@ public static ItemStack craft(Recipe recipe, Inventory inventory, World world } public static ItemStack getOutput(Recipe recipe, World world) { - return recipe.getResult(world.getRegistryManager()); + return getOutput(recipe, RegistryLookupUtil.getRegistryLookup(world)); } public static List> getAllRecipes(World world) { @@ -65,6 +66,15 @@ public static List> getAllRecipes(World world) { return outRecipes; } + public static List> getAllCompatRecipeEntry(World world) { + List> recipes = getAllRecipes(world); + List> outRecipes = new ArrayList<>(); + for (Recipe recipe : recipes) { + outRecipes.add(new CompatRecipeNonEntry<>(recipe)); + } + return outRecipes; + } + public static RecipeType getType(Recipe recipe) { return recipe.getType(); } @@ -140,7 +150,7 @@ public static ItemStack getOutput(Recipe recipe, CompatRegistryLookup registr } public static ItemStack getOutput(CompatRecipeEntry recipeEntry, CompatRegistryLookup registryLookup) { - return recipeEntry.getRecipe().getResult(registryLookup.getRegistryLookup()); + return getOutput(recipeEntry.getRecipe(), registryLookup); } public static CompatRecipeType getType(CompatRecipeEntry recipeEntry) { diff --git a/info.properties b/info.properties index 62a89ebf1..d5311a091 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.1 +mod_version=3.0.2 maven_group=net.pitan76 changelog=Support for 1.21.3 \ No newline at end of file From 1ac559b83ee4d80c52c9406805110c4f9044d31a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:03:23 +0900 Subject: [PATCH 425/622] add APIs v3.0.3 --- .../api/block/CompatBlockRenderType.java | 25 +++++++ .../api/block/args/RenderTypeArgs.java | 19 +++++ .../mcpitanlib/api/block/args/RotateArgs.java | 36 ++++++++++ .../api/block/args/SideInvisibleArgs.java | 46 ++++++++++++ .../api/block/v2/BlockSettingsBuilder.java | 11 ++- .../mcpitanlib/api/block/v2/CompatBlock.java | 38 ++++++++++ .../api/event/block/AppendPropertiesArgs.java | 7 ++ .../api/event/tile/TileTickEvent.java | 8 +++ .../item/v3/VanillaCompatToolMaterial.java | 72 +++++++++++++++++++ .../api/state/property/BooleanProperty.java | 27 +++++++ .../api/state/property/CompatProperties.java | 20 ++++++ .../api/state/property/EnumProperty.java | 40 +++++++++++ .../api/state/property/IntProperty.java | 35 +++++++++ .../mcpitanlib/api/util/BlockStateUtil.java | 15 ++++ .../mcpitanlib/midohra/block/BlockState.java | 34 +++++++++ info.properties | 2 +- 16 files changed, 431 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlockRenderType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/SideInvisibleArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/state/property/BooleanProperty.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/state/property/EnumProperty.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IntProperty.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlockRenderType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlockRenderType.java new file mode 100644 index 000000000..5c403aca2 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlockRenderType.java @@ -0,0 +1,25 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.block.BlockRenderType; + +public class CompatBlockRenderType { + + public static final CompatBlockRenderType MODEL = of(BlockRenderType.MODEL); + public static final CompatBlockRenderType ENTITYBLOCK_ANIMATED = of(BlockRenderType.ENTITYBLOCK_ANIMATED); + public static final CompatBlockRenderType INVISIBLE = of(BlockRenderType.INVISIBLE); + + @Deprecated + public final BlockRenderType renderType; + + public CompatBlockRenderType(BlockRenderType renderType) { + this.renderType = renderType; + } + + public static CompatBlockRenderType of(BlockRenderType renderType) { + return new CompatBlockRenderType(renderType); + } + + public BlockRenderType toMinecraft() { + return renderType; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java new file mode 100644 index 000000000..7f57e86d5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.block.args; + +import net.minecraft.block.BlockState; + +public class RenderTypeArgs { + public BlockState state; + + public RenderTypeArgs(BlockState state) { + this.state = state; + } + + public BlockState getState() { + return state; + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getState()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java new file mode 100644 index 000000000..f479ed90d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java @@ -0,0 +1,36 @@ +package net.pitan76.mcpitanlib.api.block.args; + +import net.minecraft.block.BlockState; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.Direction; + +public class RotateArgs { + + public BlockState state; + public BlockRotation rotation; + + public RotateArgs(BlockState state, BlockRotation rotation) { + this.state = state; + this.rotation = rotation; + } + + public BlockState getState() { + return state; + } + + public BlockRotation getRotation() { + return rotation; + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public Direction rotate(Direction direction) { + return rotation.rotate(direction); + } + + public net.pitan76.mcpitanlib.midohra.util.math.Direction rotate(net.pitan76.mcpitanlib.midohra.util.math.Direction direction) { + return net.pitan76.mcpitanlib.midohra.util.math.Direction.of(rotation.rotate(direction.toMinecraft())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/SideInvisibleArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/SideInvisibleArgs.java new file mode 100644 index 000000000..503136183 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/SideInvisibleArgs.java @@ -0,0 +1,46 @@ +package net.pitan76.mcpitanlib.api.block.args; + +import net.minecraft.block.BlockState; +import net.minecraft.util.math.Direction; + +public class SideInvisibleArgs { + public BlockState state; + public BlockState stateFrom; + public Direction direction; + + public SideInvisibleArgs(BlockState state, BlockState stateFrom, Direction direction) { + this.state = state; + this.stateFrom = stateFrom; + this.direction = direction; + } + + public SideInvisibleArgs(net.pitan76.mcpitanlib.midohra.block.BlockState state, net.pitan76.mcpitanlib.midohra.block.BlockState stateFrom, net.pitan76.mcpitanlib.midohra.util.math.Direction direction) { + this.state = state.toMinecraft(); + this.stateFrom = stateFrom.toMinecraft(); + this.direction = direction.toMinecraft(); + } + + public BlockState getState() { + return state; + } + + public BlockState getStateFrom() { + return stateFrom; + } + + public Direction getDirection() { + return direction; + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getState()); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraStateFrom() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getStateFrom()); + } + + public net.pitan76.mcpitanlib.midohra.util.math.Direction getMidohraDirection() { + return net.pitan76.mcpitanlib.midohra.util.math.Direction.of(getDirection()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java index fa012ed4e..dffeee616 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java @@ -13,8 +13,8 @@ public class BlockSettingsBuilder { public CompatIdentifier id; - public float hardness; - public float resistance; + public float hardness = -1; + public float resistance = -1; public CompatBlockSoundGroup blockSoundGroup; public CompatibleMaterial material; public CompatMapColor mapColor; @@ -106,7 +106,12 @@ public CompatibleBlockSettings build(CompatIdentifier id) { if (dropsNothing) settings.dropsNothing(); if (luminance != null) settings.luminance((state) -> luminance.applyAsInt(BlockState.of(state))); - return settings.strength(hardness, resistance).sounds(blockSoundGroup); + if (hardness != -1 && resistance != -1) settings.strength(hardness, resistance); + else if (hardness != -1) settings.strength(hardness); + + if (blockSoundGroup != null) settings.sounds(blockSoundGroup); + + return settings; } public AbstractBlock.Settings _build(CompatIdentifier id) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index 57f75cc60..f83e7d57f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -1,6 +1,14 @@ package net.pitan76.mcpitanlib.api.block.v2; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; +import net.pitan76.mcpitanlib.api.block.args.RotateArgs; +import net.pitan76.mcpitanlib.api.block.args.SideInvisibleArgs; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; public class CompatBlock extends ExtendBlock { @@ -19,4 +27,34 @@ public CompatibleBlockSettings getCompatSettings() { public BlockWrapper getWrapper() { return BlockWrapper.of(this); } + + @Override + @Deprecated + protected BlockRenderType getRenderType(BlockState state) { + return getRenderType(new RenderTypeArgs(state)).renderType; + } + + public CompatBlockRenderType getRenderType(RenderTypeArgs args) { + return new CompatBlockRenderType(super.getRenderType(args.state)); + } + + @Override + @Deprecated + protected BlockState rotate(BlockState state, BlockRotation rotation) { + return rotate(new RotateArgs(state, rotation)); + } + + public BlockState rotate(RotateArgs args) { + return super.rotate(args.state, args.rotation); + } + + @Override + @Deprecated + protected boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) { + return isSideInvisible(new SideInvisibleArgs(state, stateFrom, direction)); + } + + public boolean isSideInvisible(SideInvisibleArgs args) { + return super.isSideInvisible(args.state, args.stateFrom, args.direction); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java index 412e03a58..9bd8fa2a1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java @@ -5,6 +5,7 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.Property; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.state.property.IProperty; public class AppendPropertiesArgs extends BaseEvent { public StateManager.Builder builder; @@ -20,4 +21,10 @@ public StateManager.Builder getBuilder() { public void addProperty(Property... properties) { builder.add(properties); } + + public void addProperty(IProperty... properties) { + for (IProperty property : properties) { + builder.add(property.getProperty()); + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java index 80f543f56..8f767a49a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java @@ -17,4 +17,12 @@ public TileTickEvent(World world, BlockPos pos, BlockState state, T blockEntity) this.state = state; this.blockEntity = blockEntity; } + + public boolean isClient() { + return world.isClient(); + } + + public boolean isServer() { + return !isClient(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java new file mode 100644 index 000000000..41c63b9ba --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java @@ -0,0 +1,72 @@ +package net.pitan76.mcpitanlib.api.item.v3; + +import net.minecraft.block.Block; +import net.minecraft.item.ToolMaterial; +import net.minecraft.registry.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; + +public class VanillaCompatToolMaterial implements CompatToolMaterial { + private final ToolMaterial material; + + public static final VanillaCompatToolMaterial WOOD = of(ToolMaterial.WOOD); + public static final VanillaCompatToolMaterial STONE = of(ToolMaterial.STONE); + public static final VanillaCompatToolMaterial IRON = of(ToolMaterial.IRON); + public static final VanillaCompatToolMaterial GOLD = of(ToolMaterial.GOLD); + public static final VanillaCompatToolMaterial DIAMOND = of(ToolMaterial.DIAMOND); + public static final VanillaCompatToolMaterial NETHERITE = of(ToolMaterial.NETHERITE); + + protected VanillaCompatToolMaterial(ToolMaterial material) { + this.material = material; + } + + private static VanillaCompatToolMaterial of(ToolMaterial material) { + return new VanillaCompatToolMaterial(material); + } + + @Override + public RepairIngredientTag getRepairIngredientTag() { + return new RepairIngredientTag(material.repairItems()); + } + + @Override + public int getCompatDurability() { + return material.durability(); + } + + @Override + public float getCompatMiningSpeedMultiplier() { + return material.speed(); + } + + @Override + public float getCompatAttackDamage() { + return material.attackDamageBonus(); + } + + @Override + public int getCompatMiningLevel() { + TagKey tag = material.incorrectBlocksForDrops(); + if (tag == ToolMaterial.WOOD.incorrectBlocksForDrops()) return 0; + if (tag == ToolMaterial.STONE.incorrectBlocksForDrops()) return 1; + if (tag == ToolMaterial.IRON.incorrectBlocksForDrops()) return 2; + if (tag == ToolMaterial.GOLD.incorrectBlocksForDrops()) return 2; + if (tag == ToolMaterial.DIAMOND.incorrectBlocksForDrops()) return 3; + if (tag == ToolMaterial.NETHERITE.incorrectBlocksForDrops()) return 4; + return -1; + } + + @Override + public int getCompatEnchantability() { + return material.enchantmentValue(); + } + + @Deprecated + public ToolMaterial toMinecraft() { + return material; + } + + @Override + public ToolMaterial build() { + return material; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/BooleanProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/BooleanProperty.java new file mode 100644 index 000000000..a6b7775be --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/BooleanProperty.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.state.property; + +public class BooleanProperty implements IProperty { + + private final net.minecraft.state.property.BooleanProperty property; + + public BooleanProperty(String name) { + this(net.minecraft.state.property.BooleanProperty.of(name)); + } + + public BooleanProperty(net.minecraft.state.property.BooleanProperty property) { + this.property = property; + } + + public static BooleanProperty of(String name) { + return new BooleanProperty(name); + } + + public static BooleanProperty of(net.minecraft.state.property.BooleanProperty property) { + return new BooleanProperty(property); + } + + @Override + public net.minecraft.state.property.BooleanProperty getProperty() { + return property; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java index 1e2ffb348..e443066b8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java @@ -1,9 +1,29 @@ package net.pitan76.mcpitanlib.api.state.property; +import net.minecraft.block.enums.BlockHalf; +import net.minecraft.block.enums.StairShape; import net.minecraft.state.property.Properties; public class CompatProperties { public static final DirectionProperty FACING = new DirectionProperty(Properties.FACING); public static final DirectionProperty HORIZONTAL_FACING = new DirectionProperty(Properties.HORIZONTAL_FACING); public static final DirectionProperty HOPPER_FACING = new DirectionProperty(Properties.HOPPER_FACING); + + public static final BooleanProperty POWERED = new BooleanProperty(Properties.POWERED); + public static final BooleanProperty ENABLED = new BooleanProperty(Properties.ENABLED); + public static final BooleanProperty WATERLOGGED = new BooleanProperty(Properties.WATERLOGGED); + public static final BooleanProperty LIT = new BooleanProperty(Properties.LIT); + public static final BooleanProperty OCCUPIED = new BooleanProperty(Properties.OCCUPIED); + public static final BooleanProperty ATTACHED = new BooleanProperty(Properties.ATTACHED); + public static final BooleanProperty HANGING = new BooleanProperty(Properties.HANGING); + public static final BooleanProperty BOTTOM = new BooleanProperty(Properties.BOTTOM); + public static final BooleanProperty OPEN = new BooleanProperty(Properties.OPEN); + public static final BooleanProperty UNSTABLE = new BooleanProperty(Properties.UNSTABLE); + + public static final IntProperty POWER = new IntProperty(Properties.POWER); + public static final IntProperty LAYERS = new IntProperty(Properties.LAYERS); + public static final IntProperty NOTE = new IntProperty(Properties.NOTE); + + public static final EnumProperty BLOCK_HALF = new EnumProperty<>(Properties.BLOCK_HALF); + public static final EnumProperty STAIR_SHAPE = new EnumProperty<>(Properties.STAIR_SHAPE); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/EnumProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/EnumProperty.java new file mode 100644 index 000000000..7e7e9522b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/EnumProperty.java @@ -0,0 +1,40 @@ +package net.pitan76.mcpitanlib.api.state.property; + +import net.minecraft.util.StringIdentifiable; + +import java.util.function.Predicate; + +public class EnumProperty & StringIdentifiable> implements IProperty { + + private final net.minecraft.state.property.EnumProperty property; + + public EnumProperty(String name, Class type) { + this(net.minecraft.state.property.EnumProperty.of(name, type)); + } + + public EnumProperty(String name, Class type, Predicate filter) { + this(net.minecraft.state.property.EnumProperty.of(name, type, filter)); + } + + public EnumProperty(net.minecraft.state.property.EnumProperty property) { + this.property = property; + } + + public static & StringIdentifiable> EnumProperty of(String name, Class type) { + return new EnumProperty<>(name, type); + } + + public static & StringIdentifiable> EnumProperty of(String name, Class type, Predicate filter) { + return new EnumProperty<>(name, type, filter); + } + + + public static & StringIdentifiable> EnumProperty of(net.minecraft.state.property.EnumProperty property) { + return new EnumProperty<>(property); + } + + @Override + public net.minecraft.state.property.EnumProperty getProperty() { + return property; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IntProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IntProperty.java new file mode 100644 index 000000000..850604d9f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IntProperty.java @@ -0,0 +1,35 @@ +package net.pitan76.mcpitanlib.api.state.property; + +public class IntProperty implements IProperty { + + private final net.minecraft.state.property.IntProperty property; + + public IntProperty(String name, int min, int max) { + this(net.minecraft.state.property.IntProperty.of(name, min, max)); + } + + public IntProperty(String name) { + this(name, 0, 15); + } + + public IntProperty(net.minecraft.state.property.IntProperty property) { + this.property = property; + } + + public static IntProperty of(String name) { + return new IntProperty(name); + } + + public static IntProperty of(String name, int min, int max) { + return new IntProperty(name, min, max); + } + + public static IntProperty of(net.minecraft.state.property.IntProperty property) { + return new IntProperty(property); + } + + @Override + public net.minecraft.state.property.IntProperty getProperty() { + return property; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index b3aa60d7f..01009d9a4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -3,11 +3,14 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; import net.minecraft.item.ItemStack; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.Property; +import net.minecraft.util.BlockRotation; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -82,4 +85,16 @@ public static CompatActionResult onUseWithItem(BlockState state, ItemStack stack public static CompatActionResult onUseWithItem_actionResult(BlockState state, ItemStack stack, World world, PlayerEntity player, Hand hand, BlockHitResult hit) { return onUseWithItem(state, stack, world, player, hand, hit); } + + public static FluidState getFluidState(BlockState state) { + return state.getFluidState(); + } + + public static Fluid getFluid(BlockState state) { + return getFluidState(state).getFluid(); + } + + public static BlockState rotate(BlockState state, BlockRotation rotation) { + return state.rotate(rotation); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java index 790e527e1..acdc84640 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java @@ -1,6 +1,8 @@ package net.pitan76.mcpitanlib.midohra.block; +import net.minecraft.state.property.Property; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; +import net.pitan76.mcpitanlib.api.state.property.IProperty; import net.pitan76.mcpitanlib.api.util.BlockStateUtil; public class BlockState { @@ -54,4 +56,36 @@ public String getName() { public net.minecraft.block.BlockState toMinecraft() { return state; } + + public , V extends T> BlockState with(Property property, V value) { + return of(state.with(property, value)); + } + + public , V extends T> BlockState with(IProperty property, V value) { + return with(property.getProperty(), value); + } + + public > BlockState cycle(Property property) { + return of(state.cycle(property)); + } + + public > BlockState cycle(IProperty property) { + return cycle(property.getProperty()); + } + + public > T get(Property property) { + return state.get(property); + } + + public > T get(IProperty property) { + return get(property.getProperty()); + } + + public > boolean contains(Property property) { + return state.contains(property); + } + + public > boolean contains(IProperty property) { + return contains(property.getProperty()); + } } diff --git a/info.properties b/info.properties index d5311a091..665bcd5ae 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.2 +mod_version=3.0.3 maven_group=net.pitan76 changelog=Support for 1.21.3 \ No newline at end of file From 4d1305b89d85541c5981aa9b66943e7c4168da37 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:03:10 +0900 Subject: [PATCH 426/622] fix APIs v3.0.3 --- .../item/v3/VanillaCompatToolMaterial.java | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java index 41c63b9ba..8d3ca27b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v3/VanillaCompatToolMaterial.java @@ -2,18 +2,19 @@ import net.minecraft.block.Block; import net.minecraft.item.ToolMaterial; +import net.minecraft.item.ToolMaterials; import net.minecraft.registry.tag.TagKey; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; public class VanillaCompatToolMaterial implements CompatToolMaterial { private final ToolMaterial material; - public static final VanillaCompatToolMaterial WOOD = of(ToolMaterial.WOOD); - public static final VanillaCompatToolMaterial STONE = of(ToolMaterial.STONE); - public static final VanillaCompatToolMaterial IRON = of(ToolMaterial.IRON); - public static final VanillaCompatToolMaterial GOLD = of(ToolMaterial.GOLD); - public static final VanillaCompatToolMaterial DIAMOND = of(ToolMaterial.DIAMOND); - public static final VanillaCompatToolMaterial NETHERITE = of(ToolMaterial.NETHERITE); + public static final VanillaCompatToolMaterial WOOD = of(ToolMaterials.WOOD); + public static final VanillaCompatToolMaterial STONE = of(ToolMaterials.STONE); + public static final VanillaCompatToolMaterial IRON = of(ToolMaterials.IRON); + public static final VanillaCompatToolMaterial GOLD = of(ToolMaterials.GOLD); + public static final VanillaCompatToolMaterial DIAMOND = of(ToolMaterials.DIAMOND); + public static final VanillaCompatToolMaterial NETHERITE = of(ToolMaterials.NETHERITE); protected VanillaCompatToolMaterial(ToolMaterial material) { this.material = material; @@ -25,39 +26,44 @@ private static VanillaCompatToolMaterial of(ToolMaterial material) { @Override public RepairIngredientTag getRepairIngredientTag() { - return new RepairIngredientTag(material.repairItems()); + if (material == ToolMaterials.STONE) return RepairIngredientTag.STONE_TOOL_MATERIALS; + if (material == ToolMaterials.IRON) return RepairIngredientTag.IRON_TOOL_MATERIALS; + if (material == ToolMaterials.GOLD) return RepairIngredientTag.GOLDEN_TOOL_MATERIALS; + if (material == ToolMaterials.DIAMOND) return RepairIngredientTag.DIAMOND_TOOL_MATERIALS; + if (material == ToolMaterials.NETHERITE) return RepairIngredientTag.NETHERITE_TOOL_MATERIALS; + return RepairIngredientTag.WOODEN_TOOL_MATERIALS; } @Override public int getCompatDurability() { - return material.durability(); + return material.getDurability(); } @Override public float getCompatMiningSpeedMultiplier() { - return material.speed(); + return material.getMiningSpeedMultiplier(); } @Override public float getCompatAttackDamage() { - return material.attackDamageBonus(); + return material.getAttackDamage(); } @Override public int getCompatMiningLevel() { - TagKey tag = material.incorrectBlocksForDrops(); - if (tag == ToolMaterial.WOOD.incorrectBlocksForDrops()) return 0; - if (tag == ToolMaterial.STONE.incorrectBlocksForDrops()) return 1; - if (tag == ToolMaterial.IRON.incorrectBlocksForDrops()) return 2; - if (tag == ToolMaterial.GOLD.incorrectBlocksForDrops()) return 2; - if (tag == ToolMaterial.DIAMOND.incorrectBlocksForDrops()) return 3; - if (tag == ToolMaterial.NETHERITE.incorrectBlocksForDrops()) return 4; + TagKey tag = material.getInverseTag(); + if (tag == ToolMaterials.WOOD.getInverseTag()) return 0; + if (tag == ToolMaterials.STONE.getInverseTag()) return 1; + if (tag == ToolMaterials.IRON.getInverseTag()) return 2; + if (tag == ToolMaterials.GOLD.getInverseTag()) return 2; + if (tag == ToolMaterials.DIAMOND.getInverseTag()) return 3; + if (tag == ToolMaterials.NETHERITE.getInverseTag()) return 4; return -1; } @Override public int getCompatEnchantability() { - return material.enchantmentValue(); + return material.getEnchantability(); } @Deprecated From f7a4f8b9a9838d7232f7f54fdcd2541c328ee548 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:39:21 +0900 Subject: [PATCH 427/622] add with fix APIs v3.0.4 --- README.md | 2 +- .../mcpitanlib/api/block/v2/CompatBlock.java | 16 +++ .../api/event/block/OutlineShapeEvent.java | 17 +++ .../api/event/block/PlacementStateArgs.java | 13 ++ .../api/state/property/DirectionProperty.java | 13 ++ .../api/state/property/IProperty.java | 8 ++ .../api/tile/BlockEntityTypeBuilder.java | 10 +- .../mcpitanlib/api/util/CustomDataUtil.java | 8 ++ .../mcpitanlib/api/util/PropertyUtil.java | 4 + .../mcpitanlib/api/util/item/FuelUtil.java | 16 +++ .../mcpitanlib/api/util/item/ItemUtil.java | 13 ++ .../api/util/world/WorldAccessUtil.java | 35 +++++ .../api/util/world/WorldViewUtil.java | 7 + .../core/registry/FuelRegistry.java | 4 + .../mcpitanlib/midohra/block/BlockState.java | 33 +++-- .../block/entity/BlockEntityWrapper.java | 93 +++++++++++++ .../mcpitanlib/midohra/item/ItemStack.java | 20 ++- .../mcpitanlib/midohra/world/World.java | 90 +++++++++++++ .../mcpitanlib/midohra/world/WorldAccess.java | 122 ++++++++++++++++++ .../fabric/BlockEntityTypeBuilderImpl.java | 16 +++ info.properties | 4 +- .../neoforge/BlockEntityTypeBuilderImpl.java | 14 ++ 22 files changed, 544 insertions(+), 14 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/item/FuelUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java diff --git a/README.md b/README.md index f075c2493..064ca6afb 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ dependencies { `gradle.properties`に以下のように記述してください。 ```properties -# Example: mcpitanlib_version=+1.18.2:2.0.1 +# Example: mcpitanlib_version=+1.18.2:3.0.4 mcpitanlib_version=x.x.x ``` diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index f83e7d57f..24f1aaee2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -57,4 +57,20 @@ protected boolean isSideInvisible(BlockState state, BlockState stateFrom, Direct public boolean isSideInvisible(SideInvisibleArgs args) { return super.isSideInvisible(args.state, args.stateFrom, args.direction); } + + /** + * Compatible for getDefaultState() + * @return default block state + */ + public net.pitan76.mcpitanlib.midohra.block.BlockState getDefaultMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getNewDefaultState()); + } + + /** + * Compatible for setDefaultState() + * @param state BlockState + */ + public void setDefaultState(net.pitan76.mcpitanlib.midohra.block.BlockState state) { + setNewDefaultState(state.toMinecraft()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java index 3eec1b815..7131ee630 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/OutlineShapeEvent.java @@ -6,6 +6,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.state.property.IProperty; public class OutlineShapeEvent extends BaseEvent { public BlockState state; @@ -43,4 +44,20 @@ public > T getProperty(Property property) { public > boolean containsProperty(Property property) { return state.contains(property); } + + public , V extends T> BlockState with(Property property, V value) { + return state.with(property, value); + } + + public > T get(IProperty property) { + return getProperty(property.getProperty()); + } + + public > boolean contains(IProperty property) { + return containsProperty(property.getProperty()); + } + + public , V extends T> net.pitan76.mcpitanlib.midohra.block.BlockState with(IProperty property, V value) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(with(property.getProperty(), value)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java index 416952df3..63df37634 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PlacementStateArgs.java @@ -14,6 +14,7 @@ import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; +import net.pitan76.mcpitanlib.api.state.property.IProperty; import net.pitan76.mcpitanlib.api.util.BlockStateUtil; import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; @@ -106,6 +107,18 @@ public , V extends T> BlockState withBlockState(Property return BlockStateUtil.with(BlockStateUtil.getDefaultState(block), property, value); } + public , V extends T> net.pitan76.mcpitanlib.midohra.block.BlockState with(IProperty property, V value) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(withBlockState(property.getProperty(), value)); + } + + public BlockState getBlockState() { + return BlockStateUtil.getDefaultState(block); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraBlockState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getBlockState()); + } + public BlockEntity getBlockEntity() { return WorldUtil.getBlockEntity(getWorld(), getPos()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java index 50c38ab1e..f1bd61a7b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/DirectionProperty.java @@ -3,6 +3,7 @@ import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Property; import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.midohra.block.BlockState; import java.util.function.Predicate; @@ -30,6 +31,18 @@ public static DirectionProperty of(String name, Predicate filter) { return new DirectionProperty(name, filter); } + public net.pitan76.mcpitanlib.midohra.util.math.Direction getAsMidohra(BlockState state) { + return net.pitan76.mcpitanlib.midohra.util.math.Direction.of(get(state.toMinecraft())); + } + + public BlockState with(BlockState state, net.pitan76.mcpitanlib.midohra.util.math.Direction value) { + return BlockState.of(with(state.toMinecraft(), value.toMinecraft())); + } + + public BlockState cycle(BlockState state) { + return BlockState.of(cycle(state.toMinecraft())); + } + @Override public Property getProperty() { return property; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java index 555fec27e..3fb738dd5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java @@ -17,5 +17,13 @@ default BlockState with(BlockState state, T value) { return state.with(getProperty(), value); } + default boolean contains(BlockState state) { + return state.contains(getProperty()); + } + + default BlockState cycle(BlockState state) { + return state.cycle(getProperty()); + } + Property getProperty(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java index ebee9da24..5a98fb969 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.tile; import com.mojang.datafixers.types.Type; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -38,12 +39,19 @@ public BlockEntityTypeBuilder addBlocks(Block... blocks) { return this; } + public BlockEntityType build() { return build(null); } public BlockEntityType build(Type type) { - return BlockEntityTypeBuilder.create(factory, blocks.toArray(new Block[0])).build(type); + return build(type, factory, blocks.toArray(new Block[0])); + } + + @ExpectPlatform + @Deprecated + public static BlockEntityType build(Type type, Factory factory, Block... blocks) { + throw new AssertionError(); } @FunctionalInterface diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java index 6ce404b72..b5ff1ab9a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java @@ -164,4 +164,12 @@ public static boolean contains(ItemStack stack, String key) { public static void fix_oldNbt(ItemStack stack, String[] keys) { } + + /** + * カスタムNBTを削除する + * @param stack ItemStack + */ + public static void remove(ItemStack stack) { + stack.remove(DataComponentTypes.CUSTOM_DATA); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java index 104d00b92..a97c8dc53 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/PropertyUtil.java @@ -51,6 +51,10 @@ public static Direction get(BlockState state, DirectionProperty property) { return property.get(state); } + public static net.pitan76.mcpitanlib.midohra.util.math.Direction getAsMidohra(BlockState state, DirectionProperty property) { + return net.pitan76.mcpitanlib.midohra.util.math.Direction.of(property.get(state)); + } + public static Direction getFacing(BlockState state) { return facing().get(state); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/FuelUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/FuelUtil.java new file mode 100644 index 000000000..4024ce047 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/FuelUtil.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.util.item; + +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.core.registry.FuelRegistry; + +public class FuelUtil { + + public static int getTime(World world, ItemStack stack) { + return FuelRegistry.get(world, stack); + } + + public static boolean isFuel(World world, ItemStack stack) { + return FuelRegistry.isFuel(world, stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java index d608f7129..2d8c17de6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java @@ -8,6 +8,7 @@ import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; import java.util.ArrayList; import java.util.List; @@ -247,4 +248,16 @@ public static TextComponent getName(Item item) { public static String getTranslationKey(Item item) { return item.getTranslationKey(); } + + public static boolean hasRecipeRemainder(Item item) { + return !ItemStackUtil.isEmpty(getRecipeRemainderStack(item)); + } + + public static Item getRecipeRemainder(Item item) { + return getRecipeRemainderStack(item).getItem(); + } + + public static ItemStack getRecipeRemainderStack(Item item) { + return item.getRecipeRemainder(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java index 8bf0816ab..6bf8142a5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldAccessUtil.java @@ -1,7 +1,10 @@ package net.pitan76.mcpitanlib.api.util.world; import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.entity.Entity; import net.minecraft.fluid.Fluid; +import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldAccess; @@ -14,4 +17,36 @@ public static void scheduleBlockTick(WorldAccess world, BlockPos pos, Block bloc public static void scheduleFluidTick(WorldAccess world, BlockPos pos, Fluid fluid, int delay) { world.scheduleFluidTick(pos, fluid, delay); } + + public static boolean setBlockState(WorldAccess world, BlockPos pos, BlockState state, int flags) { + return world.setBlockState(pos, state, flags); + } + + public static boolean setBlockState(WorldAccess world, BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { + return world.setBlockState(pos, state, flags, maxUpdateDepth); + } + + public static boolean setBlockState(WorldAccess world, BlockPos pos, BlockState state) { + return setBlockState(world, pos, state, 3); + } + + public static BlockState getBlockState(WorldAccess world, BlockPos pos) { + return world.getBlockState(pos); + } + + public static boolean breakBlock(WorldAccess world, BlockPos pos, boolean drop) { + return world.breakBlock(pos, drop); + } + + public static boolean breakBlock(WorldAccess world, BlockPos pos, boolean drop, Entity entity) { + return world.breakBlock(pos, drop, entity); + } + + public static boolean removeBlock(WorldAccess world, BlockPos pos, boolean move) { + return world.removeBlock(pos, move); + } + + public static MinecraftServer getServer(WorldAccess world) { + return world.getServer(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java index abe0d816e..f90af366b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/WorldViewUtil.java @@ -3,6 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.registry.tag.FluidTags; @@ -10,6 +11,8 @@ import net.minecraft.world.WorldView; import net.minecraft.world.dimension.DimensionType; +import java.util.Optional; + public class WorldViewUtil { public static boolean isClient(WorldView world) { @@ -28,6 +31,10 @@ public static BlockEntity getBlockEntity(WorldView world, BlockPos pos) { return world.getBlockEntity(pos); } + public static Optional getBlockEntity(WorldView world, BlockPos pos, BlockEntityType type) { + return world.getBlockEntity(pos, type); + } + public static FluidState getFluidState(WorldView world, BlockPos pos) { return getBlockState(world, pos).getFluidState(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java index 42062ef4e..fe27eaae3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java @@ -21,4 +21,8 @@ public static int get(ItemStack stack) { public static int get(World world, ItemStack stack) { return dev.architectury.registry.fuel.FuelRegistry.get(stack); } + + public static boolean isFuel(World world, ItemStack stack) { + return world.getFuelRegistry().isFuel(stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java index acdc84640..7440041bd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java @@ -2,6 +2,7 @@ import net.minecraft.state.property.Property; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; +import net.pitan76.mcpitanlib.api.state.property.DirectionProperty; import net.pitan76.mcpitanlib.api.state.property.IProperty; import net.pitan76.mcpitanlib.api.util.BlockStateUtil; @@ -30,20 +31,20 @@ public boolean isExist() { } public boolean isEmpty() { - return state == null; + return toMinecraft() == null; } public boolean isAir() { - return isEmpty() || BlockStateUtil.isAir(state); + return isEmpty() || BlockStateUtil.isAir(toMinecraft()); } public CompatBlockSoundGroup getSoundGroup() { - return BlockStateUtil.getCompatSoundGroup(state); + return BlockStateUtil.getCompatSoundGroup(toMinecraft()); } public BlockWrapper getBlock() { if (blockWrapper == null) - blockWrapper = BlockWrapper.of(BlockStateUtil.getBlock(state)); + blockWrapper = BlockWrapper.of(BlockStateUtil.getBlock(toMinecraft())); return blockWrapper; } @@ -58,34 +59,50 @@ public net.minecraft.block.BlockState toMinecraft() { } public , V extends T> BlockState with(Property property, V value) { - return of(state.with(property, value)); + return of(toMinecraft().with(property, value)); } public , V extends T> BlockState with(IProperty property, V value) { return with(property.getProperty(), value); } + public BlockState with(DirectionProperty property, net.pitan76.mcpitanlib.midohra.util.math.Direction value) { + return of(property.with(toMinecraft(), value.toMinecraft())); + } + public > BlockState cycle(Property property) { - return of(state.cycle(property)); + return of(toMinecraft().cycle(property)); } public > BlockState cycle(IProperty property) { return cycle(property.getProperty()); } + public BlockState cycle(DirectionProperty property) { + return of(property.cycle(toMinecraft())); + } + public > T get(Property property) { - return state.get(property); + return toMinecraft().get(property); } public > T get(IProperty property) { return get(property.getProperty()); } + public net.pitan76.mcpitanlib.midohra.util.math.Direction get(DirectionProperty property) { + return net.pitan76.mcpitanlib.midohra.util.math.Direction.of(get(property.getProperty())); + } + public > boolean contains(Property property) { - return state.contains(property); + return toMinecraft().contains(property); } public > boolean contains(IProperty property) { return contains(property.getProperty()); } + + public boolean contains(DirectionProperty property) { + return contains(property.getProperty()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java new file mode 100644 index 000000000..e2c94d201 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java @@ -0,0 +1,93 @@ +package net.pitan76.mcpitanlib.midohra.block.entity; + +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.BlockEntityUtil; +import net.pitan76.mcpitanlib.api.util.RegistryLookupUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.nbt.NbtCompound; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.World; + +public class BlockEntityWrapper { + private final net.minecraft.block.entity.BlockEntity blockEntity; + + public static final BlockEntityWrapper EMPTY = new BlockEntityWrapper(null); + + protected BlockEntityWrapper(net.minecraft.block.entity.BlockEntity blockEntity) { + this.blockEntity = blockEntity; + } + + public static BlockEntityWrapper of(net.minecraft.block.entity.BlockEntity blockEntity) { + return new BlockEntityWrapper(blockEntity); + } + + public static BlockEntityWrapper of() { + return EMPTY; + } + + public net.minecraft.block.entity.BlockEntity get() { + return blockEntity; + } + + public BlockPos getPos() { + return BlockPos.of(get().getPos()); + } + + public boolean isExist() { + return !isEmpty(); + } + + public boolean isEmpty() { + return this == EMPTY || get() == null; + } + + public boolean isRemoved() { + return get().isRemoved(); + } + + public void markDirty() { + BlockEntityUtil.markDirty(get()); + } + + public World getWorld() { + return World.of(BlockEntityUtil.getWorld(get())); + } + + public BlockWrapper getBlock() { + return BlockWrapper.of(BlockEntityUtil.getBlock(get())); + } + + + public BlockState getBlockState() { + return BlockState.of(BlockEntityUtil.getBlockState(get())); + } + + public BlockState getCachedState() { + return BlockState.of(BlockEntityUtil.getCachedState(get())); + } + + public NbtCompound createNbt() { + return NbtCompound.of(BlockEntityUtil.getBlockEntityNbt(get())); + } + + public void markRemoved() { + BlockEntityUtil.markRemoved(get()); + } + + public void writeNbt(NbtCompound nbt, CompatRegistryLookup registryLookup) { + BlockEntityUtil.writeNbt(get(), nbt.toMinecraft(), registryLookup); + } + + public void readNbt(NbtCompound nbt, CompatRegistryLookup registryLookup) { + BlockEntityUtil.readNbt(get(), nbt.toMinecraft(), registryLookup); + } + + public void writeNbt(NbtCompound nbt) { + writeNbt(nbt, RegistryLookupUtil.getRegistryLookup(get())); + } + + public void readNbt(NbtCompound nbt) { + readNbt(nbt, RegistryLookupUtil.getRegistryLookup(get())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java index 0fef58538..29627807a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java @@ -44,14 +44,26 @@ public void setCount(int count) { stack.setCount(count); } - public NbtCompound getNbt() { + public NbtCompound getCustomNbt() { return CustomDataUtil.getNbt(stack); } - public void setNbt(NbtCompound nbt) { + public void setCustomNbt(NbtCompound nbt) { CustomDataUtil.setNbt(stack, nbt); } + public void removeCustomNbt() { + CustomDataUtil.remove(stack); + } + + public boolean hasCustomNbt() { + return CustomDataUtil.hasNbt(stack); + } + + public boolean isEmpty() { + return stack.isEmpty(); + } + public CompatIdentifier getItemId() { return ItemUtil.toCompatID(stack.getItem()); } @@ -60,6 +72,10 @@ public ItemStack copy() { return new ItemStack(stack.copy()); } + public ItemStack copyWithCount(int count) { + return new ItemStack(stack.copyWithCount(count)); + } + public Map getEnchantments(@Nullable World world) { return EnchantmentUtil.getEnchantment(stack, world); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java new file mode 100644 index 000000000..a8d8f4b46 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java @@ -0,0 +1,90 @@ +package net.pitan76.mcpitanlib.midohra.world; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.fluid.FluidState; +import net.minecraft.server.world.ServerWorld; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; + +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public class World extends WorldAccess { + + private final net.minecraft.world.World world; + + protected World(net.minecraft.world.World world) { + super(null); + this.world = world; + } + + @Override + public net.minecraft.world.World getWorld() { + return world; + } + + public static World of(net.minecraft.world.World world) { + return new World(world); + } + + public net.minecraft.world.World toMinecraft() { + return getWorld(); + } + + public void addBlockEntity(BlockEntityWrapper blockEntity) { + addBlockEntity(blockEntity.get()); + } + + public void addBlockEntity(BlockEntity blockEntity) { + getWorld().addBlockEntity(blockEntity); + } + + public void removeBlockEntity(BlockPos pos) { + getWorld().removeBlockEntity(pos.toMinecraft()); + } + + public long getTime() { + return WorldUtil.getTime(getWorld()); + } + + public long getTopY() { + return WorldUtil.getTopY(getWorld()); + } + + public long getBottomY() { + return WorldUtil.getBottomY(getWorld()); + } + + public long getDimensionHeight() { + return WorldUtil.getDimensionHeight(getWorld()); + } + + public CompatIdentifier getId() { + return WorldUtil.getCompatWorldId(getWorld()); + } + + public FluidState getRawFluidState(BlockPos pos) { + return WorldUtil.getFluidState(getWorld(), pos.toMinecraft()); + } + + public Player getPlayerByUUID(UUID uuid) { + return WorldUtil.getPlayer(getWorld(), uuid); + } + + public List getPlayers() { + return WorldUtil.getPlayers(getWorld()); + } + + public BlockPos getSpawnPos() { + return BlockPos.of(WorldUtil.getSpawnPos(getWorld())); + } + + public Optional getWorld(CompatIdentifier id) { + Optional optional = WorldUtil.getWorld(getWorld(), id); + return optional.map(World::of); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java new file mode 100644 index 000000000..8e07bb881 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java @@ -0,0 +1,122 @@ +package net.pitan76.mcpitanlib.midohra.world; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.MinecraftServer; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; +import net.pitan76.mcpitanlib.api.util.world.WorldAccessUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; + +import java.util.Optional; + +public class WorldAccess { + private final net.minecraft.world.WorldAccess world; + + protected WorldAccess(net.minecraft.world.WorldAccess world) { + this.world = world; + } + + public static WorldAccess of(net.minecraft.world.WorldAccess world) { + return new WorldAccess(world); + } + + protected net.minecraft.world.WorldAccess getWorld() { + return world; + } + + public net.minecraft.world.WorldAccess toMinecraft() { + return getWorld(); + } + + public boolean isClient() { + return WorldAccessUtil.isClient(getWorld()); + } + + public boolean isServer() { + return !isClient(); + } + + public CompatRandom getRandom() { + return new CompatRandom(getWorld().getRandom()); + } + + public MinecraftServer getServer() { + return WorldAccessUtil.getServer(getWorld()); + } + + public BlockEntityWrapper getBlockEntity(BlockPos pos) { + return BlockEntityWrapper.of(WorldAccessUtil.getBlockEntity(getWorld(), pos.toMinecraft())); + } + + public Optional getRawBlockEntity(BlockPos pos, BlockEntityType type) { + return WorldAccessUtil.getBlockEntity(getWorld(), pos.toMinecraft(), type); + } + + public BlockEntityWrapper getBlockEntity(BlockPos pos, BlockEntityType type) { + Optional blockEntity = WorldAccessUtil.getBlockEntity(getWorld(), pos.toMinecraft(), type); + return blockEntity.map(BlockEntityWrapper::of).orElse(BlockEntityWrapper.of()); + } + + public boolean removeBlock(BlockPos pos, boolean move) { + return WorldAccessUtil.removeBlock(getWorld(), pos.toMinecraft(), move); + } + + public boolean breakBlock(BlockPos pos, boolean drop) { + return WorldAccessUtil.breakBlock(getWorld(), pos.toMinecraft(), drop); + } + + public boolean breakBlock(BlockPos pos, boolean drop, Entity entity) { + return WorldAccessUtil.breakBlock(getWorld(), pos.toMinecraft(), drop, entity); + } + + public BlockState getBlockState(BlockPos pos) { + return BlockState.of(WorldAccessUtil.getBlockState(getWorld(), pos.toMinecraft())); + } + + public boolean setBlockState(BlockPos pos, BlockState state, int flags) { + return WorldAccessUtil.setBlockState(getWorld(), pos.toMinecraft(), state.toMinecraft(), flags); + } + + public boolean setBlockState(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { + return WorldAccessUtil.setBlockState(getWorld(), pos.toMinecraft(), state.toMinecraft(), flags, maxUpdateDepth); + } + + public boolean setBlockState(BlockPos pos, BlockState state) { + return WorldAccessUtil.setBlockState(getWorld(), pos.toMinecraft(), state.toMinecraft()); + } + + @Deprecated + public void playSound(PlayerEntity playerEntity, net.minecraft.util.math.BlockPos pos, SoundEvent sound, SoundCategory category, float volume, float pitch) { + getWorld().playSound(playerEntity, pos, sound, category, volume, pitch); + } + + @Deprecated + public void playSound(PlayerEntity playerEntity, net.minecraft.util.math.BlockPos pos, SoundEvent sound, SoundCategory category) { + getWorld().playSound(playerEntity, pos, sound, category); + } + + public void playSound(Player player, BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { + playSound(player.getEntity(), pos.toMinecraft(), soundEvent.get(), category.get(), volume, pitch); + } + + public void playSound(Player player, BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category) { + playSound(player.getEntity(), pos.toMinecraft(), soundEvent.get(), category.get()); + } + + public void playSound(BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { + playSound(null, pos.toMinecraft(), soundEvent.get(), category.get(), volume, pitch); + } + + public void playSound(BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category) { + playSound(null, pos.toMinecraft(), soundEvent.get(), category.get()); + } +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java new file mode 100644 index 000000000..f4a58fdc3 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.tile.fabric; + +import com.mojang.datafixers.types.Type; +import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder; + +public class BlockEntityTypeBuilderImpl { + @Deprecated + public static BlockEntityType build(Type type, BlockEntityTypeBuilder.Factory factory, Block... blocks) { + FabricBlockEntityTypeBuilder builder = FabricBlockEntityTypeBuilder.create(factory::create, blocks); + return builder.build(type); + } +} diff --git a/info.properties b/info.properties index 665bcd5ae..96a80533e 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.3 +mod_version=3.0.4 maven_group=net.pitan76 -changelog=Support for 1.21.3 \ No newline at end of file +changelog=Fix APIs \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java new file mode 100644 index 000000000..1d132e365 --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.tile.neoforge; + +import com.mojang.datafixers.types.Type; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder; + +public class BlockEntityTypeBuilderImpl { + @Deprecated + public static BlockEntityType build(Type type, BlockEntityTypeBuilder.Factory factory, Block... blocks) { + return new BlockEntityType<>(factory::create, blocks); + } +} From 4478ddb951c0c77e747df444f23143e2d848d929 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 13 Nov 2024 14:24:27 +0900 Subject: [PATCH 428/622] 1211 --- .../java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java | 4 ++-- .../net/pitan76/mcpitanlib/core/registry/FuelRegistry.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java index 2d8c17de6..f2522401e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/item/ItemUtil.java @@ -254,10 +254,10 @@ public static boolean hasRecipeRemainder(Item item) { } public static Item getRecipeRemainder(Item item) { - return getRecipeRemainderStack(item).getItem(); + return item.getRecipeRemainder(); } public static ItemStack getRecipeRemainderStack(Item item) { - return item.getRecipeRemainder(); + return ItemStackUtil.create(getRecipeRemainder(item)); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java index fe27eaae3..b895feb2c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/FuelRegistry.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.core.registry; +import net.minecraft.block.entity.AbstractFurnaceBlockEntity; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -23,6 +24,6 @@ public static int get(World world, ItemStack stack) { } public static boolean isFuel(World world, ItemStack stack) { - return world.getFuelRegistry().isFuel(stack); + return AbstractFurnaceBlockEntity.canUseAsFuel(stack); } } From 7165735b9407a752278ab74a101e0510a934e9cb Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:03:36 +0900 Subject: [PATCH 429/622] 1211 --- .../api/tile/BlockEntityTypeBuilder.java | 9 +-------- .../tile/fabric/BlockEntityTypeBuilderImpl.java | 16 ---------------- .../neoforge/BlockEntityTypeBuilderImpl.java | 14 -------------- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java delete mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java index 5a98fb969..f70657be2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/BlockEntityTypeBuilder.java @@ -1,7 +1,6 @@ package net.pitan76.mcpitanlib.api.tile; import com.mojang.datafixers.types.Type; -import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; @@ -45,13 +44,7 @@ public BlockEntityType build() { } public BlockEntityType build(Type type) { - return build(type, factory, blocks.toArray(new Block[0])); - } - - @ExpectPlatform - @Deprecated - public static BlockEntityType build(Type type, Factory factory, Block... blocks) { - throw new AssertionError(); + return BlockEntityType.Builder.create(factory::create, blocks.toArray(new Block[0])).build(type); } @FunctionalInterface diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java deleted file mode 100644 index f4a58fdc3..000000000 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/BlockEntityTypeBuilderImpl.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.pitan76.mcpitanlib.api.tile.fabric; - -import com.mojang.datafixers.types.Type; -import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; -import net.minecraft.block.Block; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.BlockEntityType; -import net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder; - -public class BlockEntityTypeBuilderImpl { - @Deprecated - public static BlockEntityType build(Type type, BlockEntityTypeBuilder.Factory factory, Block... blocks) { - FabricBlockEntityTypeBuilder builder = FabricBlockEntityTypeBuilder.create(factory::create, blocks); - return builder.build(type); - } -} diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java deleted file mode 100644 index 1d132e365..000000000 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/tile/neoforge/BlockEntityTypeBuilderImpl.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.pitan76.mcpitanlib.api.tile.neoforge; - -import com.mojang.datafixers.types.Type; -import net.minecraft.block.Block; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.BlockEntityType; -import net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder; - -public class BlockEntityTypeBuilderImpl { - @Deprecated - public static BlockEntityType build(Type type, BlockEntityTypeBuilder.Factory factory, Block... blocks) { - return new BlockEntityType<>(factory::create, blocks); - } -} From a1e7dd96dffe3d781e66b9775fca3476997e1a7c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 16 Nov 2024 09:13:45 +0900 Subject: [PATCH 430/622] fix midohera api --- .../api/block/args/RenderTypeArgs.java | 10 +- .../mcpitanlib/api/block/args/RotateArgs.java | 8 +- .../api/block/args/v2/OutlineShapeEvent.java | 64 +++++++ .../api/block/args/v2/PlacementStateArgs.java | 166 ++++++++++++++++++ .../args/v2/StateForNeighborUpdateArgs.java | 105 +++++++++++ .../mcpitanlib/api/block/v2/CompatBlock.java | 35 ++++ .../api/event/block/BlockUseEvent.java | 27 +++ .../api/event/block/StateReplacedEvent.java | 27 +++ .../api/event/item/ItemUseEvent.java | 11 ++ .../api/event/item/ItemUseOnBlockEvent.java | 27 +++ .../mcpitanlib/api/util/BlockStateUtil.java | 9 + .../mcpitanlib/api/util/FluidStateUtil.java | 9 + .../mcpitanlib/api/util/FluidUtil.java | 8 + .../mcpitanlib/api/util/ItemStackUtil.java | 5 + .../pitan76/mcpitanlib/midohra/Midohra.java | 160 +++++++++++++++++ .../mcpitanlib/midohra/block/BlockState.java | 1 - .../midohra/block/SupplierBlockWrapper.java | 5 + .../midohra/fluid/FluidWrapper.java | 83 +++++++++ .../holder/BlockStatePropertyHolder.java | 24 +++ .../mcpitanlib/midohra/nbt/NbtCompound.java | 1 - .../mcpitanlib/midohra/nbt/NbtElement.java | 1 - .../mcpitanlib/midohra/nbt/NbtList.java | 1 - .../midohra/util/math/BlockPos.java | 1 - .../midohra/util/math/Direction.java | 26 +-- .../mcpitanlib/midohra/world/BlockView.java | 41 +++++ .../mcpitanlib/midohra/world/IWorldView.java | 23 +++ .../mcpitanlib/midohra/world/World.java | 36 ++-- .../mcpitanlib/midohra/world/WorldAccess.java | 38 ++-- .../mcpitanlib/midohra/world/WorldView.java | 66 +++++++ .../midohra/world/tick/ScheduledTickView.java | 47 +++++ info.properties | 2 +- 31 files changed, 1007 insertions(+), 60 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/OutlineShapeEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/Midohra.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/BlockView.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java index 7f57e86d5..645b17745 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RenderTypeArgs.java @@ -1,19 +1,21 @@ package net.pitan76.mcpitanlib.api.block.args; import net.minecraft.block.BlockState; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; -public class RenderTypeArgs { +public class RenderTypeArgs implements BlockStatePropertyHolder { public BlockState state; public RenderTypeArgs(BlockState state) { this.state = state; } - public BlockState getState() { + public BlockState getRawBlockState() { return state; } - public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { - return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getState()); + @Override + public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getRawBlockState()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java index f479ed90d..0b4e6339e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/RotateArgs.java @@ -3,8 +3,9 @@ import net.minecraft.block.BlockState; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.Direction; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; -public class RotateArgs { +public class RotateArgs implements BlockStatePropertyHolder { public BlockState state; public BlockRotation rotation; @@ -14,14 +15,15 @@ public RotateArgs(BlockState state, BlockRotation rotation) { this.rotation = rotation; } - public BlockState getState() { + public BlockState getRawBlockState() { return state; } - public BlockRotation getRotation() { + public BlockRotation getRawRotation() { return rotation; } + @Override public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState() { return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/OutlineShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/OutlineShapeEvent.java new file mode 100644 index 000000000..225949458 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/OutlineShapeEvent.java @@ -0,0 +1,64 @@ +package net.pitan76.mcpitanlib.api.block.args.v2; + +import net.minecraft.block.ShapeContext; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.BlockView; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; + +public class OutlineShapeEvent extends BaseEvent implements BlockStatePropertyHolder { + public BlockState state; + public BlockView world; + public BlockPos pos; + public ShapeContext context; + + public OutlineShapeEvent(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + this.state = state; + this.world = world; + this.pos = pos; + this.context = context; + } + + public OutlineShapeEvent(net.minecraft.block.BlockState state, net.minecraft.world.BlockView world, net.minecraft.util.math.BlockPos pos, net.minecraft.block.ShapeContext context) { + this(BlockState.of(state), BlockView.of(world), BlockPos.of(pos), context); + } + + @Override + public BlockState getBlockState() { + return state; + } + + public BlockEntityWrapper getBlockEntity() { + return world.getBlockEntity(pos); + } + + public BlockEntity getRawBlockEntity() { + return getBlockEntity().get(); + } + + public IWorldView getWorldView() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public ShapeContext getContext() { + return context; + } + + public boolean isHolding(Item item) { + return getContext().isHolding(item); + } + + public boolean isHolding(ItemWrapper item) { + return isHolding(item.get()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java new file mode 100644 index 000000000..88bc840f6 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java @@ -0,0 +1,166 @@ +package net.pitan76.mcpitanlib.api.block.args.v2; + +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.state.property.Property; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; +import net.pitan76.mcpitanlib.api.util.BlockStateUtil; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; +import net.pitan76.mcpitanlib.midohra.world.World; +import net.pitan76.mcpitanlib.mixin.ItemUsageContextMixin; +import org.jetbrains.annotations.Nullable; + +public class PlacementStateArgs extends BaseEvent implements BlockStatePropertyHolder { + public ItemPlacementContext ctx; + + @Nullable + public Block block; + + public PlacementStateArgs(ItemPlacementContext ctx) { + this.ctx = ctx; + } + + public PlacementStateArgs(ItemPlacementContext ctx, @Nullable Block block) { + this.ctx = ctx; + this.block = block; + } + + public boolean canPlace() { + return ctx.canPlace(); + } + + public BlockPos getRawPos() { + return ctx.getBlockPos(); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getRawPos()); + } + + public Player getPlayer() { + return new Player(ctx.getPlayer()); + } + + public Direction[] getPlacementDirections() { + net.minecraft.util.math.Direction[] rawDirs = getRawPlacementDirections(); + Direction[] directions = new Direction[rawDirs.length]; + for (int i = 0; i < directions.length; i++) { + directions[i] = Direction.of(rawDirs[i]); + } + + return directions; + } + + public net.minecraft.util.math.Direction[] getRawPlacementDirections() { + return ctx.getPlacementDirections(); + } + + public Hand getHand() { + return ctx.getHand(); + } + + public Direction getSide() { + return Direction.of(getRawSide()); + } + + public net.minecraft.util.math.Direction getRawSide() { + return ctx.getSide(); + } + + public Direction getHorizontalPlayerFacing() { + return Direction.of(getRawHorizontalPlayerFacing()); + } + + public net.minecraft.util.math.Direction getRawHorizontalPlayerFacing() { + return ctx.getHorizontalPlayerFacing(); + } + + public float getPlayerYaw() { + return ctx.getPlayerYaw(); + } + + public World getWorld() { + return World.of(ctx.getWorld()); + } + + public IWorldView getWorldView() { + return getWorld(); + } + + public boolean isClient() { + return getWorld().isClient(); + } + + public Vec3d getHitPos() { + return ctx.getHitPos(); + } + + public boolean canReplaceExisting() { + return ctx.canReplaceExisting(); + } + + @Deprecated + public ItemUsageContextMixin getIUCAccessor() { + return (ItemUsageContextMixin) ctx; + } + + public BlockHitResult getHitResult() { + return getIUCAccessor().getHit(); + } + + public ItemUseOnBlockEvent toItemUseOnBlockEvent() { + return new ItemUseOnBlockEvent(getWorld().getRaw(), getPlayer().getPlayerEntity(), getHand(), ctx.getStack(), getHitResult()); + } + + public ItemPlacementContext getCtx() { + return ctx; + } + + public @Nullable Block getRawBlock() { + return block; + } + + public boolean isBlockExist() { + return block != null; + } + + public net.minecraft.block.BlockState getRawBlockState() { + return BlockStateUtil.getDefaultState(block); + } + + public BlockEntity getRawBlockEntity() { + return getWorld().getBlockEntity(getRawPos()); + } + + public BlockWrapper getBlock() { + return BlockWrapper.of(block); + } + + public , V extends T> net.minecraft.block.BlockState with(Property property, V value) { + if (block == null) + return null; + + return BlockStateUtil.with(BlockStateUtil.getDefaultState(block), property, value); + } + + @Override + public BlockState getBlockState() { + return BlockState.of(getRawBlockState()); + } + + public BlockEntityWrapper getBlockEntity() { + return getWorld().getBlockEntity(getPos()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java new file mode 100644 index 000000000..b484d2029 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java @@ -0,0 +1,105 @@ +package net.pitan76.mcpitanlib.api.block.args.v2; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.tick.ScheduledTickView; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; + +public class StateForNeighborUpdateArgs implements BlockStatePropertyHolder { + public BlockState state; + public Direction direction; + public BlockState neighborState; + public WorldView world; + public BlockPos pos; + public BlockPos neighborPos; + public ScheduledTickView tickView; + public CompatRandom random; + + public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + this.state = state; + this.direction = direction; + this.neighborState = neighborState; + this.world = world; + this.pos = pos; + this.neighborPos = neighborPos; + } + + public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldView world, BlockPos pos, BlockPos neighborPos, ScheduledTickView tickView, CompatRandom random) { + this.state = state; + this.direction = direction; + this.neighborState = neighborState; + this.world = world; + this.pos = pos; + this.neighborPos = neighborPos; + this.tickView = tickView; + this.random = random; + } + + public Direction getDirection() { + return direction; + } + + public BlockState getRawNeighborState() { + return neighborState; + } + + public WorldView getRawWorld() { + return world; + } + + public BlockPos getRawPos() { + return pos; + } + + public BlockPos getRawNeighborPos() { + return neighborPos; + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getNeighborState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getRawNeighborState()); + } + + public net.pitan76.mcpitanlib.midohra.world.WorldView getWorld() { + return net.pitan76.mcpitanlib.midohra.world.WorldView.of(getRawWorld()); + } + + public IWorldView getWorldView() { + return getWorld(); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getRawPos()); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getNeighborPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getRawNeighborPos()); + } + + public CompatRandom getRandom() { + return random; + } + + public net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView getTickView() { + return net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView.of(tickView); + } + + @Override + public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public BlockEntityWrapper getBlockEntity() { + return getWorld().getBlockEntity(getPos()); + } + + public BlockEntity getRawBlockEntity() { + return world.getBlockEntity(pos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index 24f1aaee2..6c02c1a64 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -4,12 +4,17 @@ import net.minecraft.block.BlockState; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; import net.pitan76.mcpitanlib.api.block.args.RotateArgs; import net.pitan76.mcpitanlib.api.block.args.SideInvisibleArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import org.jetbrains.annotations.Nullable; public class CompatBlock extends ExtendBlock { @@ -73,4 +78,34 @@ public net.pitan76.mcpitanlib.midohra.block.BlockState getDefaultMidohraState() public void setDefaultState(net.pitan76.mcpitanlib.midohra.block.BlockState state) { setNewDefaultState(state.toMinecraft()); } + + public @Nullable net.pitan76.mcpitanlib.midohra.block.BlockState getPlacementState(PlacementStateArgs args) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(super.getPlacementState(args.ctx)); + } + + @Deprecated + @Override + public @Nullable BlockState getPlacementState(net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs args) { + return getPlacementState(new PlacementStateArgs(args.ctx)).toMinecraft(); + } + + public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { + return super.getStateForNeighborUpdate(args.state, args.world, args.tickView, args.pos, args.direction, args.neighborPos, args.neighborState, args.random.getMcRandom()); + } + + @Deprecated + @Override + public BlockState getStateForNeighborUpdate(net.pitan76.mcpitanlib.api.event.block.StateForNeighborUpdateArgs args) { + return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos, args.tickView, args.random)); + } + + public VoxelShape getOutlineShape(OutlineShapeEvent e) { + return super.getOutlineShape(e.state.toMinecraft(), e.world.getRaw(), e.pos.toMinecraft(), e.context); + } + + @Deprecated + @Override + public VoxelShape getOutlineShape(net.pitan76.mcpitanlib.api.event.block.OutlineShapeEvent e) { + return getOutlineShape(new OutlineShapeEvent(e.state, e.world, e.pos, e.context)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java index 55b5f4d50..f6d29de43 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockUseEvent.java @@ -12,6 +12,9 @@ import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; public class BlockUseEvent extends BaseEvent { public BlockState state; @@ -99,4 +102,28 @@ public BlockEntity getBlockEntity() { public boolean isSneaking() { return player.isSneaking(); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public IWorldView getWorldView() { + return getMidohraWorld(); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(pos); + } + + public BlockWrapper getBlockWrapper() { + return BlockWrapper.of(state.getBlock()); + } + + public BlockEntityWrapper getBlockEntityWrapper() { + return BlockEntityWrapper.of(getBlockEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java index a314e2526..a3e2d0e08 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java @@ -7,6 +7,9 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; public class StateReplacedEvent extends BaseEvent { @@ -92,4 +95,28 @@ public boolean hasInventory() { public void updateComparators() { WorldUtil.updateComparators(getWorld(), getPos(), getState().getBlock()); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public IWorldView getWorldView() { + return getMidohraWorld(); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(pos); + } + + public BlockWrapper getBlockWrapper() { + return BlockWrapper.of(state.getBlock()); + } + + public BlockEntityWrapper getBlockEntityWrapper() { + return BlockEntityWrapper.of(getBlockEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java index 1fb17b585..da5d8d2f4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseEvent.java @@ -8,6 +8,9 @@ import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.StackActionResult; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; public class ItemUseEvent extends BaseEvent { @@ -96,4 +99,12 @@ public StackActionResult consume() { public boolean isSneaking() { return user.isSneaking(); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public IWorldView getWorldView() { + return getMidohraWorld(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java index 080663db9..0ac1977e8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemUseOnBlockEvent.java @@ -15,6 +15,9 @@ import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; import org.jetbrains.annotations.Nullable; public class ItemUseOnBlockEvent extends BaseEvent { @@ -110,4 +113,28 @@ public Vec3d getPos() { public Direction getSide() { return hit.getSide(); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public IWorldView getWorldView() { + return getMidohraWorld(); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getBlockState()); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getBlockPos()); + } + + public BlockWrapper getBlockWrapper() { + return getMidohraState().getBlock(); + } + + public BlockEntityWrapper getBlockEntityWrapper() { + return BlockEntityWrapper.of(getBlockEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index 01009d9a4..1c03fccf1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -20,6 +20,7 @@ import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; import net.pitan76.mcpitanlib.api.util.block.BlockHitResultUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; public class BlockStateUtil { public static Block getBlock(BlockState state) { @@ -97,4 +98,12 @@ public static Fluid getFluid(BlockState state) { public static BlockState rotate(BlockState state, BlockRotation rotation) { return state.rotate(rotation); } + + public static net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraDefaultState(Block block) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getDefaultState(block)); + } + + public static net.pitan76.mcpitanlib.midohra.block.BlockState getDefaultState(BlockWrapper block) { + return block.getDefaultState(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java index 3f00687cb..18355350a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.util; import net.minecraft.block.BlockState; +import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.registry.tag.FluidTags; @@ -17,4 +18,12 @@ public static boolean isLava(FluidState state) { public static FluidState getFluidState(BlockState state) { return state.getFluidState(); } + + public static FluidState getDefaultState(Fluid state) { + return state.getDefaultState(); + } + + public static Fluid getFluid(FluidState state) { + return state.getFluid(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java index b2a0aa1b5..8195dd203 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidUtil.java @@ -4,6 +4,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; +import net.minecraft.item.Item; import net.minecraft.registry.Registries; import net.minecraft.util.Identifier; import net.minecraft.world.WorldView; @@ -17,6 +18,10 @@ public static Fluid fromId(Identifier identifier) { return Registries.FLUID.get(identifier); } + public static Fluid fromId(CompatIdentifier identifier) { + return fromId(identifier.toMinecraft()); + } + public static int getRawId(Fluid fluid) { return Registries.FLUID.getRawId(fluid); } @@ -98,4 +103,7 @@ public static FluidState getDefaultState(Fluid fluid) { } + public static Item getBucketItem(Fluid fluid) { + return fluid.getBucketItem(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 5ba54a735..adbd8567a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -9,6 +9,7 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; import java.util.Objects; @@ -154,4 +155,8 @@ public static boolean isBreak(ItemStack stack) { return false; } + + public static ItemWrapper getItemWrapper(ItemStack stack) { + return ItemWrapper.of(stack.getItem()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/Midohra.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/Midohra.java new file mode 100644 index 000000000..ba5f4535e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/Midohra.java @@ -0,0 +1,160 @@ +package net.pitan76.mcpitanlib.midohra; + +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; +import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import net.pitan76.mcpitanlib.midohra.nbt.NbtCompound; +import net.pitan76.mcpitanlib.midohra.nbt.NbtElement; +import net.pitan76.mcpitanlib.midohra.nbt.NbtList; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; +import net.pitan76.mcpitanlib.midohra.world.*; + +import java.util.function.Supplier; + +public class Midohra { + + public static ItemWrapper of(Item item) { + return ItemWrapper.of(item); + } + + public static ItemGroupWrapper of(ItemGroup itemGroup) { + return ItemGroupWrapper.of(itemGroup); + } + public static BlockWrapper of(Block block) { + return BlockWrapper.of(block); + } + + public static SupplierBlockWrapper of(Supplier block) { + return SupplierBlockWrapper.of(block); + } + + public static SupplierBlockWrapper of(RegistryResult block) { + return SupplierBlockWrapper.of(block); + } + + public static BlockEntityWrapper of(BlockEntity blockEntity) { + return BlockEntityWrapper.of(blockEntity); + } + + public static FluidWrapper of(net.minecraft.fluid.Fluid fluid) { + return FluidWrapper.of(fluid); + } + + public static BlockState of(net.minecraft.block.BlockState state) { + return BlockState.of(state); + } + + public static NbtElement of(net.minecraft.nbt.NbtElement nbt) { + return NbtElement.of(nbt); + } + + public static NbtCompound of(net.minecraft.nbt.NbtCompound nbt) { + return NbtCompound.of(nbt); + } + + public static NbtList of(net.minecraft.nbt.NbtList nbt) { + return NbtList.of(nbt); + } + + public static BlockPos of(net.minecraft.util.math.BlockPos pos) { + return BlockPos.of(pos); + } + + public static Direction of(net.minecraft.util.math.Direction direction) { + return Direction.of(direction); + } + + public static World of(net.minecraft.world.World world) { + return World.of(world); + } + + public static WorldView of(net.minecraft.world.WorldView world) { + return WorldView.of(world); + } + + public static WorldAccess of(net.minecraft.world.WorldAccess world) { + return WorldAccess.of(world); + } + + public static BlockView of(net.minecraft.world.BlockView world) { + return BlockView.of(world); + } + + public static IWorldView asWV(net.minecraft.world.WorldView world) { + return of(world); + } + + public static IWorldView asWV(net.minecraft.world.BlockView world) { + return of(world); + } + + public static Item raw(ItemWrapper item) { + return item.get(); + } + + public static ItemGroup raw(ItemGroupWrapper itemGroup) { + return itemGroup.get(); + } + + public static Block raw(BlockWrapper block) { + return block.get(); + } + + public static BlockEntity raw(BlockEntityWrapper blockEntity) { + return blockEntity.get(); + } + + public static net.minecraft.fluid.Fluid raw(FluidWrapper fluid) { + return fluid.get(); + } + + public static net.minecraft.block.BlockState raw(BlockState state) { + return state.toMinecraft(); + } + + public static net.minecraft.nbt.NbtElement raw(NbtElement nbt) { + return nbt.toMinecraft(); + } + + public static net.minecraft.nbt.NbtCompound raw(NbtCompound nbt) { + return nbt.toMinecraft(); + } + + public static net.minecraft.nbt.NbtList raw(NbtList nbt) { + return nbt.toMinecraft(); + } + + public static net.minecraft.util.math.BlockPos raw(BlockPos pos) { + return pos.toMinecraft(); + } + + public static net.minecraft.util.math.Direction raw(Direction direction) { + return direction.toMinecraft(); + } + + public static net.minecraft.world.World raw(World world) { + return world.toMinecraft(); + } + + public static net.minecraft.world.WorldView raw(WorldView world) { + return world.toMinecraft(); + } + + public static net.minecraft.world.WorldAccess raw(WorldAccess world) { + return world.toMinecraft(); + } + + public static net.minecraft.world.BlockView raw(BlockView world) { + return world.toMinecraft(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java index 7440041bd..8cce5880f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java @@ -53,7 +53,6 @@ public String getName() { return getBlock().getName(); } - @Deprecated public net.minecraft.block.BlockState toMinecraft() { return state; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java index 776e5664b..ba604f61b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/SupplierBlockWrapper.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.midohra.block; import net.minecraft.block.Block; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import java.util.function.Supplier; @@ -15,6 +16,10 @@ public static SupplierBlockWrapper of(Supplier supplier) { return new SupplierBlockWrapper(supplier); } + public static SupplierBlockWrapper of(RegistryResult result) { + return new SupplierBlockWrapper(result::get); + } + @Override public Block get() { return supplier.get(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java new file mode 100644 index 000000000..fdd6bae88 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java @@ -0,0 +1,83 @@ +package net.pitan76.mcpitanlib.midohra.fluid; + +import net.minecraft.fluid.FluidState; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.FluidStateUtil; +import net.pitan76.mcpitanlib.api.util.FluidUtil; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import org.jetbrains.annotations.Nullable; + +public class FluidWrapper { + private final net.minecraft.fluid.Fluid fluid; + + protected FluidWrapper() { + this.fluid = null; + } + + protected FluidWrapper(net.minecraft.fluid.Fluid fluid) { + this.fluid = fluid; + } + + public static FluidWrapper of(net.minecraft.fluid.Fluid fluid) { + return new FluidWrapper(fluid); + } + + public static FluidWrapper of() { + return new FluidWrapper(); + } + + public static FluidWrapper of(CompatIdentifier id) { + if (FluidUtil.isExist(id)) + return of(FluidUtil.fromId(id)); + + return of(); + } + + public static FluidWrapper of(CompatIdentifier id, CompatIdentifier... ids) { + if (of(id).isExist()) return of(id); + + for (CompatIdentifier id1 : ids) { + if (of(id1).isExist()) + return of(id1); + } + + return of(); + } + + public boolean isExist() { + return !isEmpty(); + } + + public boolean isEmpty() { + return get() == null; + } + + @Nullable + public net.minecraft.fluid.Fluid get() { + return fluid; + } + + public net.minecraft.fluid.Fluid gerOrDefault(net.minecraft.fluid.Fluid defaultFluid) { + return isEmpty() ? defaultFluid : get(); + } + + public CompatIdentifier getId() { + if (isEmpty()) + return CompatIdentifier.empty(); + + return FluidUtil.toCompatId(get()); + } + + public String getName() { + if (isEmpty()) return ""; + return get().toString(); + } + + public FluidState getDefaultState() { + return FluidStateUtil.getDefaultState(get()); + } + + public ItemWrapper getBucketItem() { + return ItemWrapper.of(FluidUtil.getBucketItem(get())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java new file mode 100644 index 000000000..5b293897d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java @@ -0,0 +1,24 @@ +package net.pitan76.mcpitanlib.midohra.holder; + +import net.pitan76.mcpitanlib.api.state.property.IProperty; +import net.pitan76.mcpitanlib.midohra.block.BlockState; + +public interface BlockStatePropertyHolder { + BlockState getBlockState(); + + default , V extends T> BlockState with(IProperty property, V value) { + return getBlockState().with(property, value); + } + + default boolean has(IProperty property) { + return getBlockState().contains(property); + } + + default > T get(IProperty property) { + return getBlockState().get(property); + } + + default > BlockState cycle(IProperty property) { + return getBlockState().cycle(property); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java index 9b633984d..6615a06be 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtCompound.java @@ -130,7 +130,6 @@ public NbtElement get(String key) { return NbtElement.of(NbtUtil.getElement(nbt, key)); } - @Deprecated public net.minecraft.nbt.NbtCompound toMinecraft() { return nbt; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java index 203a5f6c8..89d71c04b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java @@ -34,7 +34,6 @@ public String toString() { return nbt.toString(); } - @Deprecated public net.minecraft.nbt.NbtElement toMinecraft() { return nbt; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java index b41c0aa6c..9881d8bdb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtList.java @@ -99,7 +99,6 @@ public String toString() { return nbtList.toString(); } - @Deprecated public net.minecraft.nbt.NbtList toMinecraft() { return nbtList; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java index 5211c0b87..e38beba46 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java @@ -29,7 +29,6 @@ public int getZ() { return blockPos.getZ(); } - @Deprecated public net.minecraft.util.math.BlockPos toMinecraft() { return blockPos; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java index 30965cd5a..9771fac1e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java @@ -35,7 +35,7 @@ public static Direction of(net.minecraft.util.math.Direction direction) { } public Direction getOpposite() { - switch (direction) { + switch (getRaw()) { case UP: return DOWN; case DOWN: @@ -53,44 +53,48 @@ public Direction getOpposite() { } } - public net.minecraft.util.math.Direction toMinecraft() { + public net.minecraft.util.math.Direction getRaw() { return direction; } + public net.minecraft.util.math.Direction toMinecraft() { + return getRaw(); + } + public boolean isHorizontal() { - return direction.getAxis().isHorizontal(); + return getRaw().getAxis().isHorizontal(); } public boolean isVertical() { - return direction.getAxis().isVertical(); + return getRaw().getAxis().isVertical(); } public boolean isPositive() { - return direction.getDirection() == net.minecraft.util.math.Direction.AxisDirection.POSITIVE; + return getRaw().getDirection() == net.minecraft.util.math.Direction.AxisDirection.POSITIVE; } public boolean isNegative() { - return direction.getDirection() == net.minecraft.util.math.Direction.AxisDirection.NEGATIVE; + return getRaw().getDirection() == net.minecraft.util.math.Direction.AxisDirection.NEGATIVE; } public int getOffsetX() { - return direction.getOffsetX(); + return getRaw().getOffsetX(); } public int getOffsetY() { - return direction.getOffsetY(); + return getRaw().getOffsetY(); } public int getOffsetZ() { - return direction.getOffsetZ(); + return getRaw().getOffsetZ(); } public Direction rotateYClockwise() { - return of(direction.rotateYClockwise()); + return of(getRaw().rotateYClockwise()); } public Direction rotateYCounterclockwise() { - return of(direction.rotateYCounterclockwise()); + return of(getRaw().rotateYCounterclockwise()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/BlockView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/BlockView.java new file mode 100644 index 000000000..60a94b216 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/BlockView.java @@ -0,0 +1,41 @@ +package net.pitan76.mcpitanlib.midohra.world; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.fluid.FluidState; +import net.minecraft.util.math.BlockPos; + +public class BlockView implements IWorldView { + private net.minecraft.world.BlockView blockView; + + public BlockView(net.minecraft.world.BlockView blockView) { + this.blockView = blockView; + } + + public static BlockView of(net.minecraft.world.BlockView blockView) { + return new BlockView(blockView); + } + + public net.minecraft.world.BlockView getRaw() { + return blockView; + } + + public net.minecraft.world.BlockView toMinecraft() { + return getRaw(); + } + + @Override + public BlockEntity getBlockEntity(BlockPos pos) { + return getRaw().getBlockEntity(pos); + } + + @Override + public BlockState getBlockState(BlockPos pos) { + return getRaw().getBlockState(pos); + } + + @Override + public FluidState getFluidState(BlockPos pos) { + return getRaw().getFluidState(pos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java new file mode 100644 index 000000000..d520e0e3a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java @@ -0,0 +1,23 @@ +package net.pitan76.mcpitanlib.midohra.world; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.fluid.FluidState; +import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; + +public interface IWorldView { + BlockEntity getBlockEntity(BlockPos pos); + + BlockState getBlockState(BlockPos pos); + + FluidState getFluidState(BlockPos pos); + + default BlockEntityWrapper getBlockEntity(net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + return BlockEntityWrapper.of(getBlockEntity(pos.toMinecraft())); + } + + default net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState(net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getBlockState(pos.toMinecraft())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java index a8d8f4b46..fb6d3c5ca 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java @@ -22,17 +22,17 @@ protected World(net.minecraft.world.World world) { this.world = world; } - @Override - public net.minecraft.world.World getWorld() { - return world; - } - public static World of(net.minecraft.world.World world) { return new World(world); } + @Override + public net.minecraft.world.World getRaw() { + return world; + } + public net.minecraft.world.World toMinecraft() { - return getWorld(); + return getRaw(); } public void addBlockEntity(BlockEntityWrapper blockEntity) { @@ -40,51 +40,51 @@ public void addBlockEntity(BlockEntityWrapper blockEntity) { } public void addBlockEntity(BlockEntity blockEntity) { - getWorld().addBlockEntity(blockEntity); + getRaw().addBlockEntity(blockEntity); } public void removeBlockEntity(BlockPos pos) { - getWorld().removeBlockEntity(pos.toMinecraft()); + getRaw().removeBlockEntity(pos.toMinecraft()); } public long getTime() { - return WorldUtil.getTime(getWorld()); + return WorldUtil.getTime(getRaw()); } public long getTopY() { - return WorldUtil.getTopY(getWorld()); + return WorldUtil.getTopY(getRaw()); } public long getBottomY() { - return WorldUtil.getBottomY(getWorld()); + return WorldUtil.getBottomY(getRaw()); } public long getDimensionHeight() { - return WorldUtil.getDimensionHeight(getWorld()); + return WorldUtil.getDimensionHeight(getRaw()); } public CompatIdentifier getId() { - return WorldUtil.getCompatWorldId(getWorld()); + return WorldUtil.getCompatWorldId(getRaw()); } public FluidState getRawFluidState(BlockPos pos) { - return WorldUtil.getFluidState(getWorld(), pos.toMinecraft()); + return WorldUtil.getFluidState(getRaw(), pos.toMinecraft()); } public Player getPlayerByUUID(UUID uuid) { - return WorldUtil.getPlayer(getWorld(), uuid); + return WorldUtil.getPlayer(getRaw(), uuid); } public List getPlayers() { - return WorldUtil.getPlayers(getWorld()); + return WorldUtil.getPlayers(getRaw()); } public BlockPos getSpawnPos() { - return BlockPos.of(WorldUtil.getSpawnPos(getWorld())); + return BlockPos.of(WorldUtil.getSpawnPos(getRaw())); } public Optional getWorld(CompatIdentifier id) { - Optional optional = WorldUtil.getWorld(getWorld(), id); + Optional optional = WorldUtil.getWorld(getRaw(), id); return optional.map(World::of); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java index 8e07bb881..73c3bf30b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java @@ -18,10 +18,11 @@ import java.util.Optional; -public class WorldAccess { +public class WorldAccess extends WorldView { private final net.minecraft.world.WorldAccess world; protected WorldAccess(net.minecraft.world.WorldAccess world) { + super(null); this.world = world; } @@ -29,16 +30,17 @@ public static WorldAccess of(net.minecraft.world.WorldAccess world) { return new WorldAccess(world); } - protected net.minecraft.world.WorldAccess getWorld() { + @Override + protected net.minecraft.world.WorldAccess getRaw() { return world; } public net.minecraft.world.WorldAccess toMinecraft() { - return getWorld(); + return getRaw(); } public boolean isClient() { - return WorldAccessUtil.isClient(getWorld()); + return WorldAccessUtil.isClient(getRaw()); } public boolean isServer() { @@ -46,62 +48,62 @@ public boolean isServer() { } public CompatRandom getRandom() { - return new CompatRandom(getWorld().getRandom()); + return new CompatRandom(getRaw().getRandom()); } public MinecraftServer getServer() { - return WorldAccessUtil.getServer(getWorld()); + return WorldAccessUtil.getServer(getRaw()); } public BlockEntityWrapper getBlockEntity(BlockPos pos) { - return BlockEntityWrapper.of(WorldAccessUtil.getBlockEntity(getWorld(), pos.toMinecraft())); + return BlockEntityWrapper.of(WorldAccessUtil.getBlockEntity(getRaw(), pos.toMinecraft())); } public Optional getRawBlockEntity(BlockPos pos, BlockEntityType type) { - return WorldAccessUtil.getBlockEntity(getWorld(), pos.toMinecraft(), type); + return WorldAccessUtil.getBlockEntity(getRaw(), pos.toMinecraft(), type); } public BlockEntityWrapper getBlockEntity(BlockPos pos, BlockEntityType type) { - Optional blockEntity = WorldAccessUtil.getBlockEntity(getWorld(), pos.toMinecraft(), type); + Optional blockEntity = WorldAccessUtil.getBlockEntity(getRaw(), pos.toMinecraft(), type); return blockEntity.map(BlockEntityWrapper::of).orElse(BlockEntityWrapper.of()); } public boolean removeBlock(BlockPos pos, boolean move) { - return WorldAccessUtil.removeBlock(getWorld(), pos.toMinecraft(), move); + return WorldAccessUtil.removeBlock(getRaw(), pos.toMinecraft(), move); } public boolean breakBlock(BlockPos pos, boolean drop) { - return WorldAccessUtil.breakBlock(getWorld(), pos.toMinecraft(), drop); + return WorldAccessUtil.breakBlock(getRaw(), pos.toMinecraft(), drop); } public boolean breakBlock(BlockPos pos, boolean drop, Entity entity) { - return WorldAccessUtil.breakBlock(getWorld(), pos.toMinecraft(), drop, entity); + return WorldAccessUtil.breakBlock(getRaw(), pos.toMinecraft(), drop, entity); } public BlockState getBlockState(BlockPos pos) { - return BlockState.of(WorldAccessUtil.getBlockState(getWorld(), pos.toMinecraft())); + return BlockState.of(WorldAccessUtil.getBlockState(getRaw(), pos.toMinecraft())); } public boolean setBlockState(BlockPos pos, BlockState state, int flags) { - return WorldAccessUtil.setBlockState(getWorld(), pos.toMinecraft(), state.toMinecraft(), flags); + return WorldAccessUtil.setBlockState(getRaw(), pos.toMinecraft(), state.toMinecraft(), flags); } public boolean setBlockState(BlockPos pos, BlockState state, int flags, int maxUpdateDepth) { - return WorldAccessUtil.setBlockState(getWorld(), pos.toMinecraft(), state.toMinecraft(), flags, maxUpdateDepth); + return WorldAccessUtil.setBlockState(getRaw(), pos.toMinecraft(), state.toMinecraft(), flags, maxUpdateDepth); } public boolean setBlockState(BlockPos pos, BlockState state) { - return WorldAccessUtil.setBlockState(getWorld(), pos.toMinecraft(), state.toMinecraft()); + return WorldAccessUtil.setBlockState(getRaw(), pos.toMinecraft(), state.toMinecraft()); } @Deprecated public void playSound(PlayerEntity playerEntity, net.minecraft.util.math.BlockPos pos, SoundEvent sound, SoundCategory category, float volume, float pitch) { - getWorld().playSound(playerEntity, pos, sound, category, volume, pitch); + getRaw().playSound(playerEntity, pos, sound, category, volume, pitch); } @Deprecated public void playSound(PlayerEntity playerEntity, net.minecraft.util.math.BlockPos pos, SoundEvent sound, SoundCategory category) { - getWorld().playSound(playerEntity, pos, sound, category); + getRaw().playSound(playerEntity, pos, sound, category); } public void playSound(Player player, BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java new file mode 100644 index 000000000..2488905b3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java @@ -0,0 +1,66 @@ +package net.pitan76.mcpitanlib.midohra.world; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.fluid.FluidState; +import net.pitan76.mcpitanlib.api.util.world.WorldAccessUtil; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; + +import java.util.Optional; + +public class WorldView implements IWorldView { + private final net.minecraft.world.WorldView world; + + protected WorldView(net.minecraft.world.WorldView world) { + this.world = world; + } + + public static WorldView of(net.minecraft.world.WorldView world) { + return new WorldView(world); + } + + protected net.minecraft.world.WorldView getRaw() { + return world; + } + + public net.minecraft.world.WorldView toMinecraft() { + return getRaw(); + } + + public boolean isClient() { + return WorldAccessUtil.isClient(getRaw()); + } + + public boolean isServer() { + return !isClient(); + } + + public BlockEntityWrapper getBlockEntity(BlockPos pos) { + return BlockEntityWrapper.of(WorldAccessUtil.getBlockEntity(getRaw(), pos.toMinecraft())); + } + + public Optional getRawBlockEntity(BlockPos pos, BlockEntityType type) { + return WorldAccessUtil.getBlockEntity(getRaw(), pos.toMinecraft(), type); + } + + public BlockEntityWrapper getBlockEntity(BlockPos pos, BlockEntityType type) { + Optional blockEntity = WorldAccessUtil.getBlockEntity(getRaw(), pos.toMinecraft(), type); + return blockEntity.map(BlockEntityWrapper::of).orElse(BlockEntityWrapper.of()); + } + + @Override + public BlockEntity getBlockEntity(net.minecraft.util.math.BlockPos pos) { + return getRaw().getBlockEntity(pos); + } + + @Override + public net.minecraft.block.BlockState getBlockState(net.minecraft.util.math.BlockPos pos) { + return getRaw().getBlockState(pos); + } + + @Override + public FluidState getFluidState(net.minecraft.util.math.BlockPos pos) { + return getRaw().getFluidState(pos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java new file mode 100644 index 000000000..2c5daf8fb --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java @@ -0,0 +1,47 @@ +package net.pitan76.mcpitanlib.midohra.world.tick; + +import net.minecraft.block.Block; +import net.minecraft.fluid.Fluid; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; + +public class ScheduledTickView { + private final net.minecraft.world.tick.ScheduledTickView scheduledTickView; + + public ScheduledTickView(net.minecraft.world.tick.ScheduledTickView scheduledTickView) { + this.scheduledTickView = scheduledTickView; + } + + public static net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView of(net.minecraft.world.tick.ScheduledTickView scheduledTickView) { + return new net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView(scheduledTickView); + } + + public static net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView of(net.minecraft.world.World world) { + return new net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView(world); + } + + public net.minecraft.world.tick.ScheduledTickView toMinecraft() { + return get(); + } + + protected net.minecraft.world.tick.ScheduledTickView get() { + return scheduledTickView; + } + + public void scheduleBlockTick(BlockPos blockPos, BlockWrapper blockWrapper, int delay) { + scheduleBlockTick(blockPos.toMinecraft(), blockWrapper.get(), delay); + } + + public void scheduleBlockTick(net.minecraft.util.math.BlockPos blockPos, Block block, int delay) { + get().scheduleBlockTick(blockPos, block, delay); + } + + public void scheduleFluidTick(BlockPos blockPos, FluidWrapper fluidWrapper, int delay) { + scheduleFluidTick(blockPos.toMinecraft(), fluidWrapper.get(), delay); + } + + public void scheduleFluidTick(net.minecraft.util.math.BlockPos blockPos, Fluid block, int delay) { + get().scheduleFluidTick(blockPos, block, delay); + } +} diff --git a/info.properties b/info.properties index 96a80533e..abd1371a1 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.4 +mod_version=3.0.5 maven_group=net.pitan76 changelog=Fix APIs \ No newline at end of file From f0be0e24be742ab90d45003e80974c51861e820c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 16 Nov 2024 09:22:21 +0900 Subject: [PATCH 431/622] fix midohera api-1211 --- .../args/v2/StateForNeighborUpdateArgs.java | 18 +++--------------- .../mcpitanlib/api/block/v2/CompatBlock.java | 4 ++-- .../midohra/world/tick/ScheduledTickView.java | 15 ++++++++------- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java index b484d2029..5c39c24b7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java @@ -6,7 +6,6 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; -import net.minecraft.world.tick.ScheduledTickView; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; @@ -16,10 +15,9 @@ public class StateForNeighborUpdateArgs implements BlockStatePropertyHolder { public BlockState state; public Direction direction; public BlockState neighborState; - public WorldView world; + public WorldAccess world; public BlockPos pos; public BlockPos neighborPos; - public ScheduledTickView tickView; public CompatRandom random; public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { @@ -29,17 +27,7 @@ public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockSt this.world = world; this.pos = pos; this.neighborPos = neighborPos; - } - - public StateForNeighborUpdateArgs(BlockState state, Direction direction, BlockState neighborState, WorldView world, BlockPos pos, BlockPos neighborPos, ScheduledTickView tickView, CompatRandom random) { - this.state = state; - this.direction = direction; - this.neighborState = neighborState; - this.world = world; - this.pos = pos; - this.neighborPos = neighborPos; - this.tickView = tickView; - this.random = random; + this.random = new CompatRandom(world.getRandom()); } public Direction getDirection() { @@ -87,7 +75,7 @@ public CompatRandom getRandom() { } public net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView getTickView() { - return net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView.of(tickView); + return net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView.of(world); } @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index 6c02c1a64..e219417af 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -90,13 +90,13 @@ public void setDefaultState(net.pitan76.mcpitanlib.midohra.block.BlockState stat } public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { - return super.getStateForNeighborUpdate(args.state, args.world, args.tickView, args.pos, args.direction, args.neighborPos, args.neighborState, args.random.getMcRandom()); + return super.getStateForNeighborUpdate(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos); } @Deprecated @Override public BlockState getStateForNeighborUpdate(net.pitan76.mcpitanlib.api.event.block.StateForNeighborUpdateArgs args) { - return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos, args.tickView, args.random)); + return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos)); } public VoxelShape getOutlineShape(OutlineShapeEvent e) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java index 2c5daf8fb..b616ed645 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/tick/ScheduledTickView.java @@ -2,30 +2,31 @@ import net.minecraft.block.Block; import net.minecraft.fluid.Fluid; +import net.minecraft.world.WorldAccess; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; public class ScheduledTickView { - private final net.minecraft.world.tick.ScheduledTickView scheduledTickView; + private final WorldAccess scheduledTickView; - public ScheduledTickView(net.minecraft.world.tick.ScheduledTickView scheduledTickView) { + public ScheduledTickView(WorldAccess scheduledTickView) { this.scheduledTickView = scheduledTickView; } - public static net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView of(net.minecraft.world.tick.ScheduledTickView scheduledTickView) { - return new net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView(scheduledTickView); + public static net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView of(net.minecraft.world.World world) { + return of((WorldAccess) world); } - public static net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView of(net.minecraft.world.World world) { + public static net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView of(WorldAccess world) { return new net.pitan76.mcpitanlib.midohra.world.tick.ScheduledTickView(world); } - public net.minecraft.world.tick.ScheduledTickView toMinecraft() { + public WorldAccess toMinecraft() { return get(); } - protected net.minecraft.world.tick.ScheduledTickView get() { + protected WorldAccess get() { return scheduledTickView; } From 9cdf4b6ee902afe5ac2bd88b6cb89ca171e798d0 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sat, 16 Nov 2024 14:34:25 +0900 Subject: [PATCH 432/622] fix midohera api --- .../block/args/v2/CollisionShapeEvent.java | 64 +++++++++++++++++++ .../mcpitanlib/api/block/v2/CompatBlock.java | 38 +++++++++-- .../mcpitanlib/api/util/WorldUtil.java | 44 +++++++++++++ .../mcpitanlib/api/util/math/PosUtil.java | 12 ++++ .../midohra/util/math/Direction.java | 12 ++-- .../mcpitanlib/midohra/world/World.java | 9 +++ info.properties | 2 +- 7 files changed, 169 insertions(+), 12 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java new file mode 100644 index 000000000..469cb56a7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java @@ -0,0 +1,64 @@ +package net.pitan76.mcpitanlib.api.block.args.v2; + +import net.minecraft.block.ShapeContext; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.BlockView; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; + +public class CollisionShapeEvent extends BaseEvent implements BlockStatePropertyHolder { + public BlockState state; + public BlockView world; + public BlockPos pos; + public ShapeContext context; + + public CollisionShapeEvent(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + this.state = state; + this.world = world; + this.pos = pos; + this.context = context; + } + + public CollisionShapeEvent(net.minecraft.block.BlockState state, net.minecraft.world.BlockView world, net.minecraft.util.math.BlockPos pos, ShapeContext context) { + this(BlockState.of(state), BlockView.of(world), BlockPos.of(pos), context); + } + + @Override + public BlockState getBlockState() { + return state; + } + + public BlockEntityWrapper getBlockEntity() { + return world.getBlockEntity(pos); + } + + public BlockEntity getRawBlockEntity() { + return getBlockEntity().get(); + } + + public IWorldView getWorldView() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public ShapeContext getContext() { + return context; + } + + public boolean isHolding(Item item) { + return getContext().isHolding(item); + } + + public boolean isHolding(ItemWrapper item) { + return isHolding(item.get()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index e219417af..0d9f09864 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -2,9 +2,15 @@ import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.item.ItemPlacementContext; import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; @@ -13,6 +19,8 @@ import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; +import net.pitan76.mcpitanlib.api.event.block.CollisionShapeEvent; +import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import org.jetbrains.annotations.Nullable; @@ -83,29 +91,49 @@ public void setDefaultState(net.pitan76.mcpitanlib.midohra.block.BlockState stat return net.pitan76.mcpitanlib.midohra.block.BlockState.of(super.getPlacementState(args.ctx)); } + @Override + public @Nullable BlockState getPlacementState(ItemPlacementContext ctx) { + return getPlacementState(new PlacementStateArgs(ctx)).toMinecraft(); + } + @Deprecated @Override public @Nullable BlockState getPlacementState(net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs args) { - return getPlacementState(new PlacementStateArgs(args.ctx)).toMinecraft(); + return super.getPlacementState(args); } - public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { - return super.getStateForNeighborUpdate(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos); + public net.pitan76.mcpitanlib.midohra.block.BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(super.getStateForNeighborUpdate(args.state, args.world, args.tickView, args.pos, args.direction, args.neighborPos, args.neighborState, args.random.getMcRandom())); + } + + @Override + public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { + return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos, tickView, new CompatRandom(random))).toMinecraft(); } @Deprecated @Override public BlockState getStateForNeighborUpdate(net.pitan76.mcpitanlib.api.event.block.StateForNeighborUpdateArgs args) { - return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos)); + return super.getStateForNeighborUpdate((args)); } public VoxelShape getOutlineShape(OutlineShapeEvent e) { return super.getOutlineShape(e.state.toMinecraft(), e.world.getRaw(), e.pos.toMinecraft(), e.context); } + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return getOutlineShape(new OutlineShapeEvent(state, world, pos, context)); + } + @Deprecated @Override public VoxelShape getOutlineShape(net.pitan76.mcpitanlib.api.event.block.OutlineShapeEvent e) { - return getOutlineShape(new OutlineShapeEvent(e.state, e.world, e.pos, e.context)); + return super.getOutlineShape(e); + } + + @Override + public VoxelShape getCollisionShape(CollisionShapeEvent e) { + return super.getCollisionShape(e); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 4e3c95b5b..9d44f09c6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -304,4 +304,48 @@ public static void spawnParticles(World world, ParticleEffect parameters, double public static void updateListeners(World world, BlockPos pos, BlockState oldState, BlockState newState, int flags) { world.updateListeners(pos, oldState, newState, flags); } + + public static net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraBlockState(World world, BlockPos pos) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getBlockState(world, pos)); + } + + public static boolean setBlockState(World world, BlockPos pos, net.pitan76.mcpitanlib.midohra.block.BlockState state, int flags) { + return setBlockState(world, pos, state.toMinecraft(), flags); + } + + public static boolean setBlockState(World world, BlockPos pos, net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return setBlockState(world, pos, state, 3); + } + + public static boolean setBlockState(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, net.pitan76.mcpitanlib.midohra.block.BlockState state, int flags) { + return setBlockState(world, pos.toMinecraft(), state.toMinecraft(), flags); + } + + public static boolean setBlockState(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return setBlockState(world, pos, state, 3); + } + + public static boolean breakBlock(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, boolean drop) { + return breakBlock(world, pos.toMinecraft(), drop); + } + + public static boolean breakBlock(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + return breakBlock(world, pos, true); + } + + public static boolean breakBlock(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, boolean drop, @Nullable Player player) { + return breakBlock(world, pos.toMinecraft(), drop, player); + } + + public static boolean breakBlock(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, @Nullable Player player) { + return breakBlock(world, pos, true, player); + } + + public static void removeBlockEntity(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + removeBlockEntity(world, pos.toMinecraft()); + } + + public static boolean removeBlock(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, boolean move) { + return removeBlock(world, pos.toMinecraft(), move); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java index 7da5f2870..16b6f3fee 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java @@ -12,10 +12,22 @@ public static BlockPos flooredBlockPos(double x, double y, double z) { public static BlockPos flooredBlockPos(Position pos) { return BlockPos.ofFloored(pos); } + public static BlockPos flooredBlockPos(Vec3d pos) { return BlockPos.ofFloored(pos); } + public static net.pitan76.mcpitanlib.midohra.util.math.BlockPos midohraBlockPos(int x, int y, int z) { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(x, y, z); + } + + public static net.pitan76.mcpitanlib.midohra.util.math.BlockPos flooredMidohraBlockPos(double x, double y, double z) { + int x1 = (int) Math.floor(x); + int y1 = (int) Math.floor(y); + int z1 = (int) Math.floor(z); + return midohraBlockPos(x1, y1, z1); + } + public static double getSquaredDistance(BlockPos pos1, BlockPos pos2) { return pos1.getSquaredDistance(pos2); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java index 9771fac1e..2ae99c417 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java @@ -2,12 +2,12 @@ public class Direction { - public static final Direction UP = of(net.minecraft.util.math.Direction.UP); - public static final Direction DOWN = of(net.minecraft.util.math.Direction.DOWN); - public static final Direction NORTH = of(net.minecraft.util.math.Direction.NORTH); - public static final Direction SOUTH = of(net.minecraft.util.math.Direction.SOUTH); - public static final Direction EAST = of(net.minecraft.util.math.Direction.EAST); - public static final Direction WEST = of(net.minecraft.util.math.Direction.WEST); + public static final Direction UP = new Direction(net.minecraft.util.math.Direction.UP); + public static final Direction DOWN = new Direction(net.minecraft.util.math.Direction.DOWN); + public static final Direction NORTH = new Direction(net.minecraft.util.math.Direction.NORTH); + public static final Direction SOUTH = new Direction(net.minecraft.util.math.Direction.SOUTH); + public static final Direction EAST = new Direction(net.minecraft.util.math.Direction.EAST); + public static final Direction WEST = new Direction(net.minecraft.util.math.Direction.WEST); private final net.minecraft.util.math.Direction direction; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java index fb6d3c5ca..2aa84bc27 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.midohra.world; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.Entity; import net.minecraft.fluid.FluidState; import net.minecraft.server.world.ServerWorld; import net.pitan76.mcpitanlib.api.entity.Player; @@ -87,4 +88,12 @@ public Optional getWorld(CompatIdentifier id) { Optional optional = WorldUtil.getWorld(getRaw(), id); return optional.map(World::of); } + + public void spawnEntity(Entity entity) { + WorldUtil.spawnEntity(getRaw(), entity); + } + + public void spawnStack(net.minecraft.item.ItemStack stack, BlockPos pos) { + WorldUtil.spawnStack(getRaw(), pos.toMinecraft(), stack); + } } diff --git a/info.properties b/info.properties index abd1371a1..12059f3a1 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.5 +mod_version=3.0.6 maven_group=net.pitan76 changelog=Fix APIs \ No newline at end of file From 1169792b12f57f623562dbc12f1e4f917206ce7e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Sat, 16 Nov 2024 14:34:25 +0900 Subject: [PATCH 433/622] fix APIs --- .../block/args/v2/CollisionShapeEvent.java | 53 +---------- .../mcpitanlib/api/block/v2/CompatBlock.java | 21 +++-- .../api/event/block/BlockBreakEvent.java | 27 ++++++ .../api/event/block/BlockPlacedEvent.java | 27 ++++++ .../api/event/block/ItemScattererUtil.java | 12 +++ .../api/state/property/IProperty.java | 4 + .../BlockWithBlockEntityBuilder.java | 76 ++++++++++++++++ .../easybuilder/BuiltBlockWithEntity.java | 34 +++++++ .../holder/BlockStatePropertyHolder.java | 11 +++ .../midohra/util/math/BlockPos.java | 5 +- .../midohra/util/math/v0/BlockPos.java | 90 +++++++++++++++++++ info.properties | 2 +- 12 files changed, 305 insertions(+), 57 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlockWithEntity.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/v0/BlockPos.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java index 469cb56a7..a5544b4db 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CollisionShapeEvent.java @@ -1,64 +1,17 @@ package net.pitan76.mcpitanlib.api.block.args.v2; import net.minecraft.block.ShapeContext; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.item.Item; -import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.midohra.block.BlockState; -import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; -import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; -import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; import net.pitan76.mcpitanlib.midohra.world.BlockView; -import net.pitan76.mcpitanlib.midohra.world.IWorldView; -public class CollisionShapeEvent extends BaseEvent implements BlockStatePropertyHolder { - public BlockState state; - public BlockView world; - public BlockPos pos; - public ShapeContext context; +public class CollisionShapeEvent extends OutlineShapeEvent { public CollisionShapeEvent(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - this.state = state; - this.world = world; - this.pos = pos; - this.context = context; + super(state, world, pos, context); } public CollisionShapeEvent(net.minecraft.block.BlockState state, net.minecraft.world.BlockView world, net.minecraft.util.math.BlockPos pos, ShapeContext context) { - this(BlockState.of(state), BlockView.of(world), BlockPos.of(pos), context); - } - - @Override - public BlockState getBlockState() { - return state; - } - - public BlockEntityWrapper getBlockEntity() { - return world.getBlockEntity(pos); - } - - public BlockEntity getRawBlockEntity() { - return getBlockEntity().get(); - } - - public IWorldView getWorldView() { - return world; - } - - public BlockPos getPos() { - return pos; - } - - public ShapeContext getContext() { - return context; - } - - public boolean isHolding(Item item) { - return getContext().isHolding(item); - } - - public boolean isHolding(ItemWrapper item) { - return isHolding(item.get()); + super(BlockState.of(state), BlockView.of(world), BlockPos.of(pos), context); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index 0d9f09864..7d981282e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -16,10 +16,10 @@ import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; import net.pitan76.mcpitanlib.api.block.args.RotateArgs; import net.pitan76.mcpitanlib.api.block.args.SideInvisibleArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.CollisionShapeEvent; import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; -import net.pitan76.mcpitanlib.api.event.block.CollisionShapeEvent; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import org.jetbrains.annotations.Nullable; @@ -54,11 +54,11 @@ public CompatBlockRenderType getRenderType(RenderTypeArgs args) { @Override @Deprecated protected BlockState rotate(BlockState state, BlockRotation rotation) { - return rotate(new RotateArgs(state, rotation)); + return rotate(new RotateArgs(state, rotation)).toMinecraft(); } - public BlockState rotate(RotateArgs args) { - return super.rotate(args.state, args.rotation); + public net.pitan76.mcpitanlib.midohra.block.BlockState rotate(RotateArgs args) { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(super.rotate(args.state, args.rotation)); } @Override @@ -132,8 +132,19 @@ public VoxelShape getOutlineShape(net.pitan76.mcpitanlib.api.event.block.Outline return super.getOutlineShape(e); } - @Override public VoxelShape getCollisionShape(CollisionShapeEvent e) { + return super.getCollisionShape(e.state.toMinecraft(), e.world.getRaw(), e.pos.toMinecraft(), e.context); + } + + @Deprecated + @Override + public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return getCollisionShape(new CollisionShapeEvent(state, world, pos, context)); + } + + @Deprecated + @Override + public VoxelShape getCollisionShape(net.pitan76.mcpitanlib.api.event.block.CollisionShapeEvent e) { return super.getCollisionShape(e); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java index 47c330fb5..a5351d2aa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockBreakEvent.java @@ -8,6 +8,9 @@ import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; public class BlockBreakEvent extends BaseEvent { public World world; @@ -49,4 +52,28 @@ public boolean isClient() { public BlockEntity getBlockEntity() { return WorldUtil.getBlockEntity(getWorld(), getPos()); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public IWorldView getWorldView() { + return getMidohraWorld(); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(pos); + } + + public BlockWrapper getBlockWrapper() { + return BlockWrapper.of(state.getBlock()); + } + + public BlockEntityWrapper getBlockEntityWrapper() { + return BlockEntityWrapper.of(getBlockEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java index 639d95761..c0b365e0a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockPlacedEvent.java @@ -8,6 +8,9 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; public class BlockPlacedEvent extends BaseEvent { @@ -52,4 +55,28 @@ public boolean isClient() { public BlockEntity getBlockEntity() { return WorldUtil.getBlockEntity(getWorld(), getPos()); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public IWorldView getWorldView() { + return getMidohraWorld(); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(pos); + } + + public BlockWrapper getBlockWrapper() { + return BlockWrapper.of(state.getBlock()); + } + + public BlockEntityWrapper getBlockEntityWrapper() { + return BlockEntityWrapper.of(getBlockEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java index 4abcf5823..400e211ce 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/ItemScattererUtil.java @@ -35,4 +35,16 @@ public static void onStateReplaced(StateReplacedEvent e) { public static void onStateReplaced(BlockState state, BlockState newState, World world, BlockPos pos) { ItemScatterer.onStateReplaced(state, newState, world, pos); } + + public static void spawn(net.pitan76.mcpitanlib.midohra.world.World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, ItemStack stack) { + spawn(world.getRaw(), pos.toMinecraft(), stack); + } + + public static void spawn(net.pitan76.mcpitanlib.midohra.world.World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, DefaultedList stacks) { + spawn(world.getRaw(), pos.toMinecraft(), stacks); + } + + public static void spawn(net.pitan76.mcpitanlib.midohra.world.World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, Inventory inventory) { + spawn(world.getRaw(), pos.toMinecraft(), inventory); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java index 3fb738dd5..549d2708e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java @@ -25,5 +25,9 @@ default BlockState cycle(BlockState state) { return state.cycle(getProperty()); } + default String getName() { + return getProperty().getName(); + } + Property getProperty(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java new file mode 100644 index 000000000..651b16a5c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java @@ -0,0 +1,76 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder; + +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.block.v2.BlockSettingsBuilder; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.util.BlockEntityTypeUtil; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; + +import java.util.function.Supplier; + +public class BlockWithBlockEntityBuilder extends BlockBuilder { + + public BlockEntityType blockEntityType; + + public BlockWithBlockEntityBuilder(BlockSettingsBuilder settingsBuilder) { + super(settingsBuilder); + } + + public BlockWithBlockEntityBuilder(CompatIdentifier id) { + super(id); + } + + public BlockWithBlockEntityBuilder(BlockSettingsBuilder settingsBuilder, BlockEntityType blockEntityType) { + super(settingsBuilder); + this.blockEntityType = blockEntityType; + } + + public BlockWithBlockEntityBuilder(CompatIdentifier id, BlockEntityType blockEntityType) { + super(id); + this.blockEntityType = blockEntityType; + } + + @Override + public SupplierBlockWrapper build(CompatRegistryV2 registry) { + if (settingsBuilder.id == null) + throw new IllegalStateException("Block id is not set. hint: use build(CompatRegistryV2, CompatIdentifier)"); + + Supplier result = registry.registerExtendBlock(settingsBuilder.id, () -> new BuiltBlockWithEntity(this)); + + return SupplierBlockWrapper.of(result::get); + } + + @Override + public SupplierBlockWrapper build(CompatRegistryV2 registry, CompatIdentifier id) { + Supplier result = registry.registerExtendBlock(id, () -> new BuiltBlockWithEntity(this, id)); + + return SupplierBlockWrapper.of(result::get); + } + + public static BlockWithBlockEntityBuilder of(CompatIdentifier id) { + return new BlockWithBlockEntityBuilder(id); + } + + public static BlockWithBlockEntityBuilder of(BlockSettingsBuilder settingsBuilder) { + return new BlockWithBlockEntityBuilder(settingsBuilder); + } + + public static BlockWithBlockEntityBuilder of(CompatIdentifier id, BlockEntityType blockEntityType) { + return new BlockWithBlockEntityBuilder(id, blockEntityType); + } + + public static BlockWithBlockEntityBuilder of(BlockSettingsBuilder settingsBuilder, BlockEntityType blockEntityType) { + return new BlockWithBlockEntityBuilder(settingsBuilder, blockEntityType); + } + + public BlockBuilder applyBlockEntity(BlockEntityType blockEntityType) { + this.blockEntityType = blockEntityType; + return this; + } + + public BlockBuilder applyBlockEntity(CompatIdentifier id) { + return applyBlockEntity(BlockEntityTypeUtil.fromId(id)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlockWithEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlockWithEntity.java new file mode 100644 index 000000000..d82ae53ff --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlockWithEntity.java @@ -0,0 +1,34 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.block.ExtendBlockEntityProvider; +import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import org.jetbrains.annotations.Nullable; + +public class BuiltBlockWithEntity extends BuiltBlock implements ExtendBlockEntityProvider { + + public BlockEntityType blockEntityType; + + public BuiltBlockWithEntity(CompatibleBlockSettings settings) { + super(settings); + } + + public BuiltBlockWithEntity(BlockWithBlockEntityBuilder builder) { + super(builder); + + this.blockEntityType = builder.blockEntityType; + } + + public BuiltBlockWithEntity(BlockWithBlockEntityBuilder builder, CompatIdentifier id) { + super(builder, id); + + this.blockEntityType = builder.blockEntityType; + } + + @Override + public @Nullable BlockEntityType getBlockEntityType() { + return (BlockEntityType) blockEntityType; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java index 5b293897d..9601ef3d1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/holder/BlockStatePropertyHolder.java @@ -1,7 +1,9 @@ package net.pitan76.mcpitanlib.midohra.holder; +import net.pitan76.mcpitanlib.api.state.property.DirectionProperty; import net.pitan76.mcpitanlib.api.state.property.IProperty; import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; public interface BlockStatePropertyHolder { BlockState getBlockState(); @@ -21,4 +23,13 @@ default > T get(IProperty property) { default > BlockState cycle(IProperty property) { return getBlockState().cycle(property); } + + // DirectionProperty + default BlockState with(DirectionProperty property, Direction value) { + return with(property, value.toMinecraft()); + } + + default Direction get(DirectionProperty property) { + return Direction.of(get((IProperty) property)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java index e38beba46..613874f7f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java @@ -77,4 +77,7 @@ public BlockPos offset(Direction direction, int amount) { return new BlockPos(blockPos.offset(direction.toMinecraft(), amount)); } -} + public BlockPos offset(Direction direction) { + return new BlockPos(blockPos.offset(direction.toMinecraft())); + } +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/v0/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/v0/BlockPos.java new file mode 100644 index 000000000..fb0f6d0c3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/v0/BlockPos.java @@ -0,0 +1,90 @@ +package net.pitan76.mcpitanlib.midohra.util.math.v0; + +import net.minecraft.util.math.Vec3i; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; + +public class BlockPos extends net.minecraft.util.math.BlockPos { + private final net.minecraft.util.math.BlockPos blockPos; + + protected BlockPos(net.minecraft.util.math.BlockPos blockPos) { + super(blockPos.getX(), blockPos.getY(), blockPos.getZ()); + this.blockPos = blockPos; + } + + public static BlockPos of(net.minecraft.util.math.BlockPos blockPos) { + return new BlockPos(blockPos); + } + + public static BlockPos of(int x, int y, int z) { + return new BlockPos(new net.minecraft.util.math.BlockPos(x, y, z)); + } + + public int getX() { + return blockPos.getX(); + } + + public int getY() { + return blockPos.getY(); + } + + public int getZ() { + return blockPos.getZ(); + } + + public net.minecraft.util.math.BlockPos toMinecraft() { + return blockPos; + } + + public BlockPos add(int x, int y, int z) { + return new BlockPos(blockPos.add(x, y, z)); + } + + public BlockPos add(BlockPos pos) { + return new BlockPos(blockPos.add(pos.blockPos)); + } + + public BlockPos subtract(int x, int y, int z) { + return new BlockPos(blockPos.subtract(new Vec3i(x, y, z))); + } + + public BlockPos subtract(BlockPos pos) { + return new BlockPos(blockPos.subtract(pos.blockPos)); + } + + public BlockPos up() { + return new BlockPos(blockPos.up()); + } + + public BlockPos down() { + return new BlockPos(blockPos.down()); + } + + public BlockPos north() { + return new BlockPos(blockPos.north()); + } + + public BlockPos south() { + return new BlockPos(blockPos.south()); + } + + public BlockPos east() { + return new BlockPos(blockPos.east()); + } + + public BlockPos west() { + return new BlockPos(blockPos.west()); + } + + public BlockPos offset(Direction direction, int amount) { + return new BlockPos(blockPos.offset(direction.toMinecraft(), amount)); + } + + public BlockPos offset(Direction direction) { + return new BlockPos(blockPos.offset(direction.toMinecraft())); + } + + @Override + public BlockPos add(Vec3i vec3i) { + return new BlockPos(blockPos.add(vec3i)); + } +} diff --git a/info.properties b/info.properties index 12059f3a1..fc981490e 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.6 +mod_version=3.0.7 maven_group=net.pitan76 changelog=Fix APIs \ No newline at end of file From b70b6d88ed486a0d32b4b93fd2432e60db2e6d35 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 16 Nov 2024 22:31:11 +0900 Subject: [PATCH 434/622] 1211 --- .../pitan76/mcpitanlib/api/block/v2/CompatBlock.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index 7d981282e..b76e9ed52 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -7,10 +7,9 @@ import net.minecraft.util.BlockRotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.util.math.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; -import net.minecraft.world.WorldView; +import net.minecraft.world.WorldAccess; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; @@ -20,7 +19,6 @@ import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; -import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import org.jetbrains.annotations.Nullable; @@ -103,12 +101,12 @@ public void setDefaultState(net.pitan76.mcpitanlib.midohra.block.BlockState stat } public net.pitan76.mcpitanlib.midohra.block.BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { - return net.pitan76.mcpitanlib.midohra.block.BlockState.of(super.getStateForNeighborUpdate(args.state, args.world, args.tickView, args.pos, args.direction, args.neighborPos, args.neighborState, args.random.getMcRandom())); + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(super.getStateForNeighborUpdate(args.state, args.direction, args.neighborState, args.world, args.pos, args.neighborPos)); } @Override - public BlockState getStateForNeighborUpdate(BlockState state, WorldView world, ScheduledTickView tickView, BlockPos pos, Direction direction, BlockPos neighborPos, BlockState neighborState, Random random) { - return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos, tickView, new CompatRandom(random))).toMinecraft(); + protected BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { + return getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos)).toMinecraft(); } @Deprecated From 52f29ba927792063754260c5951cc467ce3c5f58 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:46:07 +0900 Subject: [PATCH 435/622] add APIs --- .../util/inventory/CompatPlayerInventory.java | 42 +++++++++++++++++++ .../util/inventory/PlayerInventoryUtil.java | 4 ++ info.properties | 2 +- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatPlayerInventory.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatPlayerInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatPlayerInventory.java new file mode 100644 index 000000000..9f9ab0730 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatPlayerInventory.java @@ -0,0 +1,42 @@ +package net.pitan76.mcpitanlib.api.util.inventory; + +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.entity.Player; + +public class CompatPlayerInventory { + public PlayerInventory inv; + + public CompatPlayerInventory(PlayerInventory inv) { + this.inv = inv; + } + + public Player getPlayer() { + return PlayerInventoryUtil.getPlayer(inv); + } + + public int getSelectedSlot() { + return PlayerInventoryUtil.getSelectedSlot(inv); + } + + public void setSelectedSlot(int slot) { + PlayerInventoryUtil.setSelectedSlot(inv, slot); + } + + public void dropAllItems() { + PlayerInventoryUtil.dropAllItems(inv); + } + + public void offerOrDrop(ItemStack stack) { + inv.offerOrDrop(stack); + } + + public void offerOrDrop(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + offerOrDrop(stack.toMinecraft()); + } + + public PlayerInventory getRaw() { + return inv; + } +} + diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java index 689d156d4..d446a9d55 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java @@ -15,4 +15,8 @@ public static int getSelectedSlot(PlayerInventory playerInventory) { public static void setSelectedSlot(PlayerInventory playerInventory, int slot) { playerInventory.selectedSlot = slot; } + + public static void dropAllItems(PlayerInventory inv) { + inv.dropAll(); + } } diff --git a/info.properties b/info.properties index fc981490e..1222fc7ab 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.7 +mod_version=3.0.8 maven_group=net.pitan76 changelog=Fix APIs \ No newline at end of file From 365dcdb393dc3677a29f72b51716c73fa0d3cadc Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:16:34 +0900 Subject: [PATCH 436/622] add APIs --- .../api/sound/CompatSoundEvent.java | 4 + .../mcpitanlib/api/util/WorldUtil.java | 4 + .../api/util/collection/ItemStackList.java | 133 +++++++++++++++ .../midohra/block/BlockWrapper.java | 4 + .../midohra/fluid/FluidWrapper.java | 4 + .../mcpitanlib/midohra/fluid/Fluids.java | 9 + .../midohra/item/ItemGroupWrapper.java | 4 + .../mcpitanlib/midohra/item/ItemStack.java | 4 +- .../mcpitanlib/midohra/item/ItemWrapper.java | 4 + .../midohra/recipe/CraftingRecipe.java | 54 ++++++ .../mcpitanlib/midohra/recipe/Ingredient.java | 95 +++++++++++ .../mcpitanlib/midohra/recipe/Recipe.java | 92 ++++++++++ .../midohra/recipe/RecipeManager.java | 21 +++ .../mcpitanlib/midohra/recipe/RecipeType.java | 57 +++++++ .../midohra/recipe/ServerRecipeManager.java | 157 ++++++++++++++++++ .../midohra/recipe/ShapedRecipe.java | 45 +++++ .../midohra/recipe/ShapelessRecipe.java | 37 +++++ .../recipe/entry/CraftingRecipeEntry.java | 55 ++++++ .../midohra/recipe/entry/RecipeEntry.java | 87 ++++++++++ .../recipe/entry/ShapedRecipeEntry.java | 55 ++++++ .../recipe/entry/ShapelessRecipeEntry.java | 55 ++++++ .../input/CraftingRecipeInputOrInventory.java | 67 ++++++++ .../recipe/input/RecipeInputOrInventory.java | 80 +++++++++ .../input/TypedRecipeInputOrInventory.java | 56 +++++++ .../mcpitanlib/midohra/server/MCServer.java | 89 ++++++++++ .../midohra/server/PlayerManager.java | 152 +++++++++++++++++ .../midohra/util/math/BlockPos.java | 4 + .../midohra/util/math/ChunkPos.java | 154 +++++++++++++++++ .../mcpitanlib/midohra/world/ServerWorld.java | 63 +++++++ .../mcpitanlib/midohra/world/World.java | 42 +++++ .../midohra/world/chunk/ChunkManager.java | 41 +++++ .../midohra/world/chunk/ChunkTicketType.java | 58 +++++++ .../world/chunk/ServerChunkManager.java | 45 +++++ info.properties | 4 +- 34 files changed, 1831 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/Fluids.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeManager.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/CraftingRecipeInputOrInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/TypedRecipeInputOrInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/server/PlayerManager.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/ChunkPos.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/ServerWorld.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkManager.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java index 9840c1803..f18fcf204 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvent.java @@ -46,6 +46,10 @@ public RegistryEntry.Reference getReference() { @Nullable @Deprecated public RegistryEntry getEntry() { + if (entry == null) { + entry = RegistryEntry.of(soundEvent); + } + return entry; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 9d44f09c6..2a0838f88 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -348,4 +348,8 @@ public static void removeBlockEntity(World world, net.pitan76.mcpitanlib.midohra public static boolean removeBlock(World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, boolean move) { return removeBlock(world, pos.toMinecraft(), move); } + + public static void playSound(net.pitan76.mcpitanlib.midohra.world.World world, @Nullable Player player, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch) { + playSound(world.getRaw(), player, pos.toMinecraft(), sound, category, volume, pitch); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java index 3e2f4a341..cf2c0fc8a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java @@ -7,8 +7,10 @@ import net.pitan76.mcpitanlib.api.gui.inventory.IInventory; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; import org.apache.commons.lang3.Validate; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -70,4 +72,135 @@ public static ItemStackList of(DefaultedList defaultedList) { return stacks; } + + public static ItemStackList of(ItemStack stack) { + return ItemStackList.ofSize(1, stack); + } + + // Midohra + public List toMidohra() { + List stacks = new ArrayList<>(); + for (ItemStack stack : this) { + stacks.add(net.pitan76.mcpitanlib.midohra.item.ItemStack.of(stack)); + } + + return stacks; + } + + public @NotNull net.pitan76.mcpitanlib.midohra.item.ItemStack getAsMidohra(int index) { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(get(index)); + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getFirstAsMidohra() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getFirst()); + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getLastAsMidohra() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getLast()); + } + + public boolean add(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return add(stack.toMinecraft()); + } + + public boolean addAll(List stacks) { + boolean changed = false; + for (net.pitan76.mcpitanlib.midohra.item.ItemStack stack : stacks) { + changed |= add(stack); + } + + return changed; + } + + public boolean addAll(net.pitan76.mcpitanlib.midohra.item.ItemStack... stacks) { + return addAll(Arrays.asList(stacks)); + } + + public boolean remove(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return remove(stack.toMinecraft()); + } + + public boolean removeAll(List stacks) { + boolean changed = false; + for (net.pitan76.mcpitanlib.midohra.item.ItemStack stack : stacks) { + changed |= remove(stack); + } + + return changed; + } + + public boolean removeAll(net.pitan76.mcpitanlib.midohra.item.ItemStack... stacks) { + return removeAll(Arrays.asList(stacks)); + } + + public boolean contains(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return contains(stack.toMinecraft()); + } + + public boolean containsAll(List stacks) { + for (net.pitan76.mcpitanlib.midohra.item.ItemStack stack : stacks) { + if (!contains(stack)) { + return false; + } + } + + return true; + } + + public boolean containsAll(net.pitan76.mcpitanlib.midohra.item.ItemStack... stacks) { + return containsAll(Arrays.asList(stacks)); + } + + public boolean containsAny(List stacks) { + for (net.pitan76.mcpitanlib.midohra.item.ItemStack stack : stacks) { + if (contains(stack)) { + return true; + } + } + + return false; + } + + public boolean containsAny(net.pitan76.mcpitanlib.midohra.item.ItemStack... stacks) { + return containsAny(Arrays.asList(stacks)); + } + + public boolean equals(List stacks) { + if (size() != stacks.size()) { + return false; + } + + for (int i = 0; i < size(); i++) { + if (!get(i).equals(stacks.get(i).toMinecraft())) { + return false; + } + } + + return true; + } + + public boolean equals(net.pitan76.mcpitanlib.midohra.item.ItemStack... stacks) { + return equals(Arrays.asList(stacks)); + } + + public static ItemStackList of(List stacks) { + ItemStackList list = ItemStackList.ofSize(stacks.size()); + for (int i = 0; i < stacks.size(); i++) { + list.set(i, stacks.get(i).toMinecraft()); + } + + return list; + } + + public static ItemStackList of(net.pitan76.mcpitanlib.midohra.item.ItemStack... stacks) { + return ItemStackList.of(Arrays.asList(stacks)); + } + + public static ItemStackList of(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + return of(stack, 1); + } + + public static ItemStackList of(net.pitan76.mcpitanlib.midohra.item.ItemStack stack, int size) { + return ItemStackList.ofSize(size, stack.toMinecraft()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java index 06df6ce68..b75bc3ad4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java @@ -86,4 +86,8 @@ public ItemWrapper asItem() { public BlockState getDefaultState() { return BlockState.of(get()); } + + public boolean rawEquals(BlockWrapper block) { + return get() == block.get(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java index fdd6bae88..387ecd2f5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java @@ -80,4 +80,8 @@ public FluidState getDefaultState() { public ItemWrapper getBucketItem() { return ItemWrapper.of(FluidUtil.getBucketItem(get())); } + + public boolean rawEquals(FluidWrapper fluid) { + return get() == fluid.get(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/Fluids.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/Fluids.java new file mode 100644 index 000000000..15a200faa --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/Fluids.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.midohra.fluid; + +public class Fluids { + public static final FluidWrapper EMPTY = FluidWrapper.of(net.minecraft.fluid.Fluids.EMPTY); + public static final FluidWrapper WATER = FluidWrapper.of(net.minecraft.fluid.Fluids.WATER); + public static final FluidWrapper LAVA = FluidWrapper.of(net.minecraft.fluid.Fluids.LAVA); + public static final FluidWrapper FLOWING_WATER = FluidWrapper.of(net.minecraft.fluid.Fluids.FLOWING_WATER); + public static final FluidWrapper FLOWING_LAVA = FluidWrapper.of(net.minecraft.fluid.Fluids.FLOWING_LAVA); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java index fe6a0f5b8..8bab1ef4c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java @@ -50,4 +50,8 @@ public ItemStack getIcon() { if (isEmpty()) return ItemStack.EMPTY; return ItemStack.of(itemGroup.getIcon()); } + + public boolean rawEquals(ItemGroupWrapper other) { + return itemGroup == other.itemGroup; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java index 29627807a..1e689e2ae 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java @@ -11,14 +11,14 @@ public class ItemStack { private final net.minecraft.item.ItemStack stack; - public static final ItemStack EMPTY = of(ItemStackUtil.empty()); + public static final ItemStack EMPTY = new ItemStack(ItemStackUtil.empty()); protected ItemStack(net.minecraft.item.ItemStack stack) { this.stack = stack; } public static ItemStack of(net.minecraft.item.ItemStack stack) { - if (stack == null) + if (stack == null || stack.isEmpty()) return EMPTY; return new ItemStack(stack); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java index 69fe742c2..7b648b1ea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java @@ -104,4 +104,8 @@ public BlockWrapper asBlock() { return BlockWrapper.of(((net.minecraft.item.BlockItem) get()).getBlock()); } + + public boolean rawEquals(ItemWrapper item) { + return get() == item.get(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java new file mode 100644 index 000000000..4c60082d4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -0,0 +1,54 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +import net.minecraft.recipe.book.CraftingRecipeCategory; +import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; +import net.pitan76.mcpitanlib.midohra.item.ItemStack; +import net.pitan76.mcpitanlib.midohra.recipe.input.CraftingRecipeInputOrInventory; +import net.pitan76.mcpitanlib.midohra.world.World; + +public class CraftingRecipe extends Recipe { + private final net.minecraft.recipe.CraftingRecipe recipe; + + protected CraftingRecipe(net.minecraft.recipe.CraftingRecipe recipe) { + super(null); + this.recipe = recipe; + } + + public static CraftingRecipe of(net.minecraft.recipe.CraftingRecipe recipe) { + return new CraftingRecipe(recipe); + } + + public net.minecraft.recipe.CraftingRecipe getRaw() { + return recipe; + } + + public net.minecraft.recipe.CraftingRecipe toMinecraft() { + return getRaw(); + } + + public CraftingRecipeCategory getRawCategory() { + return getRaw().getCategory(); + } + + public boolean matches(CraftingRecipeInputOrInventory input, World world) { + return getRaw().matches(input.getRaw(), world.getRaw()); + } + + public net.minecraft.item.ItemStack craft(CraftingRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + return getRaw().craft(input.getRaw(), registryLookup.getRegistryLookup()); + } + + public ItemStack craftMidohra(CraftingRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + return ItemStack.of(craft(input, registryLookup)); + } + + public DefaultedList getRecipeRemaindersDefaultedList(CraftingRecipeInputOrInventory input) { + return getRaw().getRecipeRemainders(input.getRaw()); + } + + public ItemStackList getRecipeRemainders(CraftingRecipeInputOrInventory input) { + return ItemStackList.of(getRecipeRemaindersDefaultedList(input)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java new file mode 100644 index 000000000..9b72bb7f5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java @@ -0,0 +1,95 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +import net.minecraft.item.Item; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IngredientUtil; +import net.pitan76.mcpitanlib.midohra.item.ItemStack; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; + +import java.util.ArrayList; +import java.util.List; + +public class Ingredient { + private final net.minecraft.recipe.Ingredient ingredient; + + protected Ingredient(net.minecraft.recipe.Ingredient ingredient) { + this.ingredient = ingredient; + } + + public static Ingredient of(net.minecraft.recipe.Ingredient ingredient) { + return new Ingredient(ingredient); + } + + public static Ingredient ofItems(Item... items) { + return of(net.minecraft.recipe.Ingredient.ofItems(items)); + } + + public static Ingredient ofItem(Item items) { + return of(net.minecraft.recipe.Ingredient.ofItem(items)); + } + + public static Ingredient fromTagById(CompatIdentifier id) { + return of(IngredientUtil.fromTagByIdentifier(id)); + } + + public static Ingredient fromTagByString(String id) { + return of(IngredientUtil.fromTagByString(id)); + } + + public net.minecraft.recipe.Ingredient getRaw() { + return ingredient; + } + + public net.minecraft.recipe.Ingredient toMinecraft() { + return getRaw(); + } + + public boolean test(net.minecraft.item.ItemStack stack) { + return ingredient.test(stack); + } + + public boolean equals(Ingredient other) { + return ingredient.equals(other.getRaw()); + } + + public List getMatchingItems() { + return IngredientUtil.getItems(ingredient); + } + + public it.unimi.dsi.fastutil.ints.IntList getMatchingStacksIds() { + return IngredientUtil.getMatchingStacksIds(ingredient); + } + + public List getMatchingStacksAsList() { + return IngredientUtil.getMatchingStacksAsList(ingredient); + } + + public net.minecraft.item.ItemStack[] getMatchingStacks() { + return IngredientUtil.getMatchingStacks(ingredient); + } + + public List getMatchingItemWrappers() { + List wrappers = new ArrayList<>(); + + for (Item item : getMatchingItems()) { + wrappers.add(ItemWrapper.of(item)); + } + + return wrappers; + } + + public List getMatchingStacksAsMidohraList() { + List stacks = new ArrayList<>(); + + for (net.minecraft.item.ItemStack stack : getMatchingStacksAsList()) { + stacks.add(ItemStack.of(stack)); + } + + return stacks; + } + + public ItemStack[] getMatchingStacksAsMidohra() { + List stacks = getMatchingStacksAsMidohraList(); + return stacks.toArray(new ItemStack[0]); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java new file mode 100644 index 000000000..acb8fc4fd --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java @@ -0,0 +1,92 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.RecipeSerializer; +import net.minecraft.recipe.input.RecipeInput; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.midohra.item.ItemStack; +import net.pitan76.mcpitanlib.midohra.recipe.input.RecipeInputOrInventory; +import net.pitan76.mcpitanlib.midohra.recipe.input.TypedRecipeInputOrInventory; +import net.pitan76.mcpitanlib.midohra.world.World; + +import java.util.List; + +public class Recipe { + private final net.minecraft.recipe.Recipe recipe; + + protected Recipe(net.minecraft.recipe.Recipe recipe) { + this.recipe = recipe; + } + + public static Recipe of(net.minecraft.recipe.Recipe recipe) { + return new Recipe(recipe); + } + + public static CraftingRecipe of(net.minecraft.recipe.CraftingRecipe recipe) { + return new CraftingRecipe(recipe); + } + + public static ShapedRecipe of(net.minecraft.recipe.ShapedRecipe recipe) { + return new ShapedRecipe(recipe); + } + + public static ShapelessRecipe of(net.minecraft.recipe.ShapelessRecipe recipe) { + return new ShapelessRecipe(recipe); + } + + public net.minecraft.recipe.Recipe getRaw() { + return recipe; + } + + public net.minecraft.recipe.Recipe toMinecraft() { + return getRaw(); + } + + public RecipeSerializer getRawSerializer() { + return recipe.getSerializer(); + } + + public boolean matches(RecipeInputOrInventory input, World world) { + if (input instanceof TypedRecipeInputOrInventory) { + return matches((TypedRecipeInputOrInventory) input, world); + } + + return false; + } + + public net.minecraft.item.ItemStack craft(RecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + if (input instanceof TypedRecipeInputOrInventory) { + return craft((TypedRecipeInputOrInventory) input, registryLookup); + } + + return net.minecraft.item.ItemStack.EMPTY; + } + + public ItemStack craftMidohra(RecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + return ItemStack.of(craft(input, registryLookup)); + } + + public boolean matches(TypedRecipeInputOrInventory input, World world) { + return ((net.minecraft.recipe.Recipe)getRaw()).matches(input.getRecipeInput(), world.getRaw()); + } + + public net.minecraft.item.ItemStack craft(TypedRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + return ((net.minecraft.recipe.Recipe)getRaw()).craft(input.getRecipeInput(), registryLookup.getRegistryLookup()); + } + + public ItemStack craftMidohra(TypedRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + return ItemStack.of(craft(input, registryLookup)); + } + + public String getGroup() { + return getRaw().getGroup(); + } + + public RecipeType getType() { + return RecipeType.of(getRaw().getType()); + } + + public List getInputs() { + return getRaw().getIngredientPlacement().getIngredients(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeManager.java new file mode 100644 index 000000000..5b039fe10 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeManager.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +public class RecipeManager { + private final net.minecraft.recipe.RecipeManager recipeManager; + + protected RecipeManager(net.minecraft.recipe.RecipeManager recipeManager) { + this.recipeManager = recipeManager; + } + + public static RecipeManager of(net.minecraft.recipe.RecipeManager recipeManager) { + return new RecipeManager(recipeManager); + } + + public net.minecraft.recipe.RecipeManager getRaw() { + return recipeManager; + } + + public net.minecraft.recipe.RecipeManager toMinecraft() { + return getRaw(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java new file mode 100644 index 000000000..f8163934b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java @@ -0,0 +1,57 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +import net.minecraft.registry.Registries; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class RecipeType { + private final net.minecraft.recipe.RecipeType recipeType; + + public static RecipeType CRAFTING = new RecipeType(net.minecraft.recipe.RecipeType.CRAFTING); + public static RecipeType SMELTING = new RecipeType(net.minecraft.recipe.RecipeType.SMELTING); + public static RecipeType BLASTING = new RecipeType(net.minecraft.recipe.RecipeType.BLASTING); + public static RecipeType SMOKING = new RecipeType(net.minecraft.recipe.RecipeType.SMOKING); + public static RecipeType CAMPFIRE_COOKING = new RecipeType(net.minecraft.recipe.RecipeType.CAMPFIRE_COOKING); + public static RecipeType STONECUTTING = new RecipeType(net.minecraft.recipe.RecipeType.STONECUTTING); + public static RecipeType SMITHING = new RecipeType(net.minecraft.recipe.RecipeType.SMITHING); + + protected RecipeType(net.minecraft.recipe.RecipeType recipeType) { + this.recipeType = recipeType; + } + + public static RecipeType of(net.minecraft.recipe.RecipeType recipeType) { + if (recipeType == net.minecraft.recipe.RecipeType.CRAFTING) { + return CRAFTING; + } else if (recipeType == net.minecraft.recipe.RecipeType.SMELTING) { + return SMELTING; + } else if (recipeType == net.minecraft.recipe.RecipeType.BLASTING) { + return BLASTING; + } else if (recipeType == net.minecraft.recipe.RecipeType.SMOKING) { + return SMOKING; + } else if (recipeType == net.minecraft.recipe.RecipeType.CAMPFIRE_COOKING) { + return CAMPFIRE_COOKING; + } else if (recipeType == net.minecraft.recipe.RecipeType.STONECUTTING) { + return STONECUTTING; + } else if (recipeType == net.minecraft.recipe.RecipeType.SMITHING) { + return SMITHING; + } + + return new RecipeType(recipeType); + } + + public static RecipeType of(CompatIdentifier id) { + return of(Registries.RECIPE_TYPE.get(id.toMinecraft())); + } + + public net.minecraft.recipe.RecipeType getRaw() { + return recipeType; + } + + public net.minecraft.recipe.RecipeType toMinecraft() { + return getRaw(); + } + + public CompatIdentifier getId() { + return CompatIdentifier.fromMinecraft(Registries.RECIPE_TYPE.getId(recipeType)); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java new file mode 100644 index 000000000..29ebedd43 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java @@ -0,0 +1,157 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +import net.pitan76.mcpitanlib.midohra.recipe.entry.CraftingRecipeEntry; +import net.pitan76.mcpitanlib.midohra.recipe.entry.RecipeEntry; +import net.pitan76.mcpitanlib.midohra.recipe.entry.ShapedRecipeEntry; +import net.pitan76.mcpitanlib.midohra.recipe.entry.ShapelessRecipeEntry; +import net.pitan76.mcpitanlib.midohra.world.ServerWorld; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class ServerRecipeManager extends RecipeManager { + private net.minecraft.recipe.ServerRecipeManager serverRecipeManager; + + protected ServerRecipeManager(net.minecraft.recipe.ServerRecipeManager serverRecipeManager) { + super(null); + this.serverRecipeManager = serverRecipeManager; + } + + public static ServerRecipeManager of(net.minecraft.recipe.ServerRecipeManager serverRecipeManager) { + return new ServerRecipeManager(serverRecipeManager); + } + + public static ServerRecipeManager of(net.minecraft.server.world.ServerWorld world) { + return of(world.getRecipeManager()); + } + + public static ServerRecipeManager of(ServerWorld world) { + return of(world.getRaw()); + } + + @Override + public net.minecraft.recipe.ServerRecipeManager getRaw() { + return serverRecipeManager; + } + + @Override + public net.minecraft.recipe.ServerRecipeManager toMinecraft() { + return getRaw(); + } + + @Deprecated + public Collection> getRawRecipes() { + return serverRecipeManager.values(); + } + + public Collection getRecipeEntries() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + recipes.add(RecipeEntry.of(recipe)); + } + + return recipes; + } + + public Collection getCraftingRecipeEntries() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.CraftingRecipe) { + recipes.add(CraftingRecipeEntry.of(recipe)); + } + } + + return recipes; + } + + public Collection getShapelessRecipeEntries() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { + recipes.add(ShapelessRecipeEntry.of(recipe)); + } + } + + return recipes; + } + + public Collection getShapedRecipeEntries() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { + recipes.add(ShapedRecipeEntry.of(recipe)); + } + } + + return recipes; + } + + public Collection getNormalRecipeEntries() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { + recipes.add(ShapelessRecipeEntry.of(recipe)); + } else if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { + recipes.add(ShapedRecipeEntry.of(recipe)); + } + } + + return recipes; + } + + public Collection getRecipes() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + recipes.add(Recipe.of(recipe.value())); + } + + return recipes; + } + + public Collection getCraftingRecipes() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.CraftingRecipe) { + recipes.add(CraftingRecipe.of((net.minecraft.recipe.CraftingRecipe) recipe.value())); + } + } + + return recipes; + } + + public Collection getShapelessRecipes() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { + recipes.add(ShapelessRecipe.of((net.minecraft.recipe.ShapelessRecipe) recipe.value())); + } + } + + return recipes; + } + + public Collection getShapedRecipes() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { + recipes.add(ShapedRecipe.of((net.minecraft.recipe.ShapedRecipe) recipe.value())); + } + } + + return recipes; + } + + public Collection getNormalRecipes() { + List recipes = new ArrayList<>(); + for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { + recipes.add(ShapelessRecipe.of((net.minecraft.recipe.ShapelessRecipe) recipe.value())); + } else if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { + recipes.add(ShapedRecipe.of((net.minecraft.recipe.ShapedRecipe) recipe.value())); + } + } + + return recipes; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java new file mode 100644 index 000000000..b2c9a2adf --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java @@ -0,0 +1,45 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +import net.pitan76.mcpitanlib.midohra.item.ItemStack; +import net.pitan76.mcpitanlib.midohra.recipe.input.CraftingRecipeInputOrInventory; + +public class ShapedRecipe extends CraftingRecipe { + private final net.minecraft.recipe.ShapedRecipe recipe; + + protected ShapedRecipe(net.minecraft.recipe.ShapedRecipe recipe) { + super(null); + this.recipe = recipe; + } + + public static ShapedRecipe of(net.minecraft.recipe.ShapedRecipe recipe) { + return new ShapedRecipe(recipe); + } + + public net.minecraft.recipe.ShapedRecipe getRaw() { + return recipe; + } + + public net.minecraft.recipe.ShapedRecipe toMinecraft() { + return getRaw(); + } + + public boolean matches(CraftingRecipeInputOrInventory input) { + return getRaw().matches(input.getRaw(), null); + } + + public net.minecraft.item.ItemStack craft() { + return getRaw().craft(null, null); + } + + public ItemStack craftMidohra() { + return ItemStack.of(craft()); + } + + public int getWidth() { + return getRaw().getWidth(); + } + + public int getHeight() { + return getRaw().getHeight(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java new file mode 100644 index 000000000..373faf623 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java @@ -0,0 +1,37 @@ +package net.pitan76.mcpitanlib.midohra.recipe; + +import net.pitan76.mcpitanlib.midohra.item.ItemStack; +import net.pitan76.mcpitanlib.midohra.recipe.input.CraftingRecipeInputOrInventory; + +public class ShapelessRecipe extends CraftingRecipe { + private final net.minecraft.recipe.ShapelessRecipe recipe; + + protected ShapelessRecipe(net.minecraft.recipe.ShapelessRecipe recipe) { + super(null); + this.recipe = recipe; + } + + public static ShapelessRecipe of(net.minecraft.recipe.ShapelessRecipe recipe) { + return new ShapelessRecipe(recipe); + } + + public net.minecraft.recipe.ShapelessRecipe getRaw() { + return recipe; + } + + public net.minecraft.recipe.ShapelessRecipe toMinecraft() { + return getRaw(); + } + + public boolean matches(CraftingRecipeInputOrInventory input) { + return getRaw().matches(input.getRaw(), null); + } + + public net.minecraft.item.ItemStack craft() { + return getRaw().craft(null, null); + } + + public ItemStack craftMidohra() { + return ItemStack.of(craft()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java new file mode 100644 index 000000000..6dff1c145 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java @@ -0,0 +1,55 @@ +package net.pitan76.mcpitanlib.midohra.recipe.entry; + +import net.minecraft.recipe.Recipe; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.recipe.CraftingRecipe; + +public class CraftingRecipeEntry extends RecipeEntry { + private final net.minecraft.recipe.RecipeEntry recipeEntry; + + protected CraftingRecipeEntry(net.minecraft.recipe.RecipeEntry recipeEntry) { + super(null); + this.recipeEntry = recipeEntry; + } + + public static CraftingRecipeEntry _of(net.minecraft.recipe.RecipeEntry recipeEntry) { + return new CraftingRecipeEntry(recipeEntry); + } + + public static CraftingRecipeEntry of(net.minecraft.recipe.RecipeEntry recipeEntry) { + return _of((net.minecraft.recipe.RecipeEntry) recipeEntry); + } + + public static CraftingRecipeEntry of(net.minecraft.recipe.CraftingRecipe recipe, CompatIdentifier id) { + RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + + return of(recipeEntry); + } + + public static CraftingRecipeEntry of(CraftingRecipe recipe, CompatIdentifier id) { + return of(recipe.toMinecraft(), id); + } + + @Override + public net.minecraft.recipe.RecipeEntry getRaw() { + return recipeEntry; + } + + @Override + public net.minecraft.recipe.RecipeEntry toMinecraft() { + return getRaw(); + } + + @Override + public CraftingRecipe getRecipe() { + return CraftingRecipe.of(getRawRecipe()); + } + + @Override + public net.minecraft.recipe.CraftingRecipe getRawRecipe() { + return getRaw().value(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java new file mode 100644 index 000000000..9e7814374 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java @@ -0,0 +1,87 @@ +package net.pitan76.mcpitanlib.midohra.recipe.entry; + +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.recipe.CraftingRecipe; +import net.pitan76.mcpitanlib.midohra.recipe.Recipe; +import net.pitan76.mcpitanlib.midohra.recipe.RecipeType; + +public class RecipeEntry { + private final net.minecraft.recipe.RecipeEntry recipeEntry; + + protected RecipeEntry(net.minecraft.recipe.RecipeEntry recipeEntry) { + this.recipeEntry = recipeEntry; + } + + public static RecipeEntry of(net.minecraft.recipe.RecipeEntry recipeEntry) { + return new RecipeEntry(recipeEntry); + } + + public static RecipeEntry of(net.minecraft.recipe.Recipe recipe, CompatIdentifier id) { + RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + return of(recipeEntry); + } + + public static RecipeEntry of(Recipe recipe, CompatIdentifier id) { + return of(recipe.toMinecraft(), id); + } + + public static CraftingRecipeEntry of(net.minecraft.recipe.CraftingRecipe recipe, CompatIdentifier id) { + return CraftingRecipeEntry.of(recipe, id); + } + + public static CraftingRecipeEntry of(CraftingRecipe recipe, CompatIdentifier id) { + return CraftingRecipeEntry.of(recipe, id); + } + + public static ShapedRecipeEntry of(net.minecraft.recipe.ShapedRecipe recipe, CompatIdentifier id) { + return ShapedRecipeEntry.of(recipe, id); + } + + public static ShapedRecipeEntry of(net.pitan76.mcpitanlib.midohra.recipe.ShapedRecipe recipe, CompatIdentifier id) { + return ShapedRecipeEntry.of(recipe, id); + } + + public static ShapelessRecipeEntry of(net.minecraft.recipe.ShapelessRecipe recipe, CompatIdentifier id) { + return ShapelessRecipeEntry.of(recipe, id); + } + + public static ShapelessRecipeEntry of(net.pitan76.mcpitanlib.midohra.recipe.ShapelessRecipe recipe, CompatIdentifier id) { + return ShapelessRecipeEntry.of(recipe, id); + } + + public net.minecraft.recipe.RecipeEntry getRaw() { + return recipeEntry; + } + + public net.minecraft.recipe.RecipeEntry toMinecraft() { + return getRaw(); + } + + public CompatIdentifier getId() { + return CompatIdentifier.fromMinecraft(getRaw().id().getValue()); + } + + public CompatRecipeEntry toCompatRecipeEntry() { + return new CompatRecipeEntry(getRaw()); + } + + public net.minecraft.recipe.Recipe getRawRecipe() { + return getRaw().value(); + } + + public Recipe getRecipe() { + return Recipe.of(getRaw().value()); + } + + public RecipeType getRecipeType() { + return RecipeType.of(getRawRecipeType()); + } + + public net.minecraft.recipe.RecipeType getRawRecipeType() { + return getRaw().value().getType(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java new file mode 100644 index 000000000..569564a95 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java @@ -0,0 +1,55 @@ +package net.pitan76.mcpitanlib.midohra.recipe.entry; + +import net.minecraft.recipe.Recipe; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.recipe.ShapedRecipe; + +public class ShapedRecipeEntry extends RecipeEntry { + private final net.minecraft.recipe.RecipeEntry recipeEntry; + + protected ShapedRecipeEntry(net.minecraft.recipe.RecipeEntry recipeEntry) { + super(null); + this.recipeEntry = recipeEntry; + } + + public static ShapedRecipeEntry _of(net.minecraft.recipe.RecipeEntry recipeEntry) { + return new ShapedRecipeEntry(recipeEntry); + } + + public static ShapedRecipeEntry of(net.minecraft.recipe.RecipeEntry recipeEntry) { + return _of((net.minecraft.recipe.RecipeEntry) recipeEntry); + } + + public static ShapedRecipeEntry of(net.minecraft.recipe.ShapedRecipe recipe, CompatIdentifier id) { + RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + + return of(recipeEntry); + } + + public static ShapedRecipeEntry of(ShapedRecipe recipe, CompatIdentifier id) { + return of(recipe.toMinecraft(), id); + } + + @Override + public net.minecraft.recipe.RecipeEntry getRaw() { + return recipeEntry; + } + + @Override + public net.minecraft.recipe.RecipeEntry toMinecraft() { + return getRaw(); + } + + @Override + public ShapedRecipe getRecipe() { + return ShapedRecipe.of(getRawRecipe()); + } + + @Override + public net.minecraft.recipe.ShapedRecipe getRawRecipe() { + return getRaw().value(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java new file mode 100644 index 000000000..2026084bd --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java @@ -0,0 +1,55 @@ +package net.pitan76.mcpitanlib.midohra.recipe.entry; + +import net.minecraft.recipe.Recipe; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.recipe.ShapelessRecipe; + +public class ShapelessRecipeEntry extends RecipeEntry { + private final net.minecraft.recipe.RecipeEntry recipeEntry; + + protected ShapelessRecipeEntry(net.minecraft.recipe.RecipeEntry recipeEntry) { + super(null); + this.recipeEntry = recipeEntry; + } + + public static ShapelessRecipeEntry _of(net.minecraft.recipe.RecipeEntry recipeEntry) { + return new ShapelessRecipeEntry(recipeEntry); + } + + public static ShapelessRecipeEntry of(net.minecraft.recipe.RecipeEntry recipeEntry) { + return _of((net.minecraft.recipe.RecipeEntry) recipeEntry); + } + + public static ShapelessRecipeEntry of(net.minecraft.recipe.ShapelessRecipe recipe, CompatIdentifier id) { + RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + + return of(recipeEntry); + } + + public static ShapelessRecipeEntry of(ShapelessRecipe recipe, CompatIdentifier id) { + return of(recipe.toMinecraft(), id); + } + + @Override + public net.minecraft.recipe.RecipeEntry getRaw() { + return recipeEntry; + } + + @Override + public net.minecraft.recipe.RecipeEntry toMinecraft() { + return getRaw(); + } + + @Override + public ShapelessRecipe getRecipe() { + return ShapelessRecipe.of(getRawRecipe()); + } + + @Override + public net.minecraft.recipe.ShapelessRecipe getRawRecipe() { + return getRaw().value(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/CraftingRecipeInputOrInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/CraftingRecipeInputOrInventory.java new file mode 100644 index 000000000..2b65cfda1 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/CraftingRecipeInputOrInventory.java @@ -0,0 +1,67 @@ +package net.pitan76.mcpitanlib.midohra.recipe.input; + +import net.minecraft.inventory.CraftingInventory; +import net.minecraft.inventory.Inventory; +import net.minecraft.recipe.input.CraftingRecipeInput; +import org.jetbrains.annotations.Nullable; + +public class CraftingRecipeInputOrInventory extends RecipeInputOrInventory { + private final CraftingRecipeInput recipeInput; + private CraftingInventory inventory = null; + + public static CraftingRecipeInputOrInventory EMPTY = new CraftingRecipeInputOrInventory(CraftingRecipeInput.EMPTY); + + protected CraftingRecipeInputOrInventory(CraftingRecipeInput recipeInput) { + super(null); + this.recipeInput = recipeInput; + } + + protected CraftingRecipeInputOrInventory(CraftingInventory inventory) { + super(null); + this.recipeInput = inventory.createRecipeInput(); + this.inventory = inventory; + } + + public static CraftingRecipeInputOrInventory of(CraftingRecipeInput recipeInput) { + return new CraftingRecipeInputOrInventory(recipeInput); + } + + public static CraftingRecipeInputOrInventory of(Inventory inventory) { + if (inventory instanceof CraftingRecipeInput) { + return of((CraftingRecipeInput) inventory); + } + + return EMPTY; + } + + public static CraftingRecipeInputOrInventory of(CraftingInventory inventory) { + return new CraftingRecipeInputOrInventory(inventory); + } + + @Nullable + @Override + public CraftingRecipeInput getRaw() { + return recipeInput; + } + + @Nullable + @Override + public CraftingRecipeInput toMinecraft() { + return getRaw(); + } + + @Nullable + @Override + public CraftingRecipeInput getRecipeInput() { + return getRaw(); + } + + @Nullable + @Override + public Inventory getInventory() { + if (inventory != null) + return inventory; + + return super.getInventory(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java new file mode 100644 index 000000000..71ff3d195 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java @@ -0,0 +1,80 @@ +package net.pitan76.mcpitanlib.midohra.recipe.input; + +import net.minecraft.inventory.Inventory; +import net.minecraft.recipe.input.RecipeInput; +import net.pitan76.mcpitanlib.midohra.item.ItemStack; +import org.jetbrains.annotations.Nullable; + +public class RecipeInputOrInventory { + private final RecipeInput recipeInput; + + public static RecipeInputOrInventory NONE = new RecipeInputOrInventory(null); + + protected RecipeInputOrInventory(RecipeInput recipeInput) { + this.recipeInput = recipeInput; + } + + public static RecipeInputOrInventory of(RecipeInput recipeInput) { + return new RecipeInputOrInventory(recipeInput); + } + + public static RecipeInputOrInventory of(Inventory inventory) { + if (inventory instanceof RecipeInput) { + return of((RecipeInput) inventory); + } + + return NONE; + } + + @Nullable + public RecipeInput getRaw() { + return recipeInput; + } + + @Nullable + public RecipeInput toMinecraft() { + return getRaw(); + } + + @Nullable + public RecipeInput getRecipeInput() { + return getRaw(); + } + + @Nullable + public Inventory getInventory() { + if (getRaw() instanceof Inventory) { + return (Inventory) getRaw(); + } + + return null; + } + + public boolean isNone() { + return getRaw() == null; + } + + public int size() { + if (isNone()) return 0; + + return getRaw().size(); + } + + public boolean isEmpty() { + if (isNone()) return true; + + return getRaw().isEmpty(); + } + + public net.minecraft.item.ItemStack getStack(int slot) { + if (isNone()) return net.minecraft.item.ItemStack.EMPTY; + + return getRaw().getStackInSlot(slot); + } + + public ItemStack getMidohraStack(int slot) { + if (isNone()) return ItemStack.EMPTY; + + return ItemStack.of(getStack(slot)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/TypedRecipeInputOrInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/TypedRecipeInputOrInventory.java new file mode 100644 index 000000000..66f46d30d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/TypedRecipeInputOrInventory.java @@ -0,0 +1,56 @@ +package net.pitan76.mcpitanlib.midohra.recipe.input; + +import net.minecraft.inventory.Inventory; +import net.minecraft.recipe.input.RecipeInput; +import org.jetbrains.annotations.Nullable; + +public class TypedRecipeInputOrInventory extends RecipeInputOrInventory { + private final T recipeInput; + + public static TypedRecipeInputOrInventory NONE = new TypedRecipeInputOrInventory<>(null); + + protected TypedRecipeInputOrInventory(T recipeInput) { + super(null); + this.recipeInput = recipeInput; + } + + public static TypedRecipeInputOrInventory _of(T recipeInput) { + return new TypedRecipeInputOrInventory<>(recipeInput); + } + + public static TypedRecipeInputOrInventory of(Inventory inventory) { + if (inventory instanceof RecipeInput) { + return _of((RecipeInput) inventory); + } + + return NONE; + } + + @Nullable + @Override + public T getRaw() { + return recipeInput; + } + + @Nullable + @Override + public T getRecipeInput() { + return getRaw(); + } + + @Nullable + @Override + public T toMinecraft() { + return getRaw(); + } + + @Nullable + @Override + public Inventory getInventory() { + if (getRaw() instanceof Inventory) { + return (Inventory) getRaw(); + } + + return null; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java new file mode 100644 index 000000000..fbc5678ed --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java @@ -0,0 +1,89 @@ +package net.pitan76.mcpitanlib.midohra.server; + +import net.minecraft.server.MinecraftServer; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.ServerUtil; +import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.world.ServerWorld; + +public class MCServer { + private final MinecraftServer server; + + protected MCServer(MinecraftServer server) { + this.server = server; + } + + public static MCServer of(MinecraftServer server) { + return new MCServer(server); + } + + public MinecraftServer getRaw() { + return server; + } + + public MinecraftServer toMinecraft() { + return getRaw(); + } + + public String getIP() { + return ServerUtil.getIP(server); + } + + public int getPort() { + return ServerUtil.getPort(server); + } + + public String getMotd() { + return ServerUtil.getMotd(server); + } + + public String getServerModName() { + return ServerUtil.getServerModName(server); + } + + public int getMaxPlayerCount() { + return ServerUtil.getMaxPlayerCount(server); + } + + public int getCurrentPlayerCount() { + return ServerUtil.getCurrentPlayerCount(server); + } + + public boolean isOnlineMode() { + return ServerUtil.isOnlineMode(server); + } + + public boolean isServerRunning() { + return ServerUtil.isServerRunning(server); + } + + public boolean isServerDedicated() { + return ServerUtil.isServerDedicated(server); + } + + public boolean isSingleplayer() { + return ServerUtil.isSingleplayer(server); + } + + public PlayerManager getPlayerManager() { + return PlayerManager.of(ServerUtil.getPlayerManager(server)); + } + + public ServerWorld getWorld(CompatIdentifier id) { + return ServerWorld.of(WorldUtil.getWorld(server, id)); + } + + public ServerWorld getOverworld() { + return ServerWorld.of(WorldUtil.getOverworld(server)); + } + + public ServerWorld getNether() { + return ServerWorld.of(WorldUtil.getNether(server)); + } + + public ServerWorld getEnd() { + return ServerWorld.of(WorldUtil.getEnd(server)); + } + + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/PlayerManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/PlayerManager.java new file mode 100644 index 000000000..22dd9fcd3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/PlayerManager.java @@ -0,0 +1,152 @@ +package net.pitan76.mcpitanlib.midohra.server; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.BannedIpList; +import net.minecraft.server.BannedPlayerList; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.Whitelist; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.text.TextComponent; +import net.pitan76.mcpitanlib.api.util.TextUtil; +import net.pitan76.mcpitanlib.midohra.world.ServerWorld; +import net.pitan76.mcpitanlib.midohra.world.World; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +public class PlayerManager { + private final net.minecraft.server.PlayerManager playerManager; + + protected PlayerManager(net.minecraft.server.PlayerManager playerManager) { + this.playerManager = playerManager; + } + + public static PlayerManager of(net.minecraft.server.PlayerManager playerManager) { + return new PlayerManager(playerManager); + } + + public static PlayerManager of(MinecraftServer server) { + return of(server.getPlayerManager()); + } + + public static PlayerManager of(MCServer server) { + return of(server.getRaw()); + } + + public static PlayerManager of(ServerWorld world) { + return of(world.getServer()); + } + + public static PlayerManager of(World world) { + return of(world.getServer()); + } + + public net.minecraft.server.PlayerManager getRaw() { + return playerManager; + } + + public net.minecraft.server.PlayerManager toMinecraft() { + return getRaw(); + } + + public void broadcast(TextComponent message, boolean overlay) { + getRaw().broadcast(message.getText(), overlay); + } + + public void broadcast(TextComponent message) { + broadcast(message, false); + } + + public void broadcast(String message, boolean overlay) { + getRaw().broadcast(TextUtil.literal(message), overlay); + } + + public void broadcast(String message) { + broadcast(message, false); + } + + public void removePlayer(Player player) { + getRaw().remove(player.getServerPlayer().get()); + } + + public Player getPlayerByUUID(UUID uuid) { + return new Player(getRaw().getPlayer(uuid)); + } + + public Player getPlayerByName(String name) { + return new Player(getRaw().getPlayer(name)); + } + + public List getPlayersByIP(String ip) { + List players = new ArrayList<>(); + for (net.minecraft.entity.player.PlayerEntity p: getRaw().getPlayersByIp(ip)) { + players.add(new Player(p)); + } + return players; + } + + public List getPlayers() { + List players = new ArrayList<>(); + for (PlayerEntity p : getRaw().getPlayerList()) { + players.add(new Player(p)); + } + return players; + } + + public boolean isExistByUUID(UUID uuid) { + return getRaw().getPlayer(uuid) != null; + } + + public boolean isExistByName(String name) { + return getRaw().getPlayer(name) != null; + } + + public boolean isExistByIP(String ip) { + return !getRaw().getPlayersByIp(ip).isEmpty(); + } + + public boolean hasPlayerByUUID(UUID uuid) { + return getRaw().getPlayer(uuid) != null; + } + + public boolean hasPlayerByName(String name) { + return getRaw().getPlayer(name) != null; + } + + public boolean hasPlayerByIP(String ip) { + return !getRaw().getPlayersByIp(ip).isEmpty(); + } + + public int getCurrentPlayerCount() { + return getRaw().getCurrentPlayerCount(); + } + + public int getMaxPlayerCount() { + return getRaw().getMaxPlayerCount(); + } + + public boolean isWhitelistEnabled() { + return getRaw().isWhitelistEnabled(); + } + + public void setWhitelistEnabled(boolean enabled) { + getRaw().setWhitelistEnabled(enabled); + } + + public Whitelist getWhitelist() { + return getRaw().getWhitelist(); + } + + public void reloadWhitelist() { + getRaw().reloadWhitelist(); + } + + public BannedIpList getBannedIpList() { + return getRaw().getIpBanList(); + } + + public BannedPlayerList getBannedPlayerList() { + return getRaw().getUserBanList(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java index 613874f7f..ea83adead 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java @@ -80,4 +80,8 @@ public BlockPos offset(Direction direction, int amount) { public BlockPos offset(Direction direction) { return new BlockPos(blockPos.offset(direction.toMinecraft())); } + + public ChunkPos toChunkPos() { + return ChunkPos.of(this); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/ChunkPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/ChunkPos.java new file mode 100644 index 000000000..da5a979e7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/ChunkPos.java @@ -0,0 +1,154 @@ +package net.pitan76.mcpitanlib.midohra.util.math; + +import java.util.stream.Stream; + +public class ChunkPos { + private final net.minecraft.util.math.ChunkPos pos; + + protected ChunkPos(net.minecraft.util.math.ChunkPos pos) { + this.pos = pos; + } + + public static ChunkPos of(net.minecraft.util.math.ChunkPos pos) { + return new ChunkPos(pos); + } + + public static ChunkPos of(int x, int z) { + return of(new net.minecraft.util.math.ChunkPos(x, z)); + } + + public static ChunkPos of(BlockPos pos) { + return of(new net.minecraft.util.math.ChunkPos(pos.toMinecraft())); + } + + public static ChunkPos of(long pos) { + return of(new net.minecraft.util.math.ChunkPos(pos)); + } + + public static ChunkPos fromRegion(int x, int z) { + return of(net.minecraft.util.math.ChunkPos.fromRegion(x, z)); + } + + public static ChunkPos fromRegionCenter(int x, int z) { + return of(net.minecraft.util.math.ChunkPos.fromRegionCenter(x, z)); + } + + public net.minecraft.util.math.ChunkPos getRaw() { + return pos; + } + + public net.minecraft.util.math.ChunkPos toMinecraft() { + return getRaw(); + } + + public int getX() { + return getRaw().x; + } + + public int getZ() { + return getRaw().z; + } + + public int getOffsetX(int offsetX) { + return getRaw().getOffsetX(offsetX); + } + + public int getOffsetZ(int offsetZ) { + return getRaw().getOffsetZ(offsetZ); + } + + public int getStartX() { + return getRaw().getStartX(); + } + + public int getStartZ() { + return getRaw().getStartZ(); + } + + public int getEndX() { + return getRaw().getEndX(); + } + + public int getEndZ() { + return getRaw().getEndZ(); + } + + public int getCenterX() { + return getRaw().getCenterX(); + } + + public int getCenterZ() { + return getRaw().getCenterZ(); + } + + public int getRegionX() { + return getRaw().getRegionX(); + } + + public int getRegionZ() { + return getRaw().getRegionZ(); + } + + public int getRegionRelativeX() { + return getRaw().getRegionRelativeX(); + } + + public int getRegionRelativeZ() { + return getRaw().getRegionRelativeZ(); + } + + public BlockPos getStartPos() { + return BlockPos.of(getRaw().getStartPos()); + } + + public BlockPos getCenterAtY(int y) { + return BlockPos.of(getRaw().getCenterAtY(y)); + } + + public BlockPos getBlockPos(int offsetX, int y, int offsetZ) { + return BlockPos.of(getRaw().getBlockPos(offsetX, y, offsetZ)); + } + + public long toLong() { + return getRaw().toLong(); + } + + @Override + public String toString() { + return getRaw().toString(); + } + + @Override + public boolean equals(Object obj) { + return obj instanceof ChunkPos && getRaw().equals(((ChunkPos) obj).getRaw()); + } + + @Override + public int hashCode() { + return getRaw().hashCode(); + } + + public int getChebyshevDistance(ChunkPos pos) { + return getRaw().getChebyshevDistance(pos.getRaw()); + } + + public int getChebyshevDistance(int x, int z) { + return getRaw().getChebyshevDistance(x, z); + } + + public int getSquaredDistance(ChunkPos pos) { + return getRaw().getSquaredDistance(pos.getRaw()); + } + + public int getSquaredDistance(long pos) { + return getRaw().getSquaredDistance(pos); + } + + public static Stream stream(ChunkPos center, int radius) { + return net.minecraft.util.math.ChunkPos.stream(center.getRaw(), radius).map(ChunkPos::of); + } + + public static Stream stream(final ChunkPos pos1, final ChunkPos pos2) { + return net.minecraft.util.math.ChunkPos.stream(pos1.getRaw(), pos2.getRaw()).map(ChunkPos::of); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/ServerWorld.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/ServerWorld.java new file mode 100644 index 000000000..9ee497435 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/ServerWorld.java @@ -0,0 +1,63 @@ +package net.pitan76.mcpitanlib.midohra.world; + +import net.minecraft.server.MinecraftServer; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.midohra.recipe.ServerRecipeManager; +import net.pitan76.mcpitanlib.midohra.server.MCServer; +import net.pitan76.mcpitanlib.midohra.server.PlayerManager; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.chunk.ServerChunkManager; + +public class ServerWorld extends World { + private final net.minecraft.server.world.ServerWorld world; + + protected ServerWorld(net.minecraft.server.world.ServerWorld world) { + super(null); + this.world = world; + } + + public static ServerWorld of(net.minecraft.server.world.ServerWorld world) { + return new ServerWorld(world); + } + + @Override + public net.minecraft.server.world.ServerWorld getRaw() { + return world; + } + + @Override + public net.minecraft.server.world.ServerWorld toMinecraft() { + return getRaw(); + } + + public void playSound(Player player, BlockPos pos, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch, long seed) { + getRaw().playSound(player.getEntity(), pos.getX(), pos.getY(), pos.getZ(), sound.getEntry(), category.get(), volume, pitch, seed); + } + + public void playSoundFromEntity(Player player, Player target, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch, long seed) { + getRaw().playSoundFromEntity(player.getEntity(), target.getEntity(), sound.getEntry(), category.get(), volume, pitch, seed); + } + + public MinecraftServer getServer() { + return getRaw().getServer(); + } + + public MCServer getMCServer() { + return MCServer.of(getServer()); + } + + public PlayerManager getPlayerManager() { + return PlayerManager.of(this); + } + + public ServerChunkManager getChunkManager() { + return ServerChunkManager.of(this); + } + + @Override + public ServerRecipeManager getRecipeManager() { + return ServerRecipeManager.of(this); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java index 2aa84bc27..f02010947 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java @@ -2,12 +2,18 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.recipe.RecipeManager; import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; import java.util.List; @@ -96,4 +102,40 @@ public void spawnEntity(Entity entity) { public void spawnStack(net.minecraft.item.ItemStack stack, BlockPos pos) { WorldUtil.spawnStack(getRaw(), pos.toMinecraft(), stack); } + + public RecipeManager getRecipeManager() { + return RecipeManager.of(getRaw().getRecipeManager()); + } + + @Deprecated + @Override + public void playSound(PlayerEntity playerEntity, net.minecraft.util.math.BlockPos pos, SoundEvent sound, SoundCategory category) { + getRaw().playSound(playerEntity, pos, sound, category); + } + + @Deprecated + @Override + public void playSound(PlayerEntity playerEntity, net.minecraft.util.math.BlockPos pos, SoundEvent sound, SoundCategory category, float volume, float pitch) { + getRaw().playSound(playerEntity, pos, sound, category, volume, pitch); + } + + @Override + public void playSound(Player player, BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { + WorldUtil.playSound(getRaw(), player, pos.toMinecraft(), soundEvent, category, volume, pitch); + } + + @Override + public void playSound(BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category) { + playSound(null, pos, soundEvent, category, 1f, 1f); + } + + @Override + public void playSound(Player player, BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category) { + playSound(player, pos, soundEvent, category, 1f, 1f); + } + + @Override + public void playSound(BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { + playSound(null, pos, soundEvent, category, volume, pitch); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkManager.java new file mode 100644 index 000000000..7f3084f67 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkManager.java @@ -0,0 +1,41 @@ +package net.pitan76.mcpitanlib.midohra.world.chunk; + +import net.pitan76.mcpitanlib.midohra.world.BlockView; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; +import net.pitan76.mcpitanlib.midohra.world.World; + +public class ChunkManager { + private final net.minecraft.world.chunk.ChunkManager chunkManager; + + protected ChunkManager(net.minecraft.world.chunk.ChunkManager chunkManager) { + this.chunkManager = chunkManager; + } + + public static ChunkManager of(net.minecraft.world.chunk.ChunkManager chunkManager) { + return new ChunkManager(chunkManager); + } + + public static ChunkManager of(net.minecraft.world.World world) { + return of(world.getChunkManager()); + } + + public static ChunkManager of(World world) { + return of(world.getRaw()); + } + + public net.minecraft.world.chunk.ChunkManager getRaw() { + return chunkManager; + } + + public net.minecraft.world.chunk.ChunkManager toMinecraft() { + return getRaw(); + } + + public IWorldView getWorld() { + return BlockView.of(getRaw().getWorld()); + } + + public boolean isChunkLoaded(int x, int z) { + return getRaw().isChunkLoaded(x, z); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java new file mode 100644 index 000000000..71d4e29d9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java @@ -0,0 +1,58 @@ +package net.pitan76.mcpitanlib.midohra.world.chunk; + +import net.minecraft.util.Unit; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.ChunkPos; + +import java.util.Comparator; + +public class ChunkTicketType { + + public static final ChunkTicketType START = of(net.minecraft.server.world.ChunkTicketType.START); + public static final ChunkTicketType DRAGON = of(net.minecraft.server.world.ChunkTicketType.DRAGON); + public static final ChunkTicketType PLAYER = of(net.minecraft.server.world.ChunkTicketType.PLAYER); + public static final ChunkTicketType FORCED = of(net.minecraft.server.world.ChunkTicketType.FORCED); + public static final ChunkTicketType PORTAL = of(net.minecraft.server.world.ChunkTicketType.PORTAL); + public static final ChunkTicketType ENDER_PEARL = of(net.minecraft.server.world.ChunkTicketType.ENDER_PEARL); + public static final ChunkTicketType POST_TELEPORT = of(net.minecraft.server.world.ChunkTicketType.POST_TELEPORT); + public static final ChunkTicketType UNKNOWN = of(net.minecraft.server.world.ChunkTicketType.UNKNOWN); + + private final net.minecraft.server.world.ChunkTicketType ticketType; + + protected ChunkTicketType(net.minecraft.server.world.ChunkTicketType ticketType) { + this.ticketType = ticketType; + } + + public static ChunkTicketType of(net.minecraft.server.world.ChunkTicketType ticketType) { + return new ChunkTicketType<>(ticketType); + } + + public net.minecraft.server.world.ChunkTicketType getRaw() { + return ticketType; + } + + public net.minecraft.server.world.ChunkTicketType toMinecraft() { + return getRaw(); + } + + public static ChunkTicketType create(String name, Comparator argumentComparator) { + return of(net.minecraft.server.world.ChunkTicketType.create(name, argumentComparator)); + } + + public static ChunkTicketType create(String name, Comparator argumentComparator, int expiryTicks) { + return of(net.minecraft.server.world.ChunkTicketType.create(name, argumentComparator, expiryTicks)); + } + + public Comparator getArgumentComparator() { + return getRaw().getArgumentComparator(); + } + + public long getExpiryTicks() { + return getRaw().getExpiryTicks(); + } + + @Override + public String toString() { + return getRaw().toString(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java new file mode 100644 index 000000000..f4d438620 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java @@ -0,0 +1,45 @@ +package net.pitan76.mcpitanlib.midohra.world.chunk; + +import net.pitan76.mcpitanlib.midohra.util.math.ChunkPos; +import net.pitan76.mcpitanlib.midohra.world.ServerWorld; +import net.pitan76.mcpitanlib.midohra.world.World; + +public class ServerChunkManager extends ChunkManager { + private final net.minecraft.server.world.ServerChunkManager chunkManager; + + protected ServerChunkManager(net.minecraft.server.world.ServerChunkManager chunkManager) { + super(null); + this.chunkManager = chunkManager; + } + + public static ServerChunkManager of(net.minecraft.server.world.ServerChunkManager chunkManager) { + return new ServerChunkManager(chunkManager); + } + + public static ServerChunkManager of(ServerWorld world) { + return of(world.getRaw().getChunkManager()); + } + + @Override + public net.minecraft.server.world.ServerChunkManager getRaw() { + return chunkManager; + } + + @Override + public net.minecraft.server.world.ServerChunkManager toMinecraft() { + return getRaw(); + } + + @Override + public World getWorld() { + return World.of(getRaw().getWorld()); + } + + public void addTicket(ChunkTicketType ticketType, ChunkPos pos, int radius, T argument) { + getRaw().addTicket(ticketType.getRaw(), pos.getRaw(), radius, argument); + } + + public void removeTicket(ChunkTicketType ticketType, ChunkPos pos, int radius, T argument) { + getRaw().removeTicket(ticketType.getRaw(), pos.getRaw(), radius, argument); + } +} diff --git a/info.properties b/info.properties index 1222fc7ab..95235cd92 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.8 +mod_version=3.0.9 maven_group=net.pitan76 -changelog=Fix APIs \ No newline at end of file +changelog=Add APIs \ No newline at end of file From 087cf5f038a700a4481a8fba0d0dbe1fd946d839 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:27:42 +0900 Subject: [PATCH 437/622] fix craft --- .../midohra/recipe/CraftingRecipe.java | 8 ++++---- .../mcpitanlib/midohra/recipe/Recipe.java | 17 ++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java index 4c60082d4..287d43220 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -36,12 +36,12 @@ public boolean matches(CraftingRecipeInputOrInventory input, World world) { return getRaw().matches(input.getRaw(), world.getRaw()); } - public net.minecraft.item.ItemStack craft(CraftingRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { - return getRaw().craft(input.getRaw(), registryLookup.getRegistryLookup()); + public net.minecraft.item.ItemStack craft(CraftingRecipeInputOrInventory input, World world) { + return getRaw().craft(input.getRaw(), world.getRaw().getRegistryManager()); } - public ItemStack craftMidohra(CraftingRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { - return ItemStack.of(craft(input, registryLookup)); + public ItemStack craftMidohra(CraftingRecipeInputOrInventory input, World world) { + return ItemStack.of(craft(input, world)); } public DefaultedList getRecipeRemaindersDefaultedList(CraftingRecipeInputOrInventory input) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java index acb8fc4fd..f840f157b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java @@ -3,7 +3,6 @@ import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.RecipeSerializer; import net.minecraft.recipe.input.RecipeInput; -import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.midohra.item.ItemStack; import net.pitan76.mcpitanlib.midohra.recipe.input.RecipeInputOrInventory; import net.pitan76.mcpitanlib.midohra.recipe.input.TypedRecipeInputOrInventory; @@ -54,28 +53,28 @@ public boolean matches(RecipeInputOrInventory input, World world) { return false; } - public net.minecraft.item.ItemStack craft(RecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + public net.minecraft.item.ItemStack craft(RecipeInputOrInventory input, World world) { if (input instanceof TypedRecipeInputOrInventory) { - return craft((TypedRecipeInputOrInventory) input, registryLookup); + return craft((TypedRecipeInputOrInventory) input, world); } return net.minecraft.item.ItemStack.EMPTY; } - public ItemStack craftMidohra(RecipeInputOrInventory input, CompatRegistryLookup registryLookup) { - return ItemStack.of(craft(input, registryLookup)); + public ItemStack craftMidohra(RecipeInputOrInventory input, World world) { + return ItemStack.of(craft(input, world)); } public boolean matches(TypedRecipeInputOrInventory input, World world) { return ((net.minecraft.recipe.Recipe)getRaw()).matches(input.getRecipeInput(), world.getRaw()); } - public net.minecraft.item.ItemStack craft(TypedRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { - return ((net.minecraft.recipe.Recipe)getRaw()).craft(input.getRecipeInput(), registryLookup.getRegistryLookup()); + public net.minecraft.item.ItemStack craft(TypedRecipeInputOrInventory input, World world) { + return ((net.minecraft.recipe.Recipe)getRaw()).craft(input.getRecipeInput(), world.getRaw().getRegistryManager()); } - public ItemStack craftMidohra(TypedRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { - return ItemStack.of(craft(input, registryLookup)); + public ItemStack craftMidohra(TypedRecipeInputOrInventory input, World world) { + return ItemStack.of(craft(input, world)); } public String getGroup() { From a691f4af6305be5c26c0d547936a6d0e94a87ea3 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:32:56 +0900 Subject: [PATCH 438/622] fix 1211 --- .../midohra/recipe/CraftingRecipe.java | 3 +- .../mcpitanlib/midohra/recipe/Ingredient.java | 2 +- .../mcpitanlib/midohra/recipe/Recipe.java | 2 +- .../midohra/recipe/ServerRecipeManager.java | 40 +++++++------------ .../recipe/entry/CraftingRecipeEntry.java | 6 +-- .../midohra/recipe/entry/RecipeEntry.java | 7 +--- .../recipe/entry/ShapedRecipeEntry.java | 6 +-- .../recipe/entry/ShapelessRecipeEntry.java | 6 +-- .../recipe/input/RecipeInputOrInventory.java | 2 +- .../midohra/world/chunk/ChunkTicketType.java | 2 +- 10 files changed, 24 insertions(+), 52 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java index 287d43220..19dc78b43 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -2,7 +2,6 @@ import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.collection.DefaultedList; -import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; import net.pitan76.mcpitanlib.midohra.item.ItemStack; import net.pitan76.mcpitanlib.midohra.recipe.input.CraftingRecipeInputOrInventory; @@ -45,7 +44,7 @@ public ItemStack craftMidohra(CraftingRecipeInputOrInventory input, World world) } public DefaultedList getRecipeRemaindersDefaultedList(CraftingRecipeInputOrInventory input) { - return getRaw().getRecipeRemainders(input.getRaw()); + return getRaw().getRemainder(input.getRaw()); } public ItemStackList getRecipeRemainders(CraftingRecipeInputOrInventory input) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java index 9b72bb7f5..496089b5f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Ingredient.java @@ -25,7 +25,7 @@ public static Ingredient ofItems(Item... items) { } public static Ingredient ofItem(Item items) { - return of(net.minecraft.recipe.Ingredient.ofItem(items)); + return of(net.minecraft.recipe.Ingredient.ofItems(items)); } public static Ingredient fromTagById(CompatIdentifier id) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java index f840f157b..286e061aa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/Recipe.java @@ -86,6 +86,6 @@ public RecipeType getType() { } public List getInputs() { - return getRaw().getIngredientPlacement().getIngredients(); + return getRaw().getIngredients(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java index 29ebedd43..0e9aa4ea3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ServerRecipeManager.java @@ -11,14 +11,12 @@ import java.util.List; public class ServerRecipeManager extends RecipeManager { - private net.minecraft.recipe.ServerRecipeManager serverRecipeManager; - protected ServerRecipeManager(net.minecraft.recipe.ServerRecipeManager serverRecipeManager) { - super(null); - this.serverRecipeManager = serverRecipeManager; + protected ServerRecipeManager(net.minecraft.recipe.RecipeManager recipeManager) { + super(recipeManager); } - public static ServerRecipeManager of(net.minecraft.recipe.ServerRecipeManager serverRecipeManager) { + public static ServerRecipeManager of(net.minecraft.recipe.RecipeManager serverRecipeManager) { return new ServerRecipeManager(serverRecipeManager); } @@ -30,24 +28,14 @@ public static ServerRecipeManager of(ServerWorld world) { return of(world.getRaw()); } - @Override - public net.minecraft.recipe.ServerRecipeManager getRaw() { - return serverRecipeManager; - } - - @Override - public net.minecraft.recipe.ServerRecipeManager toMinecraft() { - return getRaw(); - } - @Deprecated public Collection> getRawRecipes() { - return serverRecipeManager.values(); + return getRaw().values(); } public Collection getRecipeEntries() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { recipes.add(RecipeEntry.of(recipe)); } @@ -56,7 +44,7 @@ public Collection getRecipeEntries() { public Collection getCraftingRecipeEntries() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.CraftingRecipe) { recipes.add(CraftingRecipeEntry.of(recipe)); } @@ -67,7 +55,7 @@ public Collection getCraftingRecipeEntries() { public Collection getShapelessRecipeEntries() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { recipes.add(ShapelessRecipeEntry.of(recipe)); } @@ -78,7 +66,7 @@ public Collection getShapelessRecipeEntries() { public Collection getShapedRecipeEntries() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { recipes.add(ShapedRecipeEntry.of(recipe)); } @@ -89,7 +77,7 @@ public Collection getShapedRecipeEntries() { public Collection getNormalRecipeEntries() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { recipes.add(ShapelessRecipeEntry.of(recipe)); } else if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { @@ -102,7 +90,7 @@ public Collection getNormalRecipeEntries() { public Collection getRecipes() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { recipes.add(Recipe.of(recipe.value())); } @@ -111,7 +99,7 @@ public Collection getRecipes() { public Collection getCraftingRecipes() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.CraftingRecipe) { recipes.add(CraftingRecipe.of((net.minecraft.recipe.CraftingRecipe) recipe.value())); } @@ -122,7 +110,7 @@ public Collection getCraftingRecipes() { public Collection getShapelessRecipes() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { recipes.add(ShapelessRecipe.of((net.minecraft.recipe.ShapelessRecipe) recipe.value())); } @@ -133,7 +121,7 @@ public Collection getShapelessRecipes() { public Collection getShapedRecipes() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { recipes.add(ShapedRecipe.of((net.minecraft.recipe.ShapedRecipe) recipe.value())); } @@ -144,7 +132,7 @@ public Collection getShapedRecipes() { public Collection getNormalRecipes() { List recipes = new ArrayList<>(); - for (net.minecraft.recipe.RecipeEntry recipe : serverRecipeManager.values()) { + for (net.minecraft.recipe.RecipeEntry recipe : getRaw().values()) { if (recipe.value() instanceof net.minecraft.recipe.ShapelessRecipe) { recipes.add(ShapelessRecipe.of((net.minecraft.recipe.ShapelessRecipe) recipe.value())); } else if (recipe.value() instanceof net.minecraft.recipe.ShapedRecipe) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java index 6dff1c145..879746910 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/CraftingRecipeEntry.java @@ -1,8 +1,5 @@ package net.pitan76.mcpitanlib.midohra.recipe.entry; -import net.minecraft.recipe.Recipe; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.midohra.recipe.CraftingRecipe; @@ -23,8 +20,7 @@ public static CraftingRecipeEntry of(net.minecraft.recipe.RecipeEntry recipeE } public static CraftingRecipeEntry of(net.minecraft.recipe.CraftingRecipe recipe, CompatIdentifier id) { - RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); - net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(id.toMinecraft(), recipe); return of(recipeEntry); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java index 9e7814374..bd5658b7d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/RecipeEntry.java @@ -1,7 +1,5 @@ package net.pitan76.mcpitanlib.midohra.recipe.entry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.midohra.recipe.CraftingRecipe; @@ -20,8 +18,7 @@ public static RecipeEntry of(net.minecraft.recipe.RecipeEntry recipeEntry) { } public static RecipeEntry of(net.minecraft.recipe.Recipe recipe, CompatIdentifier id) { - RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); - net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(id.toMinecraft(), recipe); return of(recipeEntry); } @@ -62,7 +59,7 @@ public net.minecraft.recipe.RecipeEntry toMinecraft() { } public CompatIdentifier getId() { - return CompatIdentifier.fromMinecraft(getRaw().id().getValue()); + return CompatIdentifier.fromMinecraft(getRaw().id()); } public CompatRecipeEntry toCompatRecipeEntry() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java index 569564a95..aeabb3868 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapedRecipeEntry.java @@ -1,8 +1,5 @@ package net.pitan76.mcpitanlib.midohra.recipe.entry; -import net.minecraft.recipe.Recipe; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.midohra.recipe.ShapedRecipe; @@ -23,8 +20,7 @@ public static ShapedRecipeEntry of(net.minecraft.recipe.RecipeEntry recipeEnt } public static ShapedRecipeEntry of(net.minecraft.recipe.ShapedRecipe recipe, CompatIdentifier id) { - RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); - net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(id.toMinecraft(), recipe); return of(recipeEntry); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java index 2026084bd..e834796af 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/entry/ShapelessRecipeEntry.java @@ -1,8 +1,5 @@ package net.pitan76.mcpitanlib.midohra.recipe.entry; -import net.minecraft.recipe.Recipe; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.midohra.recipe.ShapelessRecipe; @@ -23,8 +20,7 @@ public static ShapelessRecipeEntry of(net.minecraft.recipe.RecipeEntry recipe } public static ShapelessRecipeEntry of(net.minecraft.recipe.ShapelessRecipe recipe, CompatIdentifier id) { - RegistryKey> key = RegistryKey.of(RegistryKeys.RECIPE, id.toMinecraft()); - net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(key, recipe); + net.minecraft.recipe.RecipeEntry recipeEntry = new net.minecraft.recipe.RecipeEntry<>(id.toMinecraft(), recipe); return of(recipeEntry); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java index 71ff3d195..77e052b0e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/input/RecipeInputOrInventory.java @@ -57,7 +57,7 @@ public boolean isNone() { public int size() { if (isNone()) return 0; - return getRaw().size(); + return getRaw().getSize(); } public boolean isEmpty() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java index 71d4e29d9..b27752769 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java @@ -13,7 +13,7 @@ public class ChunkTicketType { public static final ChunkTicketType PLAYER = of(net.minecraft.server.world.ChunkTicketType.PLAYER); public static final ChunkTicketType FORCED = of(net.minecraft.server.world.ChunkTicketType.FORCED); public static final ChunkTicketType PORTAL = of(net.minecraft.server.world.ChunkTicketType.PORTAL); - public static final ChunkTicketType ENDER_PEARL = of(net.minecraft.server.world.ChunkTicketType.ENDER_PEARL); + public static final ChunkTicketType ENDER_PEARL = of(net.minecraft.server.world.ChunkTicketType.UNKNOWN); public static final ChunkTicketType POST_TELEPORT = of(net.minecraft.server.world.ChunkTicketType.POST_TELEPORT); public static final ChunkTicketType UNKNOWN = of(net.minecraft.server.world.ChunkTicketType.UNKNOWN); From b482bb13a372cff7db3634907829b0672a289c5e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Tue, 26 Nov 2024 18:32:00 +0900 Subject: [PATCH 439/622] add APIs --- .../api/block/v2/CompatBlockProvider.java | 78 +++++++++++++++ .../api/block/v2/CompatStairsBlock.java | 13 +++ .../midohra/easybuilder/BlockBuilder.java | 68 +++++++++++++- .../midohra/easybuilder/BuiltBlock.java | 74 ++++++++++++++- .../midohra/easybuilder/BuiltItem.java | 34 +++++-- .../midohra/easybuilder/ItemBuilder.java | 17 +++- .../AbstractBlock4CompatProviderMixin.java | 94 +++++++++++++++++++ .../mcpitanlib/mixin/AbstractBlockMixin.java | 5 +- .../mixin/Block4CompatProviderMixin.java | 28 ++++++ .../mcpitanlib/mixin/BlockInvoker.java | 12 +++ .../pitan76/mcpitanlib/mixin/ItemMixin.java | 19 ++-- .../resources/mcpitanlib-common.mixins.json | 3 + info.properties | 4 +- 13 files changed, 416 insertions(+), 33 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlock4CompatProviderMixin.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/mixin/Block4CompatProviderMixin.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java index 5a5d7fe80..c6e9f1050 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java @@ -1,8 +1,19 @@ package net.pitan76.mcpitanlib.api.block.v2; import net.minecraft.block.Block; +import net.minecraft.util.shape.VoxelShape; +import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider; +import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; +import net.pitan76.mcpitanlib.api.block.args.RotateArgs; +import net.pitan76.mcpitanlib.api.block.args.SideInvisibleArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.CollisionShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; +import net.pitan76.mcpitanlib.midohra.block.BlockState; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.mixin.BlockInvoker; public interface CompatBlockProvider extends ExtendBlockProvider { CompatibleBlockSettings getCompatSettings(); @@ -10,4 +21,71 @@ public interface CompatBlockProvider extends ExtendBlockProvider { default BlockWrapper getWrapper() { return this instanceof Block ? BlockWrapper.of((Block) this) : BlockWrapper.of(); } + + default CompatBlockRenderType getRenderType(RenderTypeArgs args, Options options) { + options.cancel = false; + return null; + } + + default BlockState rotate(RotateArgs args, Options options) { + options.cancel = false; + return null; + } + + default Boolean isSideInvisible(SideInvisibleArgs args, Options options) { + options.cancel = false; + return null; + } + + default BlockState getDefaultMidohraState() { + if (this instanceof Block) { + return BlockState.of(((Block) this).getDefaultState()); + } + + return null; + } + + default void setDefaultState(BlockState state) { + if (this instanceof Block) { + ((BlockInvoker) this).setDefaultState(state.toMinecraft()); + } + } + + @Override + @Deprecated + default net.minecraft.block.BlockState getPlacementState(net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs args, Options options) { + return ExtendBlockProvider.super.getPlacementState(args, options); + } + + default BlockState getPlacementState(PlacementStateArgs args, Options options) { + options.cancel = false; + return null; + } + + default BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args, Options options) { + options.cancel = false; + return null; + } + + @Override + @Deprecated + default VoxelShape getOutlineShape(net.pitan76.mcpitanlib.api.event.block.OutlineShapeEvent event, Options options) { + return ExtendBlockProvider.super.getOutlineShape(event, options); + } + + default VoxelShape getOutlineShape(OutlineShapeEvent event, Options options) { + options.cancel = false; + return null; + } + + @Deprecated + @Override + default VoxelShape getCollisionShape(net.pitan76.mcpitanlib.api.event.block.CollisionShapeEvent event, Options options) { + return ExtendBlockProvider.super.getCollisionShape(event, options); + } + + default VoxelShape getCollisionShape(CollisionShapeEvent event, Options options) { + options.cancel = false; + return null; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java new file mode 100644 index 000000000..479bb5d56 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java @@ -0,0 +1,13 @@ +package net.pitan76.mcpitanlib.api.block.v2; + +import net.pitan76.mcpitanlib.midohra.block.BlockState; + +public class CompatStairsBlock extends net.pitan76.mcpitanlib.api.block.CompatStairsBlock { + public CompatStairsBlock(net.minecraft.block.BlockState baseBlockState, CompatibleBlockSettings settings) { + super(baseBlockState, settings); + } + + public CompatStairsBlock(BlockState baseBlockState, CompatibleBlockSettings settings) { + this(baseBlockState.toMinecraft(), settings); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index cd1b5e9fe..4ac919323 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -1,8 +1,15 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; import net.minecraft.item.Item; +import net.minecraft.util.shape.VoxelShape; +import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.block.ExtendBlock; +import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.CollisionShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; import net.pitan76.mcpitanlib.api.block.v2.BlockSettingsBuilder; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; @@ -19,13 +26,12 @@ import net.pitan76.mcpitanlib.api.util.item.ItemUtil; import net.pitan76.mcpitanlib.core.datafixer.Pair; import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; +import org.jetbrains.annotations.Nullable; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.function.ToIntFunction; +import java.util.function.*; public class BlockBuilder { @@ -34,6 +40,13 @@ public class BlockBuilder { public Consumer onStateReplaced; public Consumer onAppendTooltip; public Consumer onAppendProperties; + public BlockState defaultState; + public BiConsumer onInit; + public Function onOutlineShape; + public Function onCollisionShape; + public Function onRenderType; + public Function onPlacementState; + public Function onStateForNeighborUpdate; public BlockBuilder(BlockSettingsBuilder settingsBuilder) { this.settingsBuilder = settingsBuilder; @@ -151,4 +164,51 @@ public BlockBuilder onAppendProperties(Consumer onAppendPr this.onAppendProperties = onAppendProperties; return this; } + + public BlockBuilder onOutlineShape(Function onOutlineShape) { + this.onOutlineShape = onOutlineShape; + return this; + } + + public BlockBuilder onCollisionShape(Function onCollisionShape) { + this.onCollisionShape = onCollisionShape; + return this; + } + + public BlockBuilder onRenderType(Function onRenderType) { + this.onRenderType = onRenderType; + return this; + } + + public BlockBuilder onPlacementState(Function onPlacementState) { + this.onPlacementState = onPlacementState; + return this; + } + + public BlockBuilder onStateForNeighborUpdate(Function onStateForNeighborUpdate) { + this.onStateForNeighborUpdate = onStateForNeighborUpdate; + return this; + } + + public BlockBuilder setOutlineShape(VoxelShape shape) { + return onOutlineShape(e -> shape); + } + + public BlockBuilder setCollisionShape(VoxelShape shape) { + return onCollisionShape(e -> shape); + } + + public BlockBuilder setRenderType(CompatBlockRenderType renderType) { + return onRenderType(e -> renderType); + } + + public BlockBuilder onInit(BiConsumer onInit) { + this.onInit = onInit; + return this; + } + + public BlockBuilder setDefaultState(BlockState defaultState) { + this.defaultState = defaultState; + return this; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java index 837d1c5ac..ea68267c5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java @@ -1,5 +1,12 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; +import net.minecraft.util.shape.VoxelShape; +import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; +import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.CollisionShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; import net.pitan76.mcpitanlib.api.block.v2.CompatBlock; import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; @@ -8,6 +15,8 @@ import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import org.jetbrains.annotations.Nullable; import java.util.function.Consumer; import java.util.function.Function; @@ -18,6 +27,11 @@ public class BuiltBlock extends CompatBlock { protected Consumer onStateReplaced; protected Consumer onAppendTooltip; protected Consumer onAppendProperties; + protected Function onOutlineShape; + protected Function onCollisionShape; + protected Function onRenderType; + protected Function onPlacementState; + protected Function onStateForNeighborUpdate; public BuiltBlock(CompatibleBlockSettings settings) { super(settings); @@ -25,20 +39,30 @@ public BuiltBlock(CompatibleBlockSettings settings) { public BuiltBlock(BlockBuilder builder) { this(builder.settingsBuilder.build()); - - this.onRightClick = builder.onRightClick; - this.onStateReplaced = builder.onStateReplaced; - this.onAppendTooltip = builder.onAppendTooltip; - this.onAppendProperties = builder.onAppendProperties; + init(builder); } public BuiltBlock(BlockBuilder builder, CompatIdentifier id) { this(builder.settingsBuilder.build(id)); + init(builder); + } + protected void init(BlockBuilder builder) { this.onRightClick = builder.onRightClick; this.onStateReplaced = builder.onStateReplaced; this.onAppendTooltip = builder.onAppendTooltip; this.onAppendProperties = builder.onAppendProperties; + this.onOutlineShape = builder.onOutlineShape; + this.onCollisionShape = builder.onCollisionShape; + this.onRenderType = builder.onRenderType; + this.onPlacementState = builder.onPlacementState; + this.onStateForNeighborUpdate = builder.onStateForNeighborUpdate; + + if (builder.onInit != null) + builder.onInit.accept(this.getWrapper(), builder); + + if (builder.defaultState != null) + this.setDefaultState(builder.defaultState); } @Override @@ -66,4 +90,44 @@ public void appendProperties(AppendPropertiesArgs args) { if (onAppendProperties != null) onAppendProperties.accept(args); } + + @Override + public VoxelShape getOutlineShape(OutlineShapeEvent e) { + if (onOutlineShape != null) + return onOutlineShape.apply(e); + + return super.getOutlineShape(e); + } + + @Override + public VoxelShape getCollisionShape(CollisionShapeEvent e) { + if (onCollisionShape != null) + return onCollisionShape.apply(e); + + return super.getCollisionShape(e); + } + + @Override + public CompatBlockRenderType getRenderType(RenderTypeArgs args) { + if (onRenderType != null) + return onRenderType.apply(args); + + return super.getRenderType(args); + } + + @Override + public @Nullable BlockState getPlacementState(PlacementStateArgs args) { + if (onPlacementState != null) + return onPlacementState.apply(args); + + return super.getPlacementState(args); + } + + @Override + public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { + if (onStateForNeighborUpdate != null) + return onStateForNeighborUpdate.apply(args); + + return super.getStateForNeighborUpdate(args); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java index b52a3d32e..7e8dec9a9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java @@ -1,9 +1,6 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; -import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; -import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; -import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; -import net.pitan76.mcpitanlib.api.event.item.ItemUseOnEntityEvent; +import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.item.v2.CompatItem; import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.util.CompatActionResult; @@ -19,6 +16,8 @@ public class BuiltItem extends CompatItem { protected Function onRightClickOnBlock; protected Function onRightClickOnEntity; protected Consumer onAppendTooltip; + protected Function onItemBarColor; + protected Function onItemBarStep; protected BuiltItem(CompatibleItemSettings settings) { super(settings); @@ -26,18 +25,21 @@ protected BuiltItem(CompatibleItemSettings settings) { public BuiltItem(ItemBuilder builder) { this(builder.settingsBuilder.build()); - - this.onRightClick = builder.onRightClick; - this.onRightClickOnBlock = builder.onRightClickOnBlock; - this.onAppendTooltip = builder.onAppendTooltip; + init(builder); } public BuiltItem(ItemBuilder builder, CompatIdentifier id) { this(builder.settingsBuilder.build(id)); + init(builder); + } + protected void init(ItemBuilder builder) { this.onRightClick = builder.onRightClick; this.onRightClickOnBlock = builder.onRightClickOnBlock; + this.onRightClickOnEntity = builder.onRightClickOnEntity; this.onAppendTooltip = builder.onAppendTooltip; + this.onItemBarColor = builder.onItemBarColor; + this.onItemBarStep = builder.onItemBarStep; } @Override @@ -69,4 +71,20 @@ public void appendTooltip(ItemAppendTooltipEvent e) { if (onAppendTooltip != null) onAppendTooltip.accept(e); } + + @Override + public int getItemBarColor(ItemBarColorArgs args) { + if (onItemBarColor != null) + return onItemBarColor.apply(args); + + return super.getItemBarColor(args); + } + + @Override + public int getItemBarStep(ItemBarStepArgs args) { + if (onItemBarStep != null) + return onItemBarStep.apply(args); + + return super.getItemBarStep(args); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java index 9598cf0fc..d503dc624 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java @@ -1,9 +1,6 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; -import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; -import net.pitan76.mcpitanlib.api.event.item.ItemUseEvent; -import net.pitan76.mcpitanlib.api.event.item.ItemUseOnBlockEvent; -import net.pitan76.mcpitanlib.api.event.item.ItemUseOnEntityEvent; +import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.ExtendItem; @@ -29,6 +26,8 @@ public class ItemBuilder { public Function onRightClickOnBlock; public Function onRightClickOnEntity; public Consumer onAppendTooltip; + public Function onItemBarColor; + public Function onItemBarStep; public ItemBuilder(ItemSettingsBuilder settingsBuilder) { this.settingsBuilder = settingsBuilder; @@ -135,4 +134,14 @@ public ItemBuilder onAppendTooltip(Consumer onAppendTool this.onAppendTooltip = onAppendTooltip; return this; } + + public ItemBuilder onItemBarColor(Function onItemBarColor) { + this.onItemBarColor = onItemBarColor; + return this; + } + + public ItemBuilder onItemBarStep(Function onItemBarStep) { + this.onItemBarStep = onItemBarStep; + return this; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlock4CompatProviderMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlock4CompatProviderMixin.java new file mode 100644 index 000000000..54fa33ca7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlock4CompatProviderMixin.java @@ -0,0 +1,94 @@ +package net.pitan76.mcpitanlib.mixin; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.BlockRotation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldAccess; +import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; +import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider.Options; +import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; +import net.pitan76.mcpitanlib.api.block.args.RotateArgs; +import net.pitan76.mcpitanlib.api.block.args.SideInvisibleArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.CollisionShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(AbstractBlock.class) +public class AbstractBlock4CompatProviderMixin { + @Inject(method = "getCollisionShape", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { + if (this instanceof CompatBlockProvider) { + CompatBlockProvider provider = (CompatBlockProvider) this; + Options options = new Options(); + VoxelShape returnValue = provider.getCollisionShape(new CollisionShapeEvent(state, world, pos, context), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "getOutlineShape", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context, CallbackInfoReturnable cir) { + if (this instanceof CompatBlockProvider) { + CompatBlockProvider provider = (CompatBlockProvider) this; + Options options = new Options(); + VoxelShape returnValue = provider.getOutlineShape(new OutlineShapeEvent(state, world, pos, context), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } + + @Inject(method = "getStateForNeighborUpdate", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos, CallbackInfoReturnable cir) { + if (this instanceof CompatBlockProvider) { + CompatBlockProvider provider = (CompatBlockProvider) this; + Options options = new Options(); + net.pitan76.mcpitanlib.midohra.block.BlockState returnValue = provider.getStateForNeighborUpdate(new StateForNeighborUpdateArgs(state, direction, neighborState, world, pos, neighborPos), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue.toMinecraft()); + } + } + + @Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_getRenderType(BlockState state, CallbackInfoReturnable cir) { + if (this instanceof CompatBlockProvider) { + CompatBlockProvider provider = (CompatBlockProvider) this; + Options options = new Options(); + CompatBlockRenderType returnValue = provider.getRenderType(new RenderTypeArgs(state), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue.toMinecraft()); + } + } + + @Inject(method = "rotate", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_rotate(BlockState state, BlockRotation rotation, CallbackInfoReturnable cir) { + if (this instanceof CompatBlockProvider) { + CompatBlockProvider provider = (CompatBlockProvider) this; + Options options = new Options(); + net.pitan76.mcpitanlib.midohra.block.BlockState returnValue = provider.rotate(new RotateArgs(state, rotation), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue.toMinecraft()); + } + } + + @Inject(method = "isSideInvisible", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inject_isSideInvisible(BlockState state, BlockState stateFrom, Direction direction, CallbackInfoReturnable cir) { + if (this instanceof CompatBlockProvider) { + CompatBlockProvider provider = (CompatBlockProvider) this; + Options options = new Options(); + Boolean returnValue = provider.isSideInvisible(new SideInvisibleArgs(state, stateFrom, direction), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue); + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java index 72946654e..711fa65a6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/AbstractBlockMixin.java @@ -20,6 +20,7 @@ import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider; import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider.Options; import net.pitan76.mcpitanlib.api.event.block.*; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -68,9 +69,9 @@ public class AbstractBlockMixin { if (this instanceof ExtendBlockProvider) { ExtendBlockProvider provider = (ExtendBlockProvider) this; Options options = new Options(); - ActionResult returnValue = provider.onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit), options).toActionResult(); + CompatActionResult returnValue = provider.onRightClick(new BlockUseEvent(state, world, pos, player, player.getActiveHand(), hit), options); if (options.cancel && returnValue != null) - cir.setReturnValue(returnValue); + cir.setReturnValue(returnValue.toActionResult()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/Block4CompatProviderMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/Block4CompatProviderMixin.java new file mode 100644 index 000000000..79e84aa7c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/Block4CompatProviderMixin.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.mixin; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.ItemPlacementContext; +import net.pitan76.mcpitanlib.api.block.ExtendBlockProvider.Options; +import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Block.class) +public class Block4CompatProviderMixin { + + @Inject(method = "getPlacementState", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getPlacementState(ItemPlacementContext ctx, CallbackInfoReturnable cir) { + // ExtendBlockProviderを実装している場合 + if (this instanceof CompatBlockProvider) { + CompatBlockProvider provider = (CompatBlockProvider) this; + Options options = new Options(); + net.pitan76.mcpitanlib.midohra.block.BlockState returnValue = provider.getPlacementState(new PlacementStateArgs(ctx), options); + if (options.cancel && returnValue != null) + cir.setReturnValue(returnValue.toMinecraft()); + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java new file mode 100644 index 000000000..919805dc5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java @@ -0,0 +1,12 @@ +package net.pitan76.mcpitanlib.mixin; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(Block.class) +public interface BlockInvoker { + @Invoker("setDefaultState") + void setDefaultState(BlockState state); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index b391f7c08..3e50bc73f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -20,7 +20,10 @@ import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider.Options; import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; +import net.pitan76.mcpitanlib.api.item.consume.CompatUseAction; import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.StackActionResult; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -36,9 +39,9 @@ public class ItemMixin { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); - TypedActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options).toTypedActionResult(); + StackActionResult returnValue = provider.onRightClick(new ItemUseEvent(world, user, hand), options); if (options.cancel && returnValue != null) - cir.setReturnValue(returnValue); + cir.setReturnValue(returnValue.toTypedActionResult()); } } @@ -48,9 +51,9 @@ public class ItemMixin { ExtendItemProvider provider = (ExtendItemProvider) this; ItemUsageContextMixin contextAccessor = (ItemUsageContextMixin) context; Options options = new Options(); - ActionResult returnValue = provider.onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit()), options).toActionResult(); + CompatActionResult returnValue = provider.onRightClickOnBlock(new ItemUseOnBlockEvent(context.getPlayer(), context.getHand(), contextAccessor.getHit()), options); if (options.cancel && returnValue != null) - cir.setReturnValue(returnValue); + cir.setReturnValue(returnValue.toActionResult()); } } @@ -59,9 +62,9 @@ public class ItemMixin { if (this instanceof ExtendItemProvider) { ExtendItemProvider provider = (ExtendItemProvider) this; Options options = new Options(); - ActionResult returnValue = provider.onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand), options).toActionResult(); + CompatActionResult returnValue = provider.onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand), options); if (options.cancel && returnValue != null) - cir.setReturnValue(returnValue); + cir.setReturnValue(returnValue.toActionResult()); } } @@ -202,9 +205,9 @@ public class ItemMixin { if (this instanceof CompatItemProvider) { CompatItemProvider provider = (CompatItemProvider) this; Options options = new Options(); - UseAction returnValue = provider.getUseAction(new UseActionArgs(stack), options).getUseAction(); + CompatUseAction returnValue = provider.getUseAction(new UseActionArgs(stack), options); if (options.cancel) - cir.setReturnValue(returnValue); + cir.setReturnValue(returnValue.getUseAction()); } } } diff --git a/common/src/main/resources/mcpitanlib-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json index 2e376f82b..eb6ff1af0 100644 --- a/common/src/main/resources/mcpitanlib-common.mixins.json +++ b/common/src/main/resources/mcpitanlib-common.mixins.json @@ -4,7 +4,10 @@ "package": "net.pitan76.mcpitanlib.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ + "AbstractBlock4CompatProviderMixin", "AbstractBlockMixin", + "Block4CompatProviderMixin", + "BlockInvoker", "BlockMixin", "ItemMixin", "ItemStackComponentizationFixMixin", diff --git a/info.properties b/info.properties index 95235cd92..68c5b8737 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.0.9 +mod_version=3.1.0 maven_group=net.pitan76 -changelog=Add APIs \ No newline at end of file +changelog=add APIs \ No newline at end of file From bf69d4d583857c2d4875b888d046862cb33c8c08 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Fri, 29 Nov 2024 17:41:06 +0900 Subject: [PATCH 440/622] add APIs --- .../api/block/CompatPillarBlock.java | 5 +- .../mcpitanlib/api/block/CompatSlabBlock.java | 11 +- .../api/block/v2/CompatStairsBlock.java | 56 +++++ .../pitan76/mcpitanlib/api/entity/Player.java | 4 + .../api/event/tile/TileTickEvent.java | 56 ++++- .../api/offlineplayer/OfflinePlayer.java | 37 +++ .../offlineplayer/OfflinePlayerManager.java | 229 ++++++++++++++++++ .../api/state/property/CompatProperties.java | 92 ++++++- .../api/state/property/UnknownProperty.java | 21 ++ .../mcpitanlib/api/util/InventoryUtil.java | 32 +++ .../api/util/inventory/CompatInventory.java | 51 ++++ .../midohra/world/RedstoneView.java | 41 ++++ .../mcpitanlib/midohra/world/WorldView.java | 10 +- info.properties | 2 +- 14 files changed, 636 insertions(+), 11 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayerManager.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/state/property/UnknownProperty.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/world/RedstoneView.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java index f85fc2079..d2bf93a5a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatPillarBlock.java @@ -6,17 +6,18 @@ import net.minecraft.block.PillarBlock; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; -import net.minecraft.state.property.EnumProperty; import net.minecraft.util.math.Direction; import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.state.property.CompatProperties; +import net.pitan76.mcpitanlib.api.state.property.EnumProperty; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatPillarBlock extends PillarBlock implements CompatBlockProvider { - public static final EnumProperty AXIS = PillarBlock.AXIS; + public static final EnumProperty AXIS = CompatProperties.of(PillarBlock.AXIS); public CompatibleBlockSettings settings; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java index f00c541eb..ac7284995 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatSlabBlock.java @@ -8,19 +8,22 @@ import net.minecraft.entity.ai.pathing.NavigationType; import net.minecraft.item.ItemPlacementContext; import net.minecraft.state.StateManager; -import net.minecraft.state.property.BooleanProperty; -import net.minecraft.state.property.EnumProperty; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockView; import net.pitan76.mcpitanlib.api.block.v2.CompatBlockProvider; import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.CanPathfindThroughArgs; import net.pitan76.mcpitanlib.api.event.block.PlacementStateArgs; +import net.pitan76.mcpitanlib.api.state.property.BooleanProperty; +import net.pitan76.mcpitanlib.api.state.property.CompatProperties; +import net.pitan76.mcpitanlib.api.state.property.EnumProperty; import net.pitan76.mcpitanlib.core.serialization.CompatMapCodec; public class CompatSlabBlock extends SlabBlock implements CompatBlockProvider { - public static final EnumProperty TYPE = SlabBlock.TYPE; - public static final BooleanProperty WATERLOGGED = SlabBlock.WATERLOGGED; + public static final EnumProperty TYPE = CompatProperties.of(SlabBlock.TYPE); + public static final BooleanProperty WATERLOGGED = CompatProperties.of(SlabBlock.WATERLOGGED); public CompatibleBlockSettings settings; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java index 479bb5d56..27d05c53c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java @@ -1,8 +1,27 @@ package net.pitan76.mcpitanlib.api.block.v2; +import net.minecraft.block.ShapeContext; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.enums.BlockHalf; +import net.minecraft.block.enums.StairShape; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.pitan76.mcpitanlib.api.block.args.v2.CollisionShapeEvent; +import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; +import net.pitan76.mcpitanlib.api.state.property.BooleanProperty; +import net.pitan76.mcpitanlib.api.state.property.CompatProperties; +import net.pitan76.mcpitanlib.api.state.property.DirectionProperty; +import net.pitan76.mcpitanlib.api.state.property.EnumProperty; import net.pitan76.mcpitanlib.midohra.block.BlockState; public class CompatStairsBlock extends net.pitan76.mcpitanlib.api.block.CompatStairsBlock { + + public static final DirectionProperty FACING = CompatProperties.of(StairsBlock.FACING); + public static final EnumProperty HALF = CompatProperties.of(StairsBlock.HALF); + public static final EnumProperty SHAPE = CompatProperties.of(StairsBlock.SHAPE); + public static final BooleanProperty WATERLOGGED = CompatProperties.of(StairsBlock.WATERLOGGED); + public CompatStairsBlock(net.minecraft.block.BlockState baseBlockState, CompatibleBlockSettings settings) { super(baseBlockState, settings); } @@ -10,4 +29,41 @@ public CompatStairsBlock(net.minecraft.block.BlockState baseBlockState, Compatib public CompatStairsBlock(BlockState baseBlockState, CompatibleBlockSettings settings) { this(baseBlockState.toMinecraft(), settings); } + + public VoxelShape getOutlineShape(OutlineShapeEvent e) { + return super.getOutlineShape(e.state.toMinecraft(), e.world.getRaw(), e.pos.toMinecraft(), e.context); + } + + public VoxelShape getCollisionShape(CollisionShapeEvent e) { + return super.getCollisionShape(e.state.toMinecraft(), e.world.getRaw(), e.pos.toMinecraft(), e.context); + } + + @Deprecated + @Override + public VoxelShape getOutlineShape(net.pitan76.mcpitanlib.api.event.block.OutlineShapeEvent e) { + return getOutlineShape(new OutlineShapeEvent(e.state, e.world, e.pos, e.context)); + } + + @Deprecated + @Override + public VoxelShape getOutlineShape(net.minecraft.block.BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return getOutlineShape(new OutlineShapeEvent(state, world, pos, context)); + } + + @Deprecated + @Override + public VoxelShape getOutlineShape(OutlineShapeEvent e, Options options) { + return super.getOutlineShape(e, options); + } + + @Override + public VoxelShape getCollisionShape(net.minecraft.block.BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + return getCollisionShape(new CollisionShapeEvent(state, world, pos, context)); + } + + @Deprecated + @Override + public VoxelShape getCollisionShape(CollisionShapeEvent event, Options options) { + return super.getCollisionShape(event, options); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index f2382012d..a19af712a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -488,4 +488,8 @@ public void setStackInHand(Hand hand, net.pitan76.mcpitanlib.midohra.item.ItemSt public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStackInHand(Hand hand) { return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStackInHand(hand)); } + + public Hand getActiveHand() { + return getEntity().getActiveHand(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java index 8f767a49a..8a0797af5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java @@ -4,8 +4,11 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; +import net.pitan76.mcpitanlib.midohra.world.IWorldView; -public class TileTickEvent { +public class TileTickEvent implements BlockStatePropertyHolder { public World world; public BlockPos pos; public BlockState state; @@ -25,4 +28,55 @@ public boolean isClient() { public boolean isServer() { return !isClient(); } + + public boolean hasWorld() { + return world != null; + } + + public World getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public BlockState getState() { + if (state == null) + state = getWorldView().getBlockState(getPos()); + + return state; + } + + public T getBlockEntity() { + return blockEntity; + } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(getWorld()); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getPos()); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + if (state == null) + return getWorldView().getBlockState(getMidohraPos()); + + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getState()); + } + + public BlockEntityWrapper getBlockEntityWrapper() { + return BlockEntityWrapper.of(getBlockEntity()); + } + + public IWorldView getWorldView() { + return getMidohraWorld(); + } + + @Override + public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState() { + return getMidohraState(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayer.java new file mode 100644 index 000000000..1bb470b52 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayer.java @@ -0,0 +1,37 @@ +package net.pitan76.mcpitanlib.api.offlineplayer; + +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.midohra.server.PlayerManager; + +import java.util.Optional; +import java.util.UUID; + +public class OfflinePlayer { + public String uuid; + public String name; + + public OfflinePlayer(String uuid, String name) { + this.uuid = uuid; + this.name = name; + } + + public String getUUIDasString() { + return uuid; + } + + public String getName() { + return name; + } + + public UUID getUUID() { + return UUID.fromString(uuid); + } + + public Optional getOnlinePlayer(PlayerManager playerManager) { + return OfflinePlayerManager.getOnlinePlayer(this, playerManager); + } + + public boolean isOnline(PlayerManager playerManager) { + return playerManager.hasPlayerByUUID(getUUID()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayerManager.java b/common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayerManager.java new file mode 100644 index 000000000..7eecbaf2c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/offlineplayer/OfflinePlayerManager.java @@ -0,0 +1,229 @@ +package net.pitan76.mcpitanlib.api.offlineplayer; + +import net.pitan76.easyapi.FileControl; +import net.pitan76.easyapi.config.JsonConfig; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.util.PlatformUtil; +import net.pitan76.mcpitanlib.midohra.server.PlayerManager; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +public class OfflinePlayerManager { + public static OfflinePlayerManager INSTANCE = new OfflinePlayerManager(); + public static final File DEFAULT_FILE = new File(PlatformUtil.getConfigFolderAsFile(), "mcpitanlib/offlineplayer.json"); + + private final List offlinePlayers = new ArrayList<>(); + + protected OfflinePlayerManager() { + if (INSTANCE == null) + INSTANCE = this; + load(); + } + + public File getFile() { + return DEFAULT_FILE; + } + + public void load() { + if (FileControl.fileExists(getFile())) { + JsonConfig config = new JsonConfig(getFile()); + config.configMap.forEach((key, value) -> offlinePlayers.add(new OfflinePlayer(key, (String) value))); + } + } + + public void save() { + if (!FileControl.fileExists(getFile().getParentFile())) { + getFile().getParentFile().mkdirs(); + } + JsonConfig config = new JsonConfig(); + offlinePlayers.forEach(offlinePlayer -> config.set(offlinePlayer.uuid, offlinePlayer.name)); + config.save(getFile(), true); + } + + public OfflinePlayer getPlayer(String uuid) { + for (OfflinePlayer offlinePlayer : offlinePlayers) { + if (offlinePlayer.uuid.equals(uuid)) { + return offlinePlayer; + } + } + return null; + } + + public OfflinePlayer getPlayerByName(String name) { + for (OfflinePlayer offlinePlayer : offlinePlayers) { + if (offlinePlayer.name.equals(name)) { + return offlinePlayer; + } + } + return null; + } + + public void addPlayer(OfflinePlayer offlinePlayer) { + offlinePlayers.add(offlinePlayer); + } + + public void removePlayer(OfflinePlayer offlinePlayer) { + offlinePlayers.remove(offlinePlayer); + } + + public void addPlayer(String uuid, String name) { + if (containsPlayerByUUID(uuid)) + return; + addPlayer(new OfflinePlayer(uuid, name)); + } + + public void removePlayer(String uuid) { + removePlayer(getPlayer(uuid)); + } + + public boolean containsPlayerByUUID(String uuid) { + return getPlayer(uuid) != null; + } + + public boolean containsPlayerByName(String name) { + return getPlayerByName(name) != null; + } + + public boolean containsPlayer(OfflinePlayer offlinePlayer) { + return offlinePlayers.contains(offlinePlayer); + } + + public boolean containsPlayer(UUID uuid) { + return containsPlayerByUUID(uuid.toString()); + } + + public static Optional getOnlinePlayer(UUID uuid, PlayerManager playerManager) { + if (playerManager.hasPlayerByUUID(uuid)) + return Optional.of(playerManager.getPlayerByUUID(uuid)); + + return Optional.empty(); + } + + public static Optional getOnlinePlayerByName(String name, PlayerManager playerManager) { + if (playerManager.hasPlayerByName(name)) + return Optional.of(playerManager.getPlayerByName(name)); + + return Optional.empty(); + } + + public static Optional getOnlinePlayerByUUID(String uuid, PlayerManager playerManager) { + return getOnlinePlayer(UUID.fromString(uuid), playerManager); + } + + public static Optional getOnlinePlayer(OfflinePlayer offlinePlayer, PlayerManager playerManager) { + return getOnlinePlayer(UUID.fromString(offlinePlayer.uuid), playerManager); + } + + public UUID getUUID(String name) { + return UUID.fromString(getUUIDasString(name)); + } + + public String getName(UUID uuid) { + for (OfflinePlayer offlinePlayer : offlinePlayers) { + if (offlinePlayer.uuid.equals(uuid.toString())) { + return offlinePlayer.name; + } + } + return null; + } + + public String getUUIDasString(String name) { + for (OfflinePlayer offlinePlayer : offlinePlayers) { + if (offlinePlayer.name.equals(name)) { + return offlinePlayer.uuid; + } + } + return null; + } + + public List getOfflinePlayers() { + return offlinePlayers; + } + + public void clear() { + offlinePlayers.clear(); + } + + public void reload() { + clear(); + load(); + } + + public void saveAndReload() { + save(); + reload(); + } + + public void saveAndReloadAsync() { + new Thread(() -> { + save(); + reload(); + }).start(); + } + + public void saveAsync() { + new Thread(this::save).start(); + } + + public void reloadAsync() { + new Thread(this::reload).start(); + } + + public void clearAsync() { + new Thread(this::clear).start(); + } + + public void saveAndReloadAsync(Runnable runnable) { + new Thread(() -> { + save(); + reload(); + runnable.run(); + }).start(); + } + + public void saveAsync(Runnable runnable) { + new Thread(() -> { + save(); + runnable.run(); + }).start(); + } + + public void reloadAsync(Runnable runnable) { + new Thread(() -> { + reload(); + runnable.run(); + }).start(); + } + + public void clearAsync(Runnable runnable) { + new Thread(() -> { + clear(); + runnable.run(); + }).start(); + } + + public void saveAndReload(Runnable runnable) { + save(); + reload(); + runnable.run(); + } + + public void save(Runnable runnable) { + save(); + runnable.run(); + } + + public void reload(Runnable runnable) { + reload(); + runnable.run(); + } + + public void clear(Runnable runnable) { + clear(); + runnable.run(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java index e443066b8..0634dc425 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java @@ -1,13 +1,16 @@ package net.pitan76.mcpitanlib.api.state.property; -import net.minecraft.block.enums.BlockHalf; -import net.minecraft.block.enums.StairShape; +import net.minecraft.block.enums.*; import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; +import net.minecraft.util.StringIdentifiable; +import net.minecraft.util.math.Direction; public class CompatProperties { public static final DirectionProperty FACING = new DirectionProperty(Properties.FACING); public static final DirectionProperty HORIZONTAL_FACING = new DirectionProperty(Properties.HORIZONTAL_FACING); public static final DirectionProperty HOPPER_FACING = new DirectionProperty(Properties.HOPPER_FACING); + public static final DirectionProperty VERTICAL_DIRECTION = new DirectionProperty(Properties.VERTICAL_DIRECTION); public static final BooleanProperty POWERED = new BooleanProperty(Properties.POWERED); public static final BooleanProperty ENABLED = new BooleanProperty(Properties.ENABLED); @@ -19,11 +22,96 @@ public class CompatProperties { public static final BooleanProperty BOTTOM = new BooleanProperty(Properties.BOTTOM); public static final BooleanProperty OPEN = new BooleanProperty(Properties.OPEN); public static final BooleanProperty UNSTABLE = new BooleanProperty(Properties.UNSTABLE); + public static final BooleanProperty UP = new BooleanProperty(Properties.UP); + public static final BooleanProperty DOWN = new BooleanProperty(Properties.DOWN); + public static final BooleanProperty NORTH = new BooleanProperty(Properties.NORTH); + public static final BooleanProperty EAST = new BooleanProperty(Properties.EAST); + public static final BooleanProperty SOUTH = new BooleanProperty(Properties.SOUTH); + public static final BooleanProperty WEST = new BooleanProperty(Properties.WEST); public static final IntProperty POWER = new IntProperty(Properties.POWER); public static final IntProperty LAYERS = new IntProperty(Properties.LAYERS); public static final IntProperty NOTE = new IntProperty(Properties.NOTE); + public static final IntProperty ROTATION = new IntProperty(Properties.ROTATION); + public static final IntProperty EGGS = new IntProperty(Properties.EGGS); + public static final IntProperty DELAY = new IntProperty(Properties.DELAY); public static final EnumProperty BLOCK_HALF = new EnumProperty<>(Properties.BLOCK_HALF); public static final EnumProperty STAIR_SHAPE = new EnumProperty<>(Properties.STAIR_SHAPE); + public static final EnumProperty SLAB_TYPE = new EnumProperty<>(Properties.SLAB_TYPE); + public static final EnumProperty CHEST_TYPE = new EnumProperty<>(Properties.CHEST_TYPE); + public static final EnumProperty PISTON_TYPE = new EnumProperty<>(Properties.PISTON_TYPE); + public static final EnumProperty AXIS = new EnumProperty<>(Properties.AXIS); + public static final EnumProperty HORIZONTAL_AXIS = new EnumProperty<>(Properties.HORIZONTAL_AXIS); + public static final EnumProperty COMPARATOR_MODE = new EnumProperty<>(Properties.COMPARATOR_MODE); + + public static IProperty of(Property property) { + if (property instanceof net.minecraft.state.property.IntProperty) { + return of((net.minecraft.state.property.IntProperty) property); + } + if (property instanceof net.minecraft.state.property.BooleanProperty) { + return of((net.minecraft.state.property.BooleanProperty) property); + } + if (property instanceof net.minecraft.state.property.EnumProperty) { + return of((net.minecraft.state.property.EnumProperty) property); + } + if (property instanceof net.minecraft.state.property.DirectionProperty) { + return of((net.minecraft.state.property.DirectionProperty) property); + } + return UnknownProperty.of(property); + } + + public static IntProperty of(net.minecraft.state.property.IntProperty property) { + if (property == Properties.POWER) return POWER; + if (property == Properties.LAYERS) return LAYERS; + if (property == Properties.NOTE) return NOTE; + if (property == Properties.ROTATION) return ROTATION; + if (property == Properties.EGGS) return EGGS; + if (property == Properties.DELAY) return DELAY; + + return new IntProperty(property); + } + + public static BooleanProperty of(net.minecraft.state.property.BooleanProperty property) { + if (property == Properties.POWERED) return POWERED; + if (property == Properties.ENABLED) return ENABLED; + if (property == Properties.WATERLOGGED) return WATERLOGGED; + if (property == Properties.LIT) return LIT; + if (property == Properties.OCCUPIED) return OCCUPIED; + if (property == Properties.ATTACHED) return ATTACHED; + if (property == Properties.HANGING) return HANGING; + if (property == Properties.BOTTOM) return BOTTOM; + if (property == Properties.OPEN) return OPEN; + if (property == Properties.UNSTABLE) return UNSTABLE; + if (property == Properties.UP) return UP; + if (property == Properties.DOWN) return DOWN; + if (property == Properties.NORTH) return NORTH; + if (property == Properties.EAST) return EAST; + if (property == Properties.SOUTH) return SOUTH; + if (property == Properties.WEST) return WEST; + + return new BooleanProperty(property); + } + + public static & StringIdentifiable> EnumProperty of(net.minecraft.state.property.EnumProperty property) { + if (property.equals(Properties.BLOCK_HALF)) return (EnumProperty) BLOCK_HALF; + if (property.equals(Properties.STAIR_SHAPE)) return (EnumProperty) STAIR_SHAPE; + if (property.equals(Properties.SLAB_TYPE)) return (EnumProperty) SLAB_TYPE; + if (property.equals(Properties.CHEST_TYPE)) return (EnumProperty) CHEST_TYPE; + if (property.equals(Properties.PISTON_TYPE)) return (EnumProperty) PISTON_TYPE; + if (property.equals(Properties.AXIS)) return (EnumProperty) AXIS; + if (property.equals(Properties.HORIZONTAL_AXIS)) return (EnumProperty) HORIZONTAL_AXIS; + if (property.equals(Properties.COMPARATOR_MODE)) return (EnumProperty) COMPARATOR_MODE; + + return new EnumProperty<>(property); + } + + public static DirectionProperty of(net.minecraft.state.property.DirectionProperty property) { + if (property == Properties.FACING) return FACING; + if (property == Properties.HORIZONTAL_FACING) return HORIZONTAL_FACING; + if (property == Properties.HOPPER_FACING) return HOPPER_FACING; + if (property == Properties.VERTICAL_DIRECTION) return VERTICAL_DIRECTION; + + return new DirectionProperty(property); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/UnknownProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/UnknownProperty.java new file mode 100644 index 000000000..e59d0cad5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/UnknownProperty.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.state.property; + +import net.minecraft.state.property.Property; + +public class UnknownProperty implements IProperty { + + private final net.minecraft.state.property.Property property; + + public UnknownProperty(net.minecraft.state.property.Property property) { + this.property = property; + } + + public static UnknownProperty of(net.minecraft.state.property.Property property) { + return new UnknownProperty(property); + } + + @Override + public Property getProperty() { + return property; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java index 204f85f40..2829c34a9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/InventoryUtil.java @@ -120,4 +120,36 @@ public static void copyToList(Inventory from, DefaultedList to) { to.set(i, from.getStack(i)); } } + + public static int getSize(Inventory inventory) { + return inventory.size(); + } + + public static ItemStack getStack(Inventory inventory, int slot) { + return inventory.getStack(slot); + } + + public static void setStack(Inventory inventory, int slot, ItemStack stack) { + inventory.setStack(slot, stack); + } + + public static boolean isEmpty(Inventory inventory) { + return inventory.isEmpty(); + } + + public static ItemStack removeStack(Inventory inventory, int slot) { + return inventory.removeStack(slot); + } + + public static ItemStack removeStack(Inventory inventory, int slot, int amount) { + return inventory.removeStack(slot, amount); + } + + public static void clear(Inventory inventory) { + inventory.clear(); + } + + public static void markDirty(Inventory inventory) { + inventory.markDirty(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java index bdd0a8fea..40d10ab56 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.api.util.inventory; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; import net.minecraft.inventory.SimpleInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -146,4 +147,54 @@ public ItemStack getStack(int slot) { public ItemStack callGetStack(int slot) { return super.getStack(slot); } + + @Deprecated + @Override + public int size() { + return getSize(); + } + + public int getSize() { + return super.size(); + } + + @Deprecated + @Override + public boolean isEmpty() { + return callIsEmpty(); + } + + public boolean callIsEmpty() { + return super.isEmpty(); + } + + @Deprecated + @Override + public boolean canTransferTo(Inventory hopperInventory, int slot, ItemStack stack) { + return callCanTransferTo(hopperInventory, slot, stack); + } + + public boolean callCanTransferTo(Inventory hopperInventory, int slot, ItemStack stack) { + return super.canTransferTo(hopperInventory, slot, stack); + } + + @Deprecated + @Override + public ItemStack addStack(ItemStack stack) { + return callAddStack(stack); + } + + public ItemStack callAddStack(ItemStack stack) { + return super.addStack(stack); + } + + @Deprecated + @Override + public int getMaxCountPerStack() { + return callGetMaxCountPerStack(); + } + + public int callGetMaxCountPerStack() { + return super.getMaxCountPerStack(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/RedstoneView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/RedstoneView.java new file mode 100644 index 000000000..4d8bc2f0e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/RedstoneView.java @@ -0,0 +1,41 @@ +package net.pitan76.mcpitanlib.midohra.world; + +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; + +public interface RedstoneView { + + net.minecraft.world.RedstoneView getRedstoneView(); + + default boolean isReceivingRedstonePower(BlockPos pos) { + return getRedstoneView().isReceivingRedstonePower(pos.toMinecraft()); + } + + default int getEmittedRedstonePower(BlockPos pos, Direction direction) { + return getRedstoneView().getEmittedRedstonePower(pos.toMinecraft(), direction.toMinecraft()); + } + + default int getEmittedRedstonePower(BlockPos pos, Direction direction, boolean onlyFromGate) { + return getRedstoneView().getEmittedRedstonePower(pos.toMinecraft(), direction.toMinecraft(), onlyFromGate); + } + + default boolean isEmittingRedstonePower(BlockPos pos, Direction direction) { + return getRedstoneView().isEmittingRedstonePower(pos.toMinecraft(), direction.toMinecraft()); + } + + default int getStrongRedstonePower(BlockPos pos, Direction direction) { + return getRedstoneView().getStrongRedstonePower(pos.toMinecraft(), direction.toMinecraft()); + } + + default int getReceivedStrongRedstonePower(BlockPos pos) { + return getRedstoneView().getReceivedStrongRedstonePower(pos.toMinecraft()); + } + + static RedstoneView of(net.minecraft.world.RedstoneView redstoneView) { + return () -> redstoneView; + } + + static RedstoneView of(net.minecraft.world.WorldView world) { + return WorldView.of(world); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java index 2488905b3..bd78fec9e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java @@ -3,13 +3,15 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.fluid.FluidState; +import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.pitan76.mcpitanlib.api.util.world.WorldAccessUtil; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; import java.util.Optional; -public class WorldView implements IWorldView { +public class WorldView implements IWorldView, RedstoneView { private final net.minecraft.world.WorldView world; protected WorldView(net.minecraft.world.WorldView world) { @@ -63,4 +65,10 @@ public net.minecraft.block.BlockState getBlockState(net.minecraft.util.math.Bloc public FluidState getFluidState(net.minecraft.util.math.BlockPos pos) { return getRaw().getFluidState(pos); } + + @Override + @Deprecated + public net.minecraft.world.RedstoneView getRedstoneView() { + return getRaw(); + } } diff --git a/info.properties b/info.properties index 68c5b8737..115ffe57d 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.0 +mod_version=3.1.1 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 8a8935d877c82a5317fee3014195daca34f1fd74 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 29 Nov 2024 18:26:48 +0900 Subject: [PATCH 441/622] ofDir --- .../pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java | 2 +- .../mcpitanlib/api/state/property/CompatProperties.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java index 27d05c53c..f92115a8a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatStairsBlock.java @@ -17,7 +17,7 @@ public class CompatStairsBlock extends net.pitan76.mcpitanlib.api.block.CompatStairsBlock { - public static final DirectionProperty FACING = CompatProperties.of(StairsBlock.FACING); + public static final DirectionProperty FACING = CompatProperties.ofDir(StairsBlock.FACING); public static final EnumProperty HALF = CompatProperties.of(StairsBlock.HALF); public static final EnumProperty SHAPE = CompatProperties.of(StairsBlock.SHAPE); public static final BooleanProperty WATERLOGGED = CompatProperties.of(StairsBlock.WATERLOGGED); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java index 0634dc425..c6da2b2cb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/CompatProperties.java @@ -56,7 +56,7 @@ public static IProperty of(Property property) { return of((net.minecraft.state.property.EnumProperty) property); } if (property instanceof net.minecraft.state.property.DirectionProperty) { - return of((net.minecraft.state.property.DirectionProperty) property); + return ofDir((net.minecraft.state.property.DirectionProperty) property); } return UnknownProperty.of(property); } @@ -106,7 +106,7 @@ public static & StringIdentifiable> EnumProperty of(net.mi return new EnumProperty<>(property); } - public static DirectionProperty of(net.minecraft.state.property.DirectionProperty property) { + public static DirectionProperty ofDir(net.minecraft.state.property.DirectionProperty property) { if (property == Properties.FACING) return FACING; if (property == Properties.HORIZONTAL_FACING) return HORIZONTAL_FACING; if (property == Properties.HOPPER_FACING) return HOPPER_FACING; From 08dbe37103638cd185e837241da583ed7581821e Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:00:43 +0900 Subject: [PATCH 442/622] add APIs --- .../api/registry/CompatRegistryLookup.java | 10 ++ .../api/tile/CompatBlockEntity.java | 10 ++ .../transfer/fluid/v1/FluidStorageUtil.java | 16 +++ .../api/transfer/fluid/v1/IFluidStorage.java | 99 +++++++++++++++++ .../api/transfer/fluid/v1/IFluidVariant.java | 29 +++++ .../api/util/entity/ServerPlayerUtil.java | 102 ++++++++++++++++++ .../mcpitanlib/midohra/world/World.java | 15 ++- .../extra/transfer/util/FluidStorageUtil.java | 9 ++ .../fluid/v1/fabric/FabricFluidStorage.java | 78 ++++++++++++++ .../fluid/v1/fabric/FabricFluidVariant.java | 33 ++++++ .../fluid/v1/fabric/FluidStorageUtilImpl.java | 17 +++ info.properties | 2 +- .../v1/neoforge/FluidStorageUtilImpl.java | 17 +++ .../v1/neoforge/NeoForgeFluidStorage.java | 72 +++++++++++++ .../v1/neoforge/NeoForgeFluidVariant.java | 33 ++++++ 15 files changed, 539 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/FluidStorageUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidVariant.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidVariant.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FluidStorageUtilImpl.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/FluidStorageUtilImpl.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidVariant.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java index e4504a62b..1a3afc996 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/CompatRegistryLookup.java @@ -4,6 +4,8 @@ import net.minecraft.registry.BuiltinRegistries; import net.minecraft.registry.RegistryWrapper; import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; public class CompatRegistryLookup { @@ -29,4 +31,12 @@ public RegistryWrapper.WrapperLookup getRegistryLookup() { public NbtRWArgs getNbtRWArgs(NbtCompound nbt) { return new NbtRWArgs(nbt, registryLookup); } + + public WriteNbtArgs createWriteNbtArgs(NbtCompound nbt) { + return new WriteNbtArgs(nbt, registryLookup); + } + + public ReadNbtArgs createReadNbtArgs(NbtCompound nbt) { + return new ReadNbtArgs(nbt, registryLookup); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index d0c2f6c7d..8aa2c26ff 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -13,6 +13,7 @@ import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.api.util.WorldUtil; import org.jetbrains.annotations.Nullable; @@ -48,6 +49,15 @@ public void readNbt(ReadNbtArgs args) { } + public NbtCompound toInitialChunkDataNbt(CompatRegistryLookup registryLookup) { + return super.toInitialChunkDataNbt(registryLookup.getRegistryLookup()); + } + + @Deprecated + @Override + public NbtCompound toInitialChunkDataNbt(RegistryWrapper.WrapperLookup registries) { + return toInitialChunkDataNbt(new CompatRegistryLookup(registries)); + } // deprecated diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/FluidStorageUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/FluidStorageUtil.java new file mode 100644 index 000000000..0576fca2f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/FluidStorageUtil.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1; + +import dev.architectury.injectables.annotations.ExpectPlatform; +import net.minecraft.fluid.Fluid; + +public class FluidStorageUtil { + @ExpectPlatform + public static IFluidStorage withFixedCapacity(long capacity, Runnable onChange) { + throw new AssertionError(); + } + + @ExpectPlatform + public static IFluidVariant getVariant(Fluid fluid) { + throw new AssertionError(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java new file mode 100644 index 000000000..be5e27766 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java @@ -0,0 +1,99 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1; + +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.FluidState; +import net.minecraft.nbt.NbtCompound; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; + +public interface IFluidStorage { + long getAmount(); + + long getCapacity(); + + IFluidVariant getResource(); + + void setResource(IFluidVariant variant); + + long insert(IFluidVariant variant, long maxAmount, boolean simulate); + + long extract(IFluidVariant variant, long maxAmount, boolean simulate); + + void writeNbt(WriteNbtArgs args); + + void readNbt(WriteNbtArgs args); + + default long insert(IFluidVariant variant, long maxAmount) { + return insert(variant, maxAmount, false); + } + + default long extract(IFluidVariant variant, long maxAmount) { + return extract(variant, maxAmount, false); + } + + default long insert(Fluid fluid, long maxAmount) { + return insert(FluidStorageUtil.getVariant(fluid), maxAmount); + } + + default long extract(Fluid fluid, long maxAmount) { + return extract(FluidStorageUtil.getVariant(fluid), maxAmount); + } + + default long insert(FluidWrapper wrapper, long maxAmount) { + return insert(wrapper.get(), maxAmount); + } + + default long extract(FluidWrapper wrapper, long maxAmount) { + return extract(wrapper.get(), maxAmount); + } + + default boolean isResourceBlank() { + return getResource() == null || getAmount() <= 0; + } + + default boolean isResource(IFluidVariant variant) { + return getResource() == variant; + } + + default boolean isEmpty() { + return getAmount() <= 0; + } + + default boolean isFull() { + return getAmount() >= getCapacity(); + } + + default boolean canInsert(IFluidVariant variant, long amount) { + return insert(variant, amount, true) == amount; + } + + default boolean canExtract(IFluidVariant variant, long amount) { + return extract(variant, amount, true) == amount; + } + + default boolean canInsert(Fluid fluid, long amount) { + return canInsert(FluidStorageUtil.getVariant(fluid), amount); + } + + default boolean canExtract(Fluid fluid, long amount) { + return canExtract(FluidStorageUtil.getVariant(fluid), amount); + } + + default boolean canInsert(FluidWrapper wrapper, long amount) { + return canInsert(wrapper.get(), amount); + } + + default boolean canExtract(FluidWrapper wrapper, long amount) { + return canExtract(wrapper.get(), amount); + } + + default void writeNbt(NbtCompound nbt, CompatRegistryLookup registryLookup) { + writeNbt(new WriteNbtArgs(nbt, registryLookup)); + } + + default void readNbt(NbtCompound nbt, CompatRegistryLookup registryLookup) { + readNbt(new WriteNbtArgs(nbt, registryLookup)); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidVariant.java b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidVariant.java new file mode 100644 index 000000000..cc78339a4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidVariant.java @@ -0,0 +1,29 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1; + +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; +import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; + +public interface IFluidVariant { + Fluid getFluid(); + + default FluidWrapper getWrapper() { + return FluidWrapper.of(getFluid()); + } + + default boolean isSame(IFluidVariant variant) { + return getFluid() == variant.getFluid(); + } + + default boolean isSame(Fluid fluid) { + return getFluid() == fluid; + } + + default boolean isBlank() { + return getFluid() == null || getFluid() == Fluids.EMPTY; + } + + static IFluidVariant of(Fluid fluid) { + return FluidStorageUtil.getVariant(fluid); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java new file mode 100644 index 000000000..0ffe8696b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java @@ -0,0 +1,102 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.network.packet.s2c.play.PositionFlag; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; + +import java.util.Optional; + +public class ServerPlayerUtil { + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch, boolean resetCamera) { + return serverPlayerEntity.teleport(serverWorld, x, y, z, PositionFlag.VALUES, yaw, pitch, resetCamera); + } + + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch) { + return teleport(serverPlayerEntity, serverWorld, x, y, z, yaw, pitch, false); + } + + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorld serverWorld, double x, double y, double z) { + return teleport(serverPlayerEntity, serverWorld, x, y, z, serverPlayerEntity.getYaw(), serverPlayerEntity.getPitch()); + } + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, net.pitan76.mcpitanlib.midohra.world.ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch, boolean resetCamera) { + return teleport(serverPlayerEntity, serverWorld.getRaw(), x, y, z, yaw, pitch, resetCamera); + } + + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, net.pitan76.mcpitanlib.midohra.world.ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch) { + return teleport(serverPlayerEntity, serverWorld, x, y, z, yaw, pitch, false); + } + + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, net.pitan76.mcpitanlib.midohra.world.ServerWorld serverWorld, double x, double y, double z) { + return teleport(serverPlayerEntity, serverWorld, x, y, z, serverPlayerEntity.getYaw(), serverPlayerEntity.getPitch()); + } + + public static boolean teleport(Player player, net.pitan76.mcpitanlib.midohra.world.ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch, boolean resetCamera) { + Optional optionalServerPlayer = player.getServerPlayer(); + if (!optionalServerPlayer.isPresent()) return false; + + return teleport(optionalServerPlayer.get(), serverWorld, x, y, z, yaw, pitch, resetCamera); + } + + public static boolean teleport(Player player, net.pitan76.mcpitanlib.midohra.world.ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch) { + return teleport(player, serverWorld, x, y, z, yaw, pitch, false); + } + + public static boolean teleport(Player player, net.pitan76.mcpitanlib.midohra.world.ServerWorld serverWorld, double x, double y, double z) { + return teleport(player, serverWorld, x, y, z, player.getYaw(), player.getPitch()); + } + + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, double x, double y, double z, boolean particleEffects) { + return serverPlayerEntity.teleport(x, y, z, particleEffects); + } + + public static boolean teleport(ServerPlayerEntity serverPlayerEntity, double x, double y, double z) { + return teleport(serverPlayerEntity, x, y, z, false); + } + + public static boolean teleport(Player player, double x, double y, double z, boolean particleEffects) { + Optional optionalServerPlayer = player.getServerPlayer(); + if (!optionalServerPlayer.isPresent()) return false; + + return teleport(optionalServerPlayer.get(), x, y, z, particleEffects); + } + + public static boolean teleport(Player player, double x, double y, double z) { + return teleport(player, x, y, z, false); + } + + public static void playSound(ServerPlayerEntity serverPlayerEntity, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { + serverPlayerEntity.playSoundToPlayer(soundEvent.get(), category.get(), volume, pitch); + } + + public static void playSound(ServerPlayerEntity serverPlayerEntity, CompatSoundEvent soundEvent, float volume, float pitch) { + serverPlayerEntity.playSound(soundEvent.get(), volume, pitch); + } + + public static void playSound(ServerPlayerEntity serverPlayerEntity, CompatSoundEvent soundEvent) { + serverPlayerEntity.playSound(soundEvent.get()); + } + + public static void playSound(Player player, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { + Optional optionalServerPlayer = player.getServerPlayer(); + if (!optionalServerPlayer.isPresent()) return; + + playSound(optionalServerPlayer.get(), soundEvent, category, volume, pitch); + } + + public static void playSound(Player player, CompatSoundEvent soundEvent, float volume, float pitch) { + Optional optionalServerPlayer = player.getServerPlayer(); + if (!optionalServerPlayer.isPresent()) return; + + playSound(optionalServerPlayer.get(), soundEvent, volume, pitch); + } + + public static void playSound(Player player, CompatSoundEvent soundEvent) { + Optional optionalServerPlayer = player.getServerPlayer(); + if (!optionalServerPlayer.isPresent()) return; + + playSound(optionalServerPlayer.get(), soundEvent); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java index f02010947..b22bec8c5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java @@ -4,7 +4,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; -import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.pitan76.mcpitanlib.api.entity.Player; @@ -91,10 +90,15 @@ public BlockPos getSpawnPos() { } public Optional getWorld(CompatIdentifier id) { - Optional optional = WorldUtil.getWorld(getRaw(), id); + Optional optional = WorldUtil.getWorld(getRaw(), id); return optional.map(World::of); } + public Optional getServerWorld(CompatIdentifier id) { + Optional optional = WorldUtil.getWorld(getRaw(), id); + return optional.map(ServerWorld::of); + } + public void spawnEntity(Entity entity) { WorldUtil.spawnEntity(getRaw(), entity); } @@ -138,4 +142,11 @@ public void playSound(Player player, BlockPos pos, CompatSoundEvent soundEvent, public void playSound(BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category, float volume, float pitch) { playSound(null, pos, soundEvent, category, volume, pitch); } + + public Optional toServerWorld() { + if (getRaw() instanceof net.minecraft.server.world.ServerWorld) { + return Optional.of(ServerWorld.of((net.minecraft.server.world.ServerWorld) getRaw())); + } + return Optional.empty(); + } } diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java index 97684ec2e..42f7ec93f 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/extra/transfer/util/FluidStorageUtil.java @@ -7,6 +7,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; public class FluidStorageUtil { public static SingleFluidStorage withFixedCapacity(long capacity, Runnable onChange) { @@ -21,6 +22,14 @@ public static void writeNbt(SingleFluidStorage storage, NbtRWArgs args) { storage.writeNbt(args.getNbt(), args.getWrapperLookup()); } + public static void readNbt(SingleFluidStorage storage, NbtCompound nbt, CompatRegistryLookup registryLookup) { + storage.readNbt(nbt, registryLookup.getRegistryLookup()); + } + + public static void writeNbt(SingleFluidStorage storage, NbtCompound nbt, CompatRegistryLookup registryLookup) { + storage.writeNbt(nbt, registryLookup.getRegistryLookup()); + } + /** * @deprecated Use {@link #readNbt(SingleFluidStorage, NbtRWArgs)} instead */ diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java new file mode 100644 index 000000000..d1db98157 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java @@ -0,0 +1,78 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1.fabric; + +import net.fabricmc.fabric.api.transfer.v1.fluid.base.SingleFluidStorage; +import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidStorage; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; + +public class FabricFluidStorage implements IFluidStorage { + + public final SingleFluidStorage storage; + + public FabricFluidStorage(SingleFluidStorage storage) { + this.storage = storage; + } + + @Override + public long getAmount() { + return storage.getAmount(); + } + + @Override + public long getCapacity() { + return storage.getCapacity(); + } + + @Override + public IFluidVariant getResource() { + return new FabricFluidVariant(storage.getResource()); + } + + @Override + public void setResource(IFluidVariant variant) { + storage.variant = ((FabricFluidVariant) variant).raw; + } + + @Override + public boolean isResourceBlank() { + return storage.isResourceBlank(); + } + + @Override + public long insert(IFluidVariant variant, long maxAmount, boolean simulate) { + if (simulate) + return storage.insert(((FabricFluidVariant) variant).raw, maxAmount, Transaction.openOuter()); + + long inserted = 0; + try (Transaction transaction = Transaction.openOuter()) { + inserted += storage.insert(((FabricFluidVariant) variant).raw, maxAmount, transaction); + transaction.commit(); + } + return inserted; + } + + @Override + public long extract(IFluidVariant variant, long maxAmount, boolean simulate) { + if (simulate) + return storage.extract(((FabricFluidVariant) variant).raw, maxAmount, Transaction.openOuter()); + + long extracted = 0; + try (Transaction transaction = Transaction.openOuter()) { + extracted += storage.extract(((FabricFluidVariant) variant).raw, maxAmount, transaction); + transaction.commit(); + } + return extracted; + } + + @Override + public void writeNbt(WriteNbtArgs args) { + storage.writeNbt(args.nbt, args.getWrapperLookup()); + } + + @Override + public void readNbt(WriteNbtArgs args) { + storage.readNbt(args.nbt, args.getWrapperLookup()); + + } +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidVariant.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidVariant.java new file mode 100644 index 000000000..fe003ced9 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidVariant.java @@ -0,0 +1,33 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1.fabric; + +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.minecraft.fluid.Fluid; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; + +public class FabricFluidVariant implements IFluidVariant { + + public final FluidVariant raw; + + public FabricFluidVariant() { + this.raw = FluidVariant.blank(); + } + + public FabricFluidVariant(FluidVariant variant) { + this.raw = variant; + } + + @Override + public Fluid getFluid() { + return raw.getFluid(); + } + + @Override + public boolean isBlank() { + return raw.isBlank(); + } + + @Override + public boolean isSame(Fluid fluid) { + return raw.isOf(fluid); + } +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FluidStorageUtilImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FluidStorageUtilImpl.java new file mode 100644 index 000000000..c5d494ab7 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FluidStorageUtilImpl.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1.fabric; + +import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; +import net.fabricmc.fabric.api.transfer.v1.fluid.base.SingleFluidStorage; +import net.minecraft.fluid.Fluid; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidStorage; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; + +public class FluidStorageUtilImpl { + public static IFluidStorage withFixedCapacity(long capacity, Runnable onChange) { + return new FabricFluidStorage(SingleFluidStorage.withFixedCapacity(capacity, onChange)); + } + + public static IFluidVariant getVariant(Fluid fluid) { + return new FabricFluidVariant(FluidVariant.of(fluid)); + } +} diff --git a/info.properties b/info.properties index 115ffe57d..fda23a10f 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.1 +mod_version=3.1.2 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/FluidStorageUtilImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/FluidStorageUtilImpl.java new file mode 100644 index 000000000..26ee978ec --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/FluidStorageUtilImpl.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1.neoforge; + +import net.minecraft.fluid.Fluid; +import net.neoforged.neoforge.fluids.FluidStack; +import net.neoforged.neoforge.fluids.capability.templates.FluidTank; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidStorage; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; + +public class FluidStorageUtilImpl { + public static IFluidStorage withFixedCapacity(long capacity, Runnable onChange) { + return new NeoForgeFluidStorage(new FluidTank((int) capacity), onChange); + } + + public static IFluidVariant getVariant(Fluid fluid) { + return new NeoForgeFluidVariant(new FluidStack(fluid, 1)); + } +} diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java new file mode 100644 index 000000000..8d0519c69 --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java @@ -0,0 +1,72 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1.neoforge; + +import net.neoforged.neoforge.fluids.capability.IFluidHandler; +import net.neoforged.neoforge.fluids.capability.templates.FluidTank; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidStorage; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; + +public class NeoForgeFluidStorage implements IFluidStorage { + + public final FluidTank storage; + + public Runnable onChange; + + public NeoForgeFluidStorage(FluidTank storage, Runnable onChange) { + this.storage = storage; + this.onChange = onChange; + } + + @Override + public long getAmount() { + return storage.getFluidAmount(); + } + + @Override + public long getCapacity() { + return storage.getCapacity(); + } + + @Override + public IFluidVariant getResource() { + return new NeoForgeFluidVariant(storage.getFluid()); + } + + @Override + public void setResource(IFluidVariant variant) { + storage.setFluid(((NeoForgeFluidVariant) variant).raw); + } + + @Override + public boolean isResourceBlank() { + return storage.isEmpty(); + } + + @Override + public long insert(IFluidVariant variant, long maxAmount, boolean simulate) { + if (simulate) + return storage.fill(((NeoForgeFluidVariant) variant).raw.copyWithAmount((int) maxAmount), IFluidHandler.FluidAction.SIMULATE); + + onChange.run(); + return storage.fill(((NeoForgeFluidVariant) variant).raw.copyWithAmount((int) maxAmount), IFluidHandler.FluidAction.EXECUTE); + } + + @Override + public long extract(IFluidVariant variant, long maxAmount, boolean simulate) { + if (simulate) + return storage.drain(((NeoForgeFluidVariant) variant).raw.copyWithAmount((int) maxAmount), IFluidHandler.FluidAction.SIMULATE).getAmount(); + + onChange.run(); + return storage.drain(((NeoForgeFluidVariant) variant).raw.copyWithAmount((int) maxAmount), IFluidHandler.FluidAction.EXECUTE).getAmount(); + } + + @Override + public void writeNbt(WriteNbtArgs args) { + storage.writeToNBT(args.getWrapperLookup(), args.nbt); + } + + @Override + public void readNbt(WriteNbtArgs args) { + storage.readFromNBT(args.getWrapperLookup(), args.nbt); + } +} diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidVariant.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidVariant.java new file mode 100644 index 000000000..8c5e0a995 --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidVariant.java @@ -0,0 +1,33 @@ +package net.pitan76.mcpitanlib.api.transfer.fluid.v1.neoforge; + +import net.minecraft.fluid.Fluid; +import net.neoforged.neoforge.fluids.FluidStack; +import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; + +public class NeoForgeFluidVariant implements IFluidVariant { + + public final FluidStack raw; + + public NeoForgeFluidVariant() { + this.raw = FluidStack.EMPTY; + } + + public NeoForgeFluidVariant(FluidStack stack) { + this.raw = stack; + } + + @Override + public Fluid getFluid() { + return raw.getFluid(); + } + + @Override + public boolean isBlank() { + return raw.isEmpty(); + } + + @Override + public boolean isSame(Fluid fluid) { + return raw.is(fluid); + } +} From 05d7ddcdef3675bef1f0062252c8f10a225e3584 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:15:31 +0900 Subject: [PATCH 443/622] 1211 --- .../mcpitanlib/api/util/entity/ServerPlayerUtil.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java index 0ffe8696b..7ac2d7a4c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java @@ -11,7 +11,12 @@ public class ServerPlayerUtil { public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch, boolean resetCamera) { - return serverPlayerEntity.teleport(serverWorld, x, y, z, PositionFlag.VALUES, yaw, pitch, resetCamera); + if (resetCamera) { + serverPlayerEntity.stopRiding(); + serverPlayerEntity.setCameraEntity(serverPlayerEntity); + } + + return serverPlayerEntity.teleport(serverWorld, x, y, z, PositionFlag.VALUES, yaw, pitch); } public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch) { From 9d151076c93e69813a8f08486183288f81a51372 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:18:11 +0900 Subject: [PATCH 444/622] 1211-2 --- .../mcpitanlib/api/util/entity/ServerPlayerUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java index 7ac2d7a4c..2ea786e13 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ServerPlayerUtil.java @@ -1,12 +1,12 @@ package net.pitan76.mcpitanlib.api.util.entity; -import net.minecraft.network.packet.s2c.play.PositionFlag; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import java.util.Collections; import java.util.Optional; public class ServerPlayerUtil { @@ -16,11 +16,12 @@ public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorl serverPlayerEntity.setCameraEntity(serverPlayerEntity); } - return serverPlayerEntity.teleport(serverWorld, x, y, z, PositionFlag.VALUES, yaw, pitch); + return serverPlayerEntity.teleport(serverWorld, x, y, z, Collections.emptySet(), yaw, pitch); } public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorld serverWorld, double x, double y, double z, float yaw, float pitch) { - return teleport(serverPlayerEntity, serverWorld, x, y, z, yaw, pitch, false); + serverPlayerEntity.teleport(serverWorld, x, y, z, yaw, pitch); + return true; } public static boolean teleport(ServerPlayerEntity serverPlayerEntity, ServerWorld serverWorld, double x, double y, double z) { From f11a51d2844bcdced1d4d229b72e2916f8387b2f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:55:28 +0900 Subject: [PATCH 445/622] ExtendSettings --- .../net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java index 2dc4b4190..6bdd9592a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatibleItemSettings.java @@ -79,7 +79,7 @@ public CompatibleItemSettings recipeRemainder(Item recipeRemainder) { return this; } - public Item.Settings build() { + public ExtendSettings build() { if (itemGroupId != null) { RegistrySupplier itemGroup = MCPLRegistry1_20.REGISTRY_SUPPLIER_ITEM_GROUP_CACHE.get(itemGroupId); settings.arch$tab(itemGroup); From 6aabfe5b75c676a2bdeede226eab07f79b0b12b1 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 8 Dec 2024 00:00:16 +0900 Subject: [PATCH 446/622] fix APIs --- .../mcpitanlib/midohra/recipe/CraftingRecipe.java | 8 ++++++++ .../mcpitanlib/midohra/recipe/ShapedRecipe.java | 15 +++++++++++++++ .../midohra/recipe/ShapelessRecipe.java | 15 +++++++++++++++ .../pitan76/mcpitanlib/midohra/world/World.java | 6 ++++++ info.properties | 2 +- 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java index 19dc78b43..82e47cb22 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -43,6 +43,14 @@ public ItemStack craftMidohra(CraftingRecipeInputOrInventory input, World world) return ItemStack.of(craft(input, world)); } + public net.minecraft.item.ItemStack craft(CraftingRecipeInputOrInventory input, CompatRegistryLookup registryLookup) { + return getRaw().craft(input.getRaw(), registryLookup.getRegistryLookup()); + } + + public net.minecraft.item.ItemStack craft(CraftingRecipeInputOrInventory input, net.minecraft.world.World world) { + return getRaw().craft(input.getRaw(), world.getRegistryManager()); + } + public DefaultedList getRecipeRemaindersDefaultedList(CraftingRecipeInputOrInventory input) { return getRaw().getRemainder(input.getRaw()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java index b2c9a2adf..3d75164fe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapedRecipe.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.midohra.recipe; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.midohra.item.ItemStack; import net.pitan76.mcpitanlib.midohra.recipe.input.CraftingRecipeInputOrInventory; @@ -27,10 +29,23 @@ public boolean matches(CraftingRecipeInputOrInventory input) { return getRaw().matches(input.getRaw(), null); } + @Deprecated public net.minecraft.item.ItemStack craft() { return getRaw().craft(null, null); } + public net.minecraft.item.ItemStack craft(CompatRegistryLookup registryLookup) { + return getRaw().craft(null, registryLookup.getRegistryLookup()); + } + + public net.minecraft.item.ItemStack craft(World world) { + return getRaw().craft(null, world.getRegistryManager()); + } + + public net.minecraft.item.ItemStack craft(net.pitan76.mcpitanlib.midohra.world.World world) { + return craft(world.getRaw()); + } + public ItemStack craftMidohra() { return ItemStack.of(craft()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java index 373faf623..26d28b05b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/ShapelessRecipe.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.midohra.recipe; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.midohra.item.ItemStack; import net.pitan76.mcpitanlib.midohra.recipe.input.CraftingRecipeInputOrInventory; @@ -27,10 +29,23 @@ public boolean matches(CraftingRecipeInputOrInventory input) { return getRaw().matches(input.getRaw(), null); } + @Deprecated public net.minecraft.item.ItemStack craft() { return getRaw().craft(null, null); } + public net.minecraft.item.ItemStack craft(CompatRegistryLookup registryLookup) { + return getRaw().craft(null, registryLookup.getRegistryLookup()); + } + + public net.minecraft.item.ItemStack craft(World world) { + return getRaw().craft(null, world.getRegistryManager()); + } + + public net.minecraft.item.ItemStack craft(net.pitan76.mcpitanlib.midohra.world.World world) { + return craft(world.getRaw()); + } + public ItemStack craftMidohra() { return ItemStack.of(craft()); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java index b22bec8c5..3a94bf8ba 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/World.java @@ -7,9 +7,11 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.RegistryLookupUtil; import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; import net.pitan76.mcpitanlib.midohra.recipe.RecipeManager; @@ -149,4 +151,8 @@ public Optional toServerWorld() { } return Optional.empty(); } + + public CompatRegistryLookup getRegistryLookup() { + return RegistryLookupUtil.getRegistryLookup(getRaw()); + } } diff --git a/info.properties b/info.properties index fda23a10f..ed4391aa5 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.2 +mod_version=3.1.3 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From a06ab8f81268d3075e455cd59180a2d70557c2b7 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sun, 8 Dec 2024 00:03:14 +0900 Subject: [PATCH 447/622] 1211 --- .../net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java index 82e47cb22..4874cd20f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -2,6 +2,7 @@ import net.minecraft.recipe.book.CraftingRecipeCategory; import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; import net.pitan76.mcpitanlib.midohra.item.ItemStack; import net.pitan76.mcpitanlib.midohra.recipe.input.CraftingRecipeInputOrInventory; From 27a1bdb506a759d8ebfaf4b9509edfcb3e6e5d2c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:44:34 +0900 Subject: [PATCH 448/622] add apis --- .../api/recipe/CompatRecipeType.java | 5 ++ .../api/recipe/CompatibleRecipeEntry.java | 1 + .../mcpitanlib/api/recipe/MatchGetter.java | 1 + .../api/recipe/v2/CompatRecipeEntry.java | 1 + .../api/recipe/v2/CompatRecipeNonEntry.java | 1 + .../api/recipe/v3/CompatRecipe.java | 79 +++++++++++++++++ .../api/util/recipe/RecipeUtil.java | 85 +++++++++++++++++++ .../midohra/recipe/CraftingRecipe.java | 12 +++ .../mcpitanlib/midohra/recipe/RecipeType.java | 14 +-- info.properties | 2 +- 10 files changed, 193 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java index 568c2daa0..a68005e01 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatRecipeType.java @@ -5,6 +5,7 @@ import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +@Deprecated public class CompatRecipeType> { public static final CompatRecipeType CRAFTING = new CompatRecipeType<>(RecipeType.CRAFTING); public static final CompatRecipeType SMELTING = new CompatRecipeType<>(RecipeType.SMELTING); @@ -49,4 +50,8 @@ public static > CompatRecipeType of(CompatIdentifier id, public static > CompatRecipeType of(RecipeType type) { return new CompatRecipeType<>(type); } + + public net.pitan76.mcpitanlib.midohra.recipe.RecipeType toMidohra() { + return net.pitan76.mcpitanlib.midohra.recipe.RecipeType.of(type); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java index 2a3d8935d..b4971fbef 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/CompatibleRecipeEntry.java @@ -6,6 +6,7 @@ import net.pitan76.mcpitanlib.api.util.RecipeUtil; import org.jetbrains.annotations.Nullable; +@Deprecated public class CompatibleRecipeEntry { private final RecipeEntry entry; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java index 8457e5801..e0ec74ef3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/MatchGetter.java @@ -8,6 +8,7 @@ import java.util.Optional; +@Deprecated public interface MatchGetter> { Optional> getFirstMatch(CompatRecipeInput input, World world); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java index d9f19dede..643ee203a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeEntry.java @@ -6,6 +6,7 @@ import net.pitan76.mcpitanlib.api.util.RecipeUtil; import org.jetbrains.annotations.Nullable; +@Deprecated public class CompatRecipeEntry> { private final RecipeEntry entry; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java index 67e094cc1..09b62e257 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v2/CompatRecipeNonEntry.java @@ -4,6 +4,7 @@ import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.RecipeUtil; +@Deprecated public class CompatRecipeNonEntry> extends CompatRecipeEntry { public CompatRecipeNonEntry(T recipe) { super(CompatIdentifier.EMPTY, "", RecipeUtil.CompatibilityCraftingRecipeCategory.MISC, recipe); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java new file mode 100644 index 000000000..39743789c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java @@ -0,0 +1,79 @@ +package net.pitan76.mcpitanlib.api.recipe.v3; + +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeType; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; +import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.recipe.entry.RecipeEntry; + +public class CompatRecipe { + public Recipe recipe; + public Identifier id; + + public CompatRecipe(Recipe recipe, Identifier id) { + this.recipe = recipe; + this.id = id; + } + + @Deprecated + public CompatRecipe(Recipe recipe) { + this.recipe = recipe; + this.id = recipe.getId(); + } + + public boolean isNull() { + return recipe == null; + } + + public Recipe getRecipe() { + return recipe; + } + + public Identifier getId() { + return id; + } + + public CompatIdentifier getCompatId() { + return CompatIdentifier.fromMinecraft(getId()); + } + + public RecipeType getType() { + Recipe recipe = getRecipe(); + if (recipe == null) return null; + + return recipe.getType(); + } + + @Deprecated + public CompatRecipeEntry getRecipeEntry() { + return new CompatRecipeEntry<>(getId(), "", null, getRecipe()); + } + + @Deprecated + public CompatibleRecipeEntry getCompatibleRecipeEntry() { + return new CompatibleRecipeEntry(getRecipe()); + } + + // MidohraAPI + public net.pitan76.mcpitanlib.midohra.recipe.Recipe getMidohraRecipe() { + if (getMidohraType() == net.pitan76.mcpitanlib.midohra.recipe.RecipeType.CRAFTING) { + return net.pitan76.mcpitanlib.midohra.recipe.CraftingRecipe.of((net.minecraft.recipe.CraftingRecipe) getRecipe()); + } + + return net.pitan76.mcpitanlib.midohra.recipe.Recipe.of(getRecipe()); + } + + public net.pitan76.mcpitanlib.midohra.recipe.entry.RecipeEntry getMidohraRecipeEntry() { + if (getMidohraType() == net.pitan76.mcpitanlib.midohra.recipe.RecipeType.CRAFTING) { + return net.pitan76.mcpitanlib.midohra.recipe.entry.CraftingRecipeEntry.of((net.minecraft.recipe.CraftingRecipe) getRecipe(), getCompatId()); + } + + return RecipeEntry.of(getRecipe(), getCompatId()); + } + + public net.pitan76.mcpitanlib.midohra.recipe.RecipeType getMidohraType() { + return net.pitan76.mcpitanlib.midohra.recipe.RecipeType.of(getType()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java new file mode 100644 index 000000000..f92ad4596 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java @@ -0,0 +1,85 @@ +package net.pitan76.mcpitanlib.api.util.recipe; + +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.RecipeType; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.recipe.v3.CompatRecipe; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.recipe.CraftingRecipe; +import net.pitan76.mcpitanlib.midohra.recipe.entry.CraftingRecipeEntry; +import net.pitan76.mcpitanlib.midohra.recipe.entry.RecipeEntry; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +public class RecipeUtil { + public static Collection> getMCRecipes(World world) { + return world.getRecipeManager().values(); + } + + public static Collection getRecipes(World world) { + List recipes = new ArrayList<>(); + + for (Recipe recipe : getMCRecipes(world)) { + recipes.add(new CompatRecipe(recipe, recipe.getId())); + } + + return recipes; + } + + public static Collection getRecipesByType(World world, RecipeType type) { + List recipes = new ArrayList<>(); + + for (Recipe recipe : getMCRecipes(world)) { + if (recipe.getType() == type) { + recipes.add(new CompatRecipe(recipe, recipe.getId())); + } + } + + return recipes; + } + + // MidohraAPI + public static Collection getRecipes(net.pitan76.mcpitanlib.midohra.world.World world) { + return getRecipes(world.getRaw()); + } + + public static Collection getRecipesByType(net.pitan76.mcpitanlib.midohra.world.World world, net.pitan76.mcpitanlib.midohra.recipe.RecipeType type) { + return getRecipesByType(world.getRaw(), type.getRaw()); + } + + public static Collection getRecipeEntries(net.pitan76.mcpitanlib.midohra.world.World world) { + List entries = new ArrayList<>(); + + for (Recipe recipe : getMCRecipes(world.getRaw())) { + entries.add(RecipeEntry.of(recipe, CompatIdentifier.fromMinecraft(recipe.getId()))); + } + + return entries; + } + + public static Collection getCraftingRecipes(net.pitan76.mcpitanlib.midohra.world.World world) { + List recipes = new ArrayList<>(); + + for (CompatRecipe recipe : getRecipesByType(world, net.pitan76.mcpitanlib.midohra.recipe.RecipeType.CRAFTING)) { + if (recipe.getRecipe() instanceof net.minecraft.recipe.CraftingRecipe) { + recipes.add(CraftingRecipe.of((net.minecraft.recipe.CraftingRecipe) recipe.getRecipe())); + } + } + + return recipes; + } + + public static Collection getCraftingRecipeEntries(net.pitan76.mcpitanlib.midohra.world.World world) { + List entries = new ArrayList<>(); + + for (Recipe recipe : getMCRecipes(world.getRaw())) { + if (recipe instanceof net.minecraft.recipe.CraftingRecipe) { + entries.add(CraftingRecipeEntry.of((net.minecraft.recipe.CraftingRecipe) recipe, CompatIdentifier.fromMinecraft(recipe.getId()))); + } + } + + return entries; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java index 4874cd20f..c8f362177 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -59,4 +59,16 @@ public DefaultedList getRecipeRemaindersDefaultedL public ItemStackList getRecipeRemainders(CraftingRecipeInputOrInventory input) { return ItemStackList.of(getRecipeRemaindersDefaultedList(input)); } + + public net.minecraft.item.ItemStack getOutput(CraftingRecipeInputOrInventory input, net.minecraft.world.World world) { + return getRaw().getOutput(); + } + + public net.minecraft.item.ItemStack getOutput(CraftingRecipeInputOrInventory input, World world) { + return getOutput(input, world.getRaw()); + } + + public ItemStack getOutputMidohra(CraftingRecipeInputOrInventory input, World world) { + return ItemStack.of(getOutput(input, world)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java index f8163934b..d8348bab6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/RecipeType.java @@ -6,13 +6,13 @@ public class RecipeType { private final net.minecraft.recipe.RecipeType recipeType; - public static RecipeType CRAFTING = new RecipeType(net.minecraft.recipe.RecipeType.CRAFTING); - public static RecipeType SMELTING = new RecipeType(net.minecraft.recipe.RecipeType.SMELTING); - public static RecipeType BLASTING = new RecipeType(net.minecraft.recipe.RecipeType.BLASTING); - public static RecipeType SMOKING = new RecipeType(net.minecraft.recipe.RecipeType.SMOKING); - public static RecipeType CAMPFIRE_COOKING = new RecipeType(net.minecraft.recipe.RecipeType.CAMPFIRE_COOKING); - public static RecipeType STONECUTTING = new RecipeType(net.minecraft.recipe.RecipeType.STONECUTTING); - public static RecipeType SMITHING = new RecipeType(net.minecraft.recipe.RecipeType.SMITHING); + public static final RecipeType CRAFTING = new RecipeType(net.minecraft.recipe.RecipeType.CRAFTING); + public static final RecipeType SMELTING = new RecipeType(net.minecraft.recipe.RecipeType.SMELTING); + public static final RecipeType BLASTING = new RecipeType(net.minecraft.recipe.RecipeType.BLASTING); + public static final RecipeType SMOKING = new RecipeType(net.minecraft.recipe.RecipeType.SMOKING); + public static final RecipeType CAMPFIRE_COOKING = new RecipeType(net.minecraft.recipe.RecipeType.CAMPFIRE_COOKING); + public static final RecipeType STONECUTTING = new RecipeType(net.minecraft.recipe.RecipeType.STONECUTTING); + public static final RecipeType SMITHING = new RecipeType(net.minecraft.recipe.RecipeType.SMITHING); protected RecipeType(net.minecraft.recipe.RecipeType recipeType) { this.recipeType = recipeType; diff --git a/info.properties b/info.properties index ed4391aa5..e927acdea 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.3 +mod_version=3.1.4 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 454375799949c5fa1c58df5a55663845935adcb9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 27 Jan 2025 17:37:58 +0900 Subject: [PATCH 449/622] 1201 --- .../net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java index c8f362177..b6fad360f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -61,7 +61,7 @@ public ItemStackList getRecipeRemainders(CraftingRecipeInputOrInventory input) { } public net.minecraft.item.ItemStack getOutput(CraftingRecipeInputOrInventory input, net.minecraft.world.World world) { - return getRaw().getOutput(); + return getRaw().getOutput(world.getRegistryManager()); } public net.minecraft.item.ItemStack getOutput(CraftingRecipeInputOrInventory input, World world) { From 16a5267937f056d4226e233723415e7d46d6dddd Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 27 Jan 2025 23:46:07 +0900 Subject: [PATCH 450/622] gradle --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7c19b2d52..2f1616113 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ neoforge_version=21.1.76 cloth_config_version=15.0.140 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.10.210 +compatdatapacks76_version=1.0.12.210 fabricEnabled=true forgeEnabled=false From 083a9ac6d63a14cdfb8f8597a1f77fd1233749d5 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 27 Jan 2025 21:32:26 +0900 Subject: [PATCH 451/622] 1204 --- .../api/recipe/v3/CompatRecipe.java | 10 +++++-- .../api/util/recipe/RecipeUtil.java | 30 ++++++++++++------- .../midohra/recipe/CraftingRecipe.java | 2 +- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java index 39743789c..4a26ce4e4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/recipe/v3/CompatRecipe.java @@ -6,6 +6,7 @@ import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.RecipeUtil; import net.pitan76.mcpitanlib.midohra.recipe.entry.RecipeEntry; public class CompatRecipe { @@ -17,10 +18,15 @@ public CompatRecipe(Recipe recipe, Identifier id) { this.id = id; } + @Deprecated + public CompatRecipe(net.minecraft.recipe.RecipeEntry entry) { + this(entry.value(), entry.id()); + } + @Deprecated public CompatRecipe(Recipe recipe) { this.recipe = recipe; - this.id = recipe.getId(); + this.id = RecipeUtil.getId(recipe); } public boolean isNull() { @@ -53,7 +59,7 @@ public CompatRecipeEntry getRecipeEntry() { @Deprecated public CompatibleRecipeEntry getCompatibleRecipeEntry() { - return new CompatibleRecipeEntry(getRecipe()); + return new CompatibleRecipeEntry(new net.minecraft.recipe.RecipeEntry>(getId(), getRecipe())); } // MidohraAPI diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java index f92ad4596..c8db30315 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/recipe/RecipeUtil.java @@ -15,14 +15,24 @@ public class RecipeUtil { public static Collection> getMCRecipes(World world) { + Collection> recipes = new ArrayList<>(); + + for (net.minecraft.recipe.RecipeEntry entry : getMCRecipeEntries(world)) { + recipes.add(entry.value()); + } + + return recipes; + } + + public static Collection> getMCRecipeEntries(World world) { return world.getRecipeManager().values(); } public static Collection getRecipes(World world) { List recipes = new ArrayList<>(); - for (Recipe recipe : getMCRecipes(world)) { - recipes.add(new CompatRecipe(recipe, recipe.getId())); + for (net.minecraft.recipe.RecipeEntry entry : getMCRecipeEntries(world)) { + recipes.add(new CompatRecipe(entry)); } return recipes; @@ -31,9 +41,9 @@ public static Collection getRecipes(World world) { public static Collection getRecipesByType(World world, RecipeType type) { List recipes = new ArrayList<>(); - for (Recipe recipe : getMCRecipes(world)) { - if (recipe.getType() == type) { - recipes.add(new CompatRecipe(recipe, recipe.getId())); + for (net.minecraft.recipe.RecipeEntry entry : getMCRecipeEntries(world)) { + if (entry.value().getType() == type) { + recipes.add(new CompatRecipe(entry)); } } @@ -52,8 +62,8 @@ public static Collection getRecipesByType(net.pitan76.mcpitanlib.m public static Collection getRecipeEntries(net.pitan76.mcpitanlib.midohra.world.World world) { List entries = new ArrayList<>(); - for (Recipe recipe : getMCRecipes(world.getRaw())) { - entries.add(RecipeEntry.of(recipe, CompatIdentifier.fromMinecraft(recipe.getId()))); + for (net.minecraft.recipe.RecipeEntry entry : getMCRecipeEntries(world.getRaw())) { + entries.add(RecipeEntry.of(entry.value(), CompatIdentifier.fromMinecraft(entry.id()))); } return entries; @@ -74,9 +84,9 @@ public static Collection getCraftingRecipes(net.pitan76.mcpitanl public static Collection getCraftingRecipeEntries(net.pitan76.mcpitanlib.midohra.world.World world) { List entries = new ArrayList<>(); - for (Recipe recipe : getMCRecipes(world.getRaw())) { - if (recipe instanceof net.minecraft.recipe.CraftingRecipe) { - entries.add(CraftingRecipeEntry.of((net.minecraft.recipe.CraftingRecipe) recipe, CompatIdentifier.fromMinecraft(recipe.getId()))); + for (net.minecraft.recipe.RecipeEntry entry : getMCRecipeEntries(world.getRaw())) { + if (entry.value() instanceof net.minecraft.recipe.CraftingRecipe) { + entries.add(CraftingRecipeEntry.of((net.minecraft.recipe.CraftingRecipe) entry.value(), CompatIdentifier.fromMinecraft(entry.id()))); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java index b6fad360f..1b452dbef 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/recipe/CraftingRecipe.java @@ -61,7 +61,7 @@ public ItemStackList getRecipeRemainders(CraftingRecipeInputOrInventory input) { } public net.minecraft.item.ItemStack getOutput(CraftingRecipeInputOrInventory input, net.minecraft.world.World world) { - return getRaw().getOutput(world.getRegistryManager()); + return getRaw().getResult(world.getRegistryManager()); } public net.minecraft.item.ItemStack getOutput(CraftingRecipeInputOrInventory input, World world) { From dbe947f251e1f21d3e56fe8526e310440442d937 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:59:02 +0900 Subject: [PATCH 452/622] fix APIs --- .../pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java | 2 +- .../main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java | 2 +- info.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java index c6e9f1050..368be8ddc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlockProvider.java @@ -47,7 +47,7 @@ default BlockState getDefaultMidohraState() { default void setDefaultState(BlockState state) { if (this instanceof Block) { - ((BlockInvoker) this).setDefaultState(state.toMinecraft()); + ((BlockInvoker) this).setDefaultState_invoke(state.toMinecraft()); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java index 919805dc5..edf1d6c7b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/BlockInvoker.java @@ -8,5 +8,5 @@ @Mixin(Block.class) public interface BlockInvoker { @Invoker("setDefaultState") - void setDefaultState(BlockState state); + void setDefaultState_invoke(BlockState state); } diff --git a/info.properties b/info.properties index e927acdea..991fd11a1 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.4 +mod_version=3.1.5 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 8f2a490e72d303506e57984f3a3be5a85af3568d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 12 Feb 2025 14:30:19 +0900 Subject: [PATCH 453/622] fix APIs --- .../pitan76/mcpitanlib/api/client/SimpleHandledScreen.java | 3 ++- .../net/pitan76/mcpitanlib/api/client/SimpleScreen.java | 3 ++- .../api/client/gui/screen/SimpleHandledScreen.java | 3 ++- .../net/pitan76/mcpitanlib/api/util/IdentifierUtil.java | 7 +++++++ info.properties | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 07ee4a084..6cf23365c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -18,6 +18,7 @@ import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; @@ -242,7 +243,7 @@ public void removed() { } public Identifier getBackgroundTexture() { - return getCompatBackgroundTexture().toMinecraft(); + return IdentifierUtil.from(getCompatBackgroundTexture()); } public CompatIdentifier getCompatBackgroundTexture() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java index fa3ae6cf4..7a129ecdb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleScreen.java @@ -15,6 +15,7 @@ import net.pitan76.mcpitanlib.api.client.render.handledscreen.*; import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; public abstract class SimpleScreen extends Screen { @@ -182,7 +183,7 @@ public void removed() { } public Identifier getBackgroundTexture() { - return getCompatBackgroundTexture().toMinecraft(); + return IdentifierUtil.from(getCompatBackgroundTexture()); } public CompatIdentifier getCompatBackgroundTexture() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index bdeab3968..522170b43 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -19,6 +19,7 @@ import net.pitan76.mcpitanlib.api.client.render.screen.RenderBackgroundTextureArgs; import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; import net.pitan76.mcpitanlib.api.util.client.ScreenUtil; @@ -253,7 +254,7 @@ public void removed() { } public Identifier getBackgroundTexture() { - return getCompatBackgroundTexture().toMinecraft(); + return IdentifierUtil.from(getCompatBackgroundTexture()); } public CompatIdentifier getCompatBackgroundTexture() { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java index 2078a0db6..2b2841b69 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IdentifierUtil.java @@ -22,4 +22,11 @@ public static String getNamespace(Identifier identifier) { public static String getPath(Identifier identifier) { return identifier.getPath(); } + + public static Identifier from(CompatIdentifier id) { + if (id == null) + return null; + + return id.toMinecraft(); + } } diff --git a/info.properties b/info.properties index 991fd11a1..6cbc1d8fc 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.5 +mod_version=3.1.6 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 142c43e1aaed0b21732cba5262a42dc6e218416f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 22 Mar 2025 13:31:26 +0900 Subject: [PATCH 454/622] fix apis --- .../api/command/CommandRegistry.java | 15 ++++ .../api/entity/CompatThrownItemEntity.java | 2 +- .../pitan76/mcpitanlib/api/entity/Player.java | 8 ++ .../mcpitanlib/api/event/CommandEvent.java | 4 + .../api/event/entity/InitDataTrackerArgs.java | 27 +++++++ .../event/v0/AttackEntityEventRegistry.java | 1 + .../event/v1/AttackEntityEventRegistry.java | 26 ++++++ .../api/event/v1/event/AttackEntityEvent.java | 73 +++++++++++++++++ .../mcpitanlib/api/text/TextComponent.java | 18 +++++ .../mcpitanlib/api/text/TextConverter.java | 79 +++++++++++++++++++ .../mcpitanlib/api/util/BlockEntityUtil.java | 5 ++ .../mcpitanlib/api/util/ItemStackUtil.java | 9 +++ .../pitan76/mcpitanlib/api/util/TextUtil.java | 9 +++ .../mcpitanlib/api/util/WorldUtil.java | 4 + .../api/util/entity/LivingEntityUtil.java | 14 +++- info.properties | 4 +- 16 files changed, 294 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/AttackEntityEventRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/event/AttackEntityEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java index c1544b0a4..03467b2a7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/command/CommandRegistry.java @@ -76,6 +76,18 @@ private static > void forArgsC if (command instanceof IntegerCommand) { event = new IntegerCommandEvent(); } + if (command instanceof DoubleCommand) { + event = new DoubleCommandEvent(); + } + if (command instanceof FloatCommand) { + event = new FloatCommandEvent(); + } + if (command instanceof LongCommand) { + event = new LongCommandEvent(); + } + if (command instanceof BooleanCommand) { + event = new BooleanCommandEvent(); + } if (command instanceof StringCommand) { event = new StringCommandEvent(); } @@ -94,6 +106,9 @@ private static > void forArgsC if (command instanceof ItemCommand) { event = new ItemCommandEvent(); } + if (command instanceof BlockCommand) { + event = new BlockCommandEvent(); + } event.setContext(context); event.setCommand(command); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java index a7f71a891..ccfe74e97 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatThrownItemEntity.java @@ -94,7 +94,7 @@ protected void onCollision(HitResult hitResult) { @Deprecated @Override public void initDataTracker(DataTracker.Builder builder) { - initDataTracker(new InitDataTrackerArgs(builder)); + initDataTracker(new InitDataTrackerArgs(builder, dataTracker)); } public void initDataTracker(InitDataTrackerArgs args) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index a19af712a..2707c0fa1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -492,4 +492,12 @@ public net.pitan76.mcpitanlib.midohra.item.ItemStack getMidohraStackInHand(Hand public Hand getActiveHand() { return getEntity().getActiveHand(); } + + public float getBlockBreakingSpeed(BlockState state) { + return getEntity().getBlockBreakingSpeed(state); + } + + public boolean canHarvest(BlockState state) { + return getEntity().canHarvest(state); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java index ce84a734d..bb9c678ac 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java @@ -31,4 +31,8 @@ public void setCommand(AbstractCommand command) { public AbstractCommand getCommand() { return command; } + + public V getArgument(String name, Class clazz) { + return context.getArgument(name, clazz); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java index 5adabbd80..875b6a939 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/InitDataTrackerArgs.java @@ -2,14 +2,25 @@ import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; +import org.jetbrains.annotations.Nullable; public class InitDataTrackerArgs { public DataTracker.Builder builder; + public DataTracker tracker; public InitDataTrackerArgs(DataTracker.Builder builder) { this.builder = builder; } + public InitDataTrackerArgs(DataTracker tracker) { + this.tracker = tracker; + } + + public InitDataTrackerArgs(DataTracker.Builder builder, @Nullable DataTracker tracker) { + this.builder = builder; + this.tracker = tracker; + } + public DataTracker.Builder getBuilder() { return builder; } @@ -17,4 +28,20 @@ public DataTracker.Builder getBuilder() { public DataTracker.Builder add(TrackedData data, T value) { return builder.add(data, value); } + + public void set(TrackedData data, T value) { + tracker.set(data, value); + } + + public void addTracking(TrackedData data, T value) { + if (builder != null) { + add(data, value); + return; + } + + if (tracker != null) { + set(data, value); + return; + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java index 9611269b6..466ac1f70 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/AttackEntityEventRegistry.java @@ -10,6 +10,7 @@ import net.pitan76.mcpitanlib.api.entity.Player; import org.jetbrains.annotations.Nullable; +@Deprecated public class AttackEntityEventRegistry { public static void register(AttackEntity attackEntity) { PlayerEvent.ATTACK_ENTITY.register(attackEntity::attack); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/AttackEntityEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/AttackEntityEventRegistry.java new file mode 100644 index 000000000..894a89cd8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/AttackEntityEventRegistry.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.event.v1; + +import dev.architectury.event.EventResult; +import dev.architectury.event.events.common.PlayerEvent; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.v1.event.AttackEntityEvent; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import org.jetbrains.annotations.Nullable; + +public class AttackEntityEventRegistry { + public static void register(AttackEntity attackEntity) { + PlayerEvent.ATTACK_ENTITY.register(attackEntity::attack); + } + + public interface AttackEntity { + default EventResult attack(PlayerEntity player, World level, Entity target, Hand hand, @Nullable EntityHitResult result) { + return attack(new AttackEntityEvent(player, level, target, hand, result)).toEventResult().getResult(); + } + + CompatActionResult attack(AttackEntityEvent event); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/event/AttackEntityEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/event/AttackEntityEvent.java new file mode 100644 index 000000000..4748c9ca4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v1/event/AttackEntityEvent.java @@ -0,0 +1,73 @@ +package net.pitan76.mcpitanlib.api.event.v1.event; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import org.jetbrains.annotations.Nullable; + +public class AttackEntityEvent { + + public Player player; + public World world; + public Entity target; + public Hand hand; + public EntityHitResult result; + + public AttackEntityEvent(PlayerEntity player, World level, Entity target, Hand hand, @Nullable EntityHitResult result) { + this(new Player(player), level, target, hand, result); + } + + public AttackEntityEvent(Player player, World level, Entity target, Hand hand, @Nullable EntityHitResult result) { + this.player = player; + this.world = level; + this.target = target; + this.hand = hand; + this.result = result; + } + + public Player getPlayer() { + return player; + } + + public World getWorld() { + return world; + } + + public Entity getTarget() { + return target; + } + + public EntityHitResult getResult() { + return result; + } + + public Hand getHand() { + return hand; + } + + public ItemStack getStackInPlayer() { + return player.getStackInHand(hand); + } + + public Item getItemInPlayer() { + return getStackInPlayer().getItem(); + } + + public net.pitan76.mcpitanlib.midohra.world.World getWorldAsMidohra() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public net.pitan76.mcpitanlib.midohra.item.ItemStack getStackInPlayerAsMidohra() { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStackInPlayer()); + } + + public ItemWrapper getItemWrapperInPlayer() { + return ItemWrapper.of(getItemInPlayer()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java index c0c91314b..758c55653 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java @@ -89,4 +89,22 @@ public TextComponent setStyle(Style style) { return this; } + + /** + * Convert string to TextComponent with formatting + * @param text String + * @return TextComponent + */ + public static TextComponent convert(String text) { + return new TextComponent(TextUtil.convert(text)); + } + + /** + * Convert string to TextComponent with translatable + * @param text String + * @return TextComponent + */ + public static TextComponent convertWithTranslatable(String text) { + return new TextComponent(TextUtil.convertWithTranslatable(text)); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java new file mode 100644 index 000000000..058b4f57c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java @@ -0,0 +1,79 @@ +package net.pitan76.mcpitanlib.api.text; + +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class TextConverter { + + public static MutableText convert(String string) { + return convert(string, false); + } + + /** + * Convert string to MutableText with formatting + * + * @param text String + * @param translatable boolean + * @return MutableText + */ + public static MutableText convert(String text, boolean translatable) { + String[] splits = split(text); + MutableText result = Text.literal(""); + Formatting[] currentFormatting = {}; + + for (String part : splits) { + // Section + if (part.startsWith("§")) { + char code = part.charAt(1); + // Reset + if (code == 'r') { + currentFormatting = new Formatting[]{}; + continue; + } + + // Bold, Italic, Underline, Strikethrough, Obfuscated + if (code >= 'k' && code <= 'o') { + ArrayList list = new ArrayList<>(Arrays.asList(currentFormatting)); + list.add(Formatting.byCode(code)); + currentFormatting = list.toArray(new Formatting[0]); + continue; + } + + // Color + currentFormatting = new Formatting[]{Formatting.byCode(code)}; + continue; + } + + // Translatable + if (translatable) { + Pattern pattern = Pattern.compile("\\{(.+?)\\}"); + Matcher matcher = pattern.matcher(part); + if (matcher.find()) { + String key = matcher.group(1); + result.append(Text.translatable(key).formatted(currentFormatting)); + continue; + } + } + + result.append(Text.literal(part).formatted(currentFormatting)); + } + + return result; + } + + public static String[] split(String text) { + Matcher matcher = Pattern.compile("((?i)§[0-9a-fk-or])|([^§]+)").matcher(text); + StringBuilder sb = new StringBuilder(); + + while (matcher.find()) + sb.append(matcher.group()).append("\0"); // 区切り文字としてヌル文字を使う + + return sb.toString().split("\0"); // ヌル文字で分割 + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index 37d3a4a64..a16600bf6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -80,4 +81,8 @@ public static void read(BlockEntity blockEntity, NbtCompound nbt, CompatRegistry public static NbtCompound createNbt(BlockEntity blockEntity, CompatRegistryLookup registryLookup) { return blockEntity.createNbt(registryLookup.getRegistryLookup()); } + + public static void setStackNbt(BlockEntity blockEntity, ItemStack stack, CompatRegistryLookup registryLookup) { + blockEntity.setStackNbt(stack, registryLookup.getRegistryLookup()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index adbd8567a..d65efb01d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -8,10 +8,12 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; import java.util.Objects; +import java.util.Optional; public class ItemStackUtil { public static ItemStack copy(ItemStack stack) { @@ -117,6 +119,13 @@ public static void damage(ItemStack stack, int amount, ServerPlayerEntity entity stack.damage(amount, entity.getServerWorld(), entity, (item) -> entity.sendEquipmentBreakStatus(item, EquipmentSlot.MAINHAND)); } + public static void damage(ItemStack stack, int amount, Player entity) { + Optional player = entity.getServerPlayer(); + if (player.isEmpty()) return; + + damage(stack, amount, player.get()); + } + public static ItemStack empty() { return ItemStack.EMPTY; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java index 1e18cfa78..ee960c580 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java @@ -3,6 +3,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Style; import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.text.TextConverter; public class TextUtil { public static MutableText literal(String string) { @@ -56,4 +57,12 @@ public static MutableText append(MutableText text, String string) { public static MutableText of(String string) { return literal(string); } + + public static MutableText convert(String text) { + return TextConverter.convert(text, false); + } + + public static MutableText convertWithTranslatable(String text) { + return TextConverter.convert(text, true); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 2a0838f88..2e1f94498 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -352,4 +352,8 @@ public static boolean removeBlock(World world, net.pitan76.mcpitanlib.midohra.ut public static void playSound(net.pitan76.mcpitanlib.midohra.world.World world, @Nullable Player player, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch) { playSound(world.getRaw(), player, pos.toMinecraft(), sound, category, volume, pitch); } + + public static void dropStackOnBlock(World world, BlockPos pos, ItemStack stack) { + Block.dropStack(world, pos, stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java index 55cf2a9b1..7af9ca3a7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java @@ -23,7 +23,7 @@ public static void removeStatusEffect(LivingEntity entity, CompatStatusEffect ef entity.removeStatusEffect(effect.getEntry(world)); } - public List getStatusEffects(LivingEntity entity) { + public static List getStatusEffects(LivingEntity entity) { List compatEffects = new ArrayList<>(); for (StatusEffectInstance effect : entity.getStatusEffects()) { @@ -32,4 +32,16 @@ public List getStatusEffects(LivingEntity entity) { return compatEffects; } + + public static float getHealth(LivingEntity entity) { + return entity.getHealth(); + } + + public static void setHealth(LivingEntity entity, float health) { + entity.setHealth(health); + } + + public static float getMaxHealth(LivingEntity entity) { + return entity.getMaxHealth(); + } } diff --git a/info.properties b/info.properties index 6cbc1d8fc..48f064a8b 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.6 +mod_version=3.1.7 maven_group=net.pitan76 -changelog=add APIs \ No newline at end of file +changelog=fix APIs \ No newline at end of file From 5266600785b263ff11afde8cff838525d92b66ec Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 26 Mar 2025 22:27:05 +0900 Subject: [PATCH 455/622] add APIs --- .../args/v2/GetComparatorOutputArgs.java | 53 ++++++++++++++++++ .../args/v2/HasComparatorOutputArgs.java | 16 ++++++ .../mcpitanlib/api/block/v2/CompatBlock.java | 26 +++++++-- .../mcpitanlib/api/event/CommandEvent.java | 6 +- .../api/event/ServerCommandEvent.java | 56 +++++++++++++++---- .../mcpitanlib/api/text/TextConverter.java | 43 ++++++++++---- .../api/util/screen/ScreenHandlerUtil.java | 28 ++++++++++ info.properties | 2 +- 8 files changed, 200 insertions(+), 30 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/GetComparatorOutputArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/HasComparatorOutputArgs.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/screen/ScreenHandlerUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/GetComparatorOutputArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/GetComparatorOutputArgs.java new file mode 100644 index 000000000..2fc46d19f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/GetComparatorOutputArgs.java @@ -0,0 +1,53 @@ +package net.pitan76.mcpitanlib.api.block.args.v2; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.api.util.screen.ScreenHandlerUtil; + +public class GetComparatorOutputArgs extends BaseEvent { + public BlockState state; + public World world; + public BlockPos pos; + + public GetComparatorOutputArgs(BlockState state, World world, BlockPos pos) { + this.state = state; + this.world = world; + this.pos = pos; + } + + public BlockState getState() { + return state; + } + + public World getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public BlockEntity getBlockEntity() { + return WorldUtil.getBlockEntity(world, pos); + } + + public int calcComparatorOutputFromBlockEntity() { + return ScreenHandlerUtil.calcComparatorOutput(getBlockEntity()); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(pos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/HasComparatorOutputArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/HasComparatorOutputArgs.java new file mode 100644 index 000000000..2fe77f18a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/HasComparatorOutputArgs.java @@ -0,0 +1,16 @@ +package net.pitan76.mcpitanlib.api.block.args.v2; + +import net.minecraft.block.BlockState; +import net.pitan76.mcpitanlib.api.event.BaseEvent; + +public class HasComparatorOutputArgs extends BaseEvent { + public BlockState state; + + public HasComparatorOutputArgs(BlockState state) { + this.state = state; + } + + public BlockState getState() { + return state; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index b76e9ed52..aa9d10fef 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -9,16 +9,14 @@ import net.minecraft.util.math.Direction; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; +import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; import net.pitan76.mcpitanlib.api.block.args.RotateArgs; import net.pitan76.mcpitanlib.api.block.args.SideInvisibleArgs; -import net.pitan76.mcpitanlib.api.block.args.v2.CollisionShapeEvent; -import net.pitan76.mcpitanlib.api.block.args.v2.OutlineShapeEvent; -import net.pitan76.mcpitanlib.api.block.args.v2.PlacementStateArgs; -import net.pitan76.mcpitanlib.api.block.args.v2.StateForNeighborUpdateArgs; +import net.pitan76.mcpitanlib.api.block.args.v2.*; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import org.jetbrains.annotations.Nullable; @@ -145,4 +143,24 @@ public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos public VoxelShape getCollisionShape(net.pitan76.mcpitanlib.api.event.block.CollisionShapeEvent e) { return super.getCollisionShape(e); } + + @Deprecated + @Override + public boolean hasComparatorOutput(BlockState state) { + return hasComparatorOutput(new HasComparatorOutputArgs(state)); + } + + public boolean hasComparatorOutput(HasComparatorOutputArgs args) { + return super.hasComparatorOutput(args.state); + } + + @Deprecated + @Override + public int getComparatorOutput(BlockState state, World world, BlockPos pos) { + return getComparatorOutput(new GetComparatorOutputArgs(state, world, pos)); + } + + public int getComparatorOutput(GetComparatorOutputArgs args) { + return super.getComparatorOutput(args.state, args.world, args.pos); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java index bb9c678ac..7b000c562 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/CommandEvent.java @@ -17,11 +17,11 @@ public void setContext(CommandContext context) { } public String getInput() { - return context.getInput(); + return getContext().getInput(); } public StringRange getRange() { - return context.getRange(); + return getContext().getRange(); } public void setCommand(AbstractCommand command) { @@ -33,6 +33,6 @@ public AbstractCommand getCommand() { } public V getArgument(String name, Class clazz) { - return context.getArgument(name, clazz); + return getContext().getArgument(name, clazz); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java index 2d9e4512a..66ea40f4b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java @@ -23,8 +23,12 @@ public void setContext(CommandContext context) { this.context = context; } + public ServerCommandSource getSource() { + return getContext().getSource(); + } + public PlayerEntity getPlayerEntity() throws CommandSyntaxException { - return context.getSource().getPlayer(); + return getSource().getPlayer(); } public Player getPlayer() throws CommandSyntaxException { @@ -32,54 +36,82 @@ public Player getPlayer() throws CommandSyntaxException { } public World getWorld() { - return context.getSource().getWorld(); + return getSource().getWorld(); } public Entity getEntity() { - return context.getSource().getEntity(); + return getSource().getEntity(); } public String getInput() { - return context.getInput(); + return getContext().getInput(); } public Command getContextCommand() { - return context.getCommand(); + return getContext().getCommand(); } public CommandContext getChild() { - return context.getChild(); + return getContext().getChild(); } public CommandContext getLastChild() { - return context.getLastChild(); + return getContext().getLastChild(); } public StringRange getRange() { - return context.getRange(); + return getContext().getRange(); } + // Text public void sendSuccess(Text message, boolean broadcastToOps) { - context.getSource().sendFeedback(() -> message, broadcastToOps); + getSource().sendFeedback(() -> message, broadcastToOps); } public void sendFailure(Text message) { - context.getSource().sendError(message); + getSource().sendError(message); } public void sendSuccess(Text message) { sendSuccess(message, false); } + // String (Formatted) public void sendSuccess(String message, boolean broadcastToOps) { - sendSuccess(TextUtil.literal(message), broadcastToOps); + sendSuccess(TextUtil.convert(message), broadcastToOps); } public void sendSuccess(String message) { - sendSuccess(TextUtil.literal(message)); + sendSuccess(message, false); } public void sendFailure(String message) { + sendFailure(TextUtil.convert(message)); + } + + // Translatable + public void sendSuccessWithTranslatable(String message, boolean broadcastToOps) { + sendSuccess(TextUtil.convertWithTranslatable(message), broadcastToOps); + } + + public void sendSuccessWithTranslatable(String message) { + sendSuccessWithTranslatable(message, false); + } + + public void sendFailureWithTranslatable(String message) { + sendFailure(TextUtil.convertWithTranslatable(message)); + } + + // Raw + public void sendSuccessRaw(String message, boolean broadcastToOps) { + sendSuccess(TextUtil.literal(message), broadcastToOps); + } + + public void sendSuccessRaw(String message) { + sendSuccessRaw(message, false); + } + + public void sendFailureRaw(String message) { sendFailure(TextUtil.literal(message)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java index 058b4f57c..85836c4f8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextConverter.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -29,7 +30,7 @@ public static MutableText convert(String text, boolean translatable) { for (String part : splits) { // Section - if (part.startsWith("§")) { + if (part.startsWith("§") && part.length() == 2) { char code = part.charAt(1); // Reset if (code == 'r') { @@ -37,16 +38,20 @@ public static MutableText convert(String text, boolean translatable) { continue; } + Formatting format = Formatting.byCode(code); + if (format == null) + continue; + // Bold, Italic, Underline, Strikethrough, Obfuscated if (code >= 'k' && code <= 'o') { ArrayList list = new ArrayList<>(Arrays.asList(currentFormatting)); - list.add(Formatting.byCode(code)); + list.add(format); currentFormatting = list.toArray(new Formatting[0]); continue; } // Color - currentFormatting = new Formatting[]{Formatting.byCode(code)}; + currentFormatting = new Formatting[]{format}; continue; } @@ -54,11 +59,29 @@ public static MutableText convert(String text, boolean translatable) { if (translatable) { Pattern pattern = Pattern.compile("\\{(.+?)\\}"); Matcher matcher = pattern.matcher(part); - if (matcher.find()) { + MutableText tempText = Text.literal(""); + int lastIndex = 0; + + while (matcher.find()) { + // {translatable key} より前の文字列を追加 + if (matcher.start() > lastIndex) { + tempText.append(Text.literal(part.substring(lastIndex, matcher.start())).formatted(currentFormatting)); + } + + // {translatable key} を追加 String key = matcher.group(1); - result.append(Text.translatable(key).formatted(currentFormatting)); - continue; + tempText.append(Text.translatable(key).formatted(currentFormatting)); + + lastIndex = matcher.end(); + } + + // 最後の文字列を追加 + if (lastIndex < part.length()) { + tempText.append(Text.literal(part.substring(lastIndex)).formatted(currentFormatting)); } + + result.append(tempText); + continue; } result.append(Text.literal(part).formatted(currentFormatting)); @@ -68,12 +91,12 @@ public static MutableText convert(String text, boolean translatable) { } public static String[] split(String text) { - Matcher matcher = Pattern.compile("((?i)§[0-9a-fk-or])|([^§]+)").matcher(text); - StringBuilder sb = new StringBuilder(); + Matcher matcher = Pattern.compile("(?i)§[0-9a-fk-or]|[^§]+").matcher(text); + List parts = new ArrayList<>(); while (matcher.find()) - sb.append(matcher.group()).append("\0"); // 区切り文字としてヌル文字を使う + parts.add(matcher.group()); - return sb.toString().split("\0"); // ヌル文字で分割 + return parts.toArray(new String[0]); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/screen/ScreenHandlerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/screen/ScreenHandlerUtil.java new file mode 100644 index 000000000..fbc99fb76 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/screen/ScreenHandlerUtil.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.api.util.screen; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.ScreenHandler; +import net.minecraft.screen.slot.Slot; +import org.jetbrains.annotations.Nullable; + +import java.util.Set; + +public class ScreenHandlerUtil { + public static int calcComparatorOutput(@Nullable Inventory inventory) { + return ScreenHandler.calculateComparatorOutput(inventory); + } + + public static int calcComparatorOutput(@Nullable BlockEntity blockEntity) { + return ScreenHandler.calculateComparatorOutput(blockEntity); + } + + public static int calculateStackSize(Set slots, int mode, ItemStack stack) { + return ScreenHandler.calculateStackSize(slots, mode, stack); + } + + public static boolean canInsertItemIntoSlot(@Nullable Slot slot, ItemStack stack, boolean allowOverflow) { + return ScreenHandler.canInsertItemIntoSlot(slot, stack, allowOverflow); + } +} diff --git a/info.properties b/info.properties index 48f064a8b..2b34f8927 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.7 +mod_version=3.1.8 maven_group=net.pitan76 changelog=fix APIs \ No newline at end of file From 6edc3b226401b95a44cab5350d88e6c54278b191 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 31 Mar 2025 23:37:50 +0900 Subject: [PATCH 456/622] fix api --- .../mcpitanlib/api/entity/CompatEntity.java | 24 ++++++++++++ .../api/event/block/PickStackEvent.java | 15 +++++++ .../api/tile/CompatBlockEntity.java | 39 +++++++++++++++++++ .../mcpitanlib/api/util/BlockEntityUtil.java | 5 +++ .../util/inventory/PlayerInventoryUtil.java | 18 +++++++++ .../api/world/CompatiblePersistentState.java | 20 ++++++++++ info.properties | 2 +- 7 files changed, 122 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java index 796da806b..f1b0126b5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java @@ -6,6 +6,9 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.network.listener.ClientPlayPacketListener; import net.minecraft.network.packet.Packet; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; @@ -71,8 +74,29 @@ public void readNbt(NbtCompound nbt) { readNbt(new ReadNbtArgs(nbt)); } + @Deprecated @Override public World getWorld() { + return callGetWorld(); + } + + public World callGetWorld() { return super.getWorld(); } + + public BlockPos callGetBlockPos() { + return getBlockPos(); + } + + public Vec3d callGetPos() { + return getPos(); + } + + public boolean hasServerWorld() { + return callGetWorld() instanceof ServerWorld; + } + + public ServerWorld getServerWorld() { + return (ServerWorld) getWorld(); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java index 1eb8b355c..762907be8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/PickStackEvent.java @@ -18,11 +18,18 @@ public class PickStackEvent { public BlockPos pos; public BlockState state; + public boolean includeData = true; public PickStackEvent(WorldView world, BlockPos pos, BlockState state) { + this.worldView = world; + this.pos = pos; + this.state = state; } public PickStackEvent(BlockView world, BlockPos pos, BlockState state) { + this.blockView = world; + this.pos = pos; + this.state = state; } public BlockState getState() { @@ -75,4 +82,12 @@ public boolean isClient() { return false; } } + + public void setIncludeData(boolean includeData) { + this.includeData = includeData; + } + + public boolean isIncludeData() { + return includeData; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index 8aa2c26ff..2b75f82b8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -8,12 +8,15 @@ import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.packet.UpdatePacketType; import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.BlockEntityUtil; import net.pitan76.mcpitanlib.api.util.WorldUtil; import org.jetbrains.annotations.Nullable; @@ -111,4 +114,40 @@ public boolean isClient() { return WorldUtil.isClient(getWorld()); } + @Deprecated + @Override + public @Nullable World getWorld() { + return callGetWorld(); + } + + @Deprecated + @Override + public BlockPos getPos() { + return callGetPos(); + } + + public World callGetWorld() { + return super.getWorld(); + } + + public BlockPos callGetPos() { + return super.getPos(); + } + + public BlockState callGetBlockState() { + return BlockEntityUtil.getBlockState(this); + } + + public BlockState callGetCachedState() { + return BlockEntityUtil.getCachedState(this); + } + + public boolean hasServerWorld() { + return callGetWorld() instanceof ServerWorld; + } + + public ServerWorld getServerWorld() { + return BlockEntityUtil.getServerWorld(this); + } + } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index a16600bf6..c96de933c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -6,6 +6,7 @@ import net.minecraft.block.entity.BlockEntityType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; +import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; @@ -85,4 +86,8 @@ public static NbtCompound createNbt(BlockEntity blockEntity, CompatRegistryLooku public static void setStackNbt(BlockEntity blockEntity, ItemStack stack, CompatRegistryLookup registryLookup) { blockEntity.setStackNbt(stack, registryLookup.getRegistryLookup()); } + + public static ServerWorld getServerWorld(BlockEntity blockEntity) { + return (ServerWorld) getWorld(blockEntity); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java index d446a9d55..e4d3c32fa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/PlayerInventoryUtil.java @@ -1,6 +1,8 @@ package net.pitan76.mcpitanlib.api.util.inventory; import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; import net.pitan76.mcpitanlib.api.entity.Player; public class PlayerInventoryUtil { @@ -19,4 +21,20 @@ public static void setSelectedSlot(PlayerInventory playerInventory, int slot) { public static void dropAllItems(PlayerInventory inv) { inv.dropAll(); } + + public static DefaultedList getMain(PlayerInventory inv) { + return inv.main; + } + + public static DefaultedList getArmor(PlayerInventory inv) { + return inv.armor; + } + + public static DefaultedList getOffHand(PlayerInventory inv) { + return inv.offHand; + } + + public static ItemStack getMainHandStack(PlayerInventory inv) { + return inv.getMainHandStack(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java index eb3f639f6..e473dd8d1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/world/CompatiblePersistentState.java @@ -31,4 +31,24 @@ public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup regis } public abstract NbtCompound writeNbt(WriteNbtArgs args); + + @Deprecated + @Override + public void markDirty() { + callMarkDirty(); + } + + public void callMarkDirty() { + super.markDirty(); + } + + @Deprecated + @Override + public void setDirty(boolean dirty) { + callSetDirty(dirty); + } + + public void callSetDirty(boolean dirty) { + super.setDirty(dirty); + } } diff --git a/info.properties b/info.properties index 2b34f8927..b295f21d9 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.8 +mod_version=3.1.9 maven_group=net.pitan76 changelog=fix APIs \ No newline at end of file From 708861af004549c8c9a394895cb6aefd16d820f4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 31 Mar 2025 23:38:36 +0900 Subject: [PATCH 457/622] compatdatapacks76 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2f1616113..b69c6a94c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ neoforge_version=21.1.76 cloth_config_version=15.0.140 # https://maven.pitan76.net/net/pitan76/compatdatapacks76/ -compatdatapacks76_version=1.0.12.210 +compatdatapacks76_version=1.0.13.210 fabricEnabled=true forgeEnabled=false From d634b24ce524fbc84b30bd423d2a085d60de6c4c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 3 Apr 2025 10:50:06 +0900 Subject: [PATCH 458/622] add APIs (port to 1215) --- .../api/event/item/CanMineArgs.java | 30 +++++++++++++++++++ .../mcpitanlib/api/util/WorldUtil.java | 30 +++++++++++++++++-- .../api/util/world/ServerWorldUtil.java | 17 +++++++++++ .../midohra/world/chunk/ChunkTicketType.java | 21 +++++++++++++ info.properties | 2 +- 5 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java index 5ab21de8b..8456d4488 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/CanMineArgs.java @@ -1,7 +1,9 @@ package net.pitan76.mcpitanlib.api.event.item; import net.minecraft.block.BlockState; +import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; @@ -11,13 +13,33 @@ public class CanMineArgs { public BlockState state; public World world; public BlockPos pos; + + @Deprecated public Player miner; + @Deprecated + public ItemStack stack; + + public LivingEntity entity; + public CanMineArgs(BlockState state, World world, BlockPos pos, PlayerEntity miner) { this.state = state; this.world = world; this.pos = pos; this.miner = new Player(miner); + this.entity = miner; + } + + public CanMineArgs(ItemStack stack, BlockState state, World world, BlockPos pos, LivingEntity entity) { + this.stack = stack; + this.state = state; + this.world = world; + this.pos = pos; + this.entity = entity; + + if (entity instanceof PlayerEntity) { + this.miner = new Player((PlayerEntity) entity); + } } public BlockState getState() { @@ -43,4 +65,12 @@ public boolean isExistMiner() { public boolean isClient() { return WorldUtil.isClient(world); } + + public ItemStack getStack() { + return stack != null ? stack : entity.getMainHandStack(); + } + + public LivingEntity getEntity() { + return entity; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 2e1f94498..df9876b95 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -17,7 +17,6 @@ import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.server.MinecraftServer; -import net.minecraft.server.world.ChunkTicketType; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; @@ -31,6 +30,7 @@ import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; +import net.pitan76.mcpitanlib.midohra.world.chunk.ChunkTicketType; import org.jetbrains.annotations.Nullable; import java.util.*; @@ -103,6 +103,10 @@ public static void playSound(World world, @Nullable Player player, BlockPos pos, playSound(world, player, pos, sound.get(), category.get(), volume, pitch); } + public static void playSound(World world, BlockPos pos, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch) { + playSound(world, null, pos, sound.get(), category.get(), volume, pitch); + } + public static void playSound(World world, double x, double y, double z, CompatSoundEvent sound, CompatSoundCategory category, float volume, float pitch, boolean useDistance) { world.playSound(x, y, z, sound.get(), category.get(), volume, pitch, useDistance); } @@ -163,14 +167,34 @@ public static boolean equals(World world, World world2) { return Objects.equals(getWorldId(world), getWorldId(world2)); } - public static void addTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius, T argument) { + @Deprecated + public static void addTicket(ServerWorld world, net.minecraft.server.world.ChunkTicketType type, ChunkPos pos, int radius, T argument) { world.getChunkManager().addTicket(type, pos, radius, argument); } - public static void removeTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius, T argument) { + @Deprecated + public static void removeTicket(ServerWorld world, net.minecraft.server.world.ChunkTicketType type, ChunkPos pos, int radius, T argument) { world.getChunkManager().removeTicket(type, pos, radius, argument); } + public static void addTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius, T argument) { + addTicket(world, type.getRaw(), pos, radius, argument); + } + + public static void removeTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius, T argument) { + removeTicket(world, type.getRaw(), pos, radius, argument); + } + + public static void addTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius) { + net.minecraft.server.world.ChunkTicketType rawType = type.getRaw(); + world.getChunkManager().addTicket( rawType, pos, radius, pos); + } + + public static void removeTicket(ServerWorld world, ChunkTicketType type, ChunkPos pos, int radius) { + net.minecraft.server.world.ChunkTicketType rawType = type.getRaw(); + world.getChunkManager().removeTicket(rawType, pos, radius, pos); + } + public static boolean isReceivingRedstonePower(World world, BlockPos pos) { return world.isReceivingRedstonePower(pos); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java new file mode 100644 index 000000000..dfc864e53 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.util.world; + +import net.minecraft.particle.ParticleEffect; +import net.minecraft.server.world.ServerWorld; +import net.pitan76.mcpitanlib.api.entity.Player; + +public class ServerWorldUtil { + public static void spawnParticles(ServerWorld world, ParticleEffect particle, double x, double y, double z, int count, double velocityX, double velocityY, double velocityZ, double speed) { + world.spawnParticles(particle, x, y, z, count, velocityX, velocityY, velocityZ, speed); + } + + public static void spawnParticles(ServerWorld world, Player player, ParticleEffect particle, boolean force, double x, double y, double z, int count, double velocityX, double velocityY, double velocityZ, double speed) { + if (player.isServer()) { + world.spawnParticles(player.getServerPlayer().get(), particle, force, false, x, y, z, count, velocityX, velocityY, velocityZ, speed); + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java index b27752769..03c543559 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java @@ -55,4 +55,25 @@ public long getExpiryTicks() { public String toString() { return getRaw().toString(); } + + public ChunkTicketType(String name, long expiryTicks) { + this(_of(name, expiryTicks)); + } + + public ChunkTicketType(String name) { + this(name, 0); + } + + public static ChunkTicketType create(String name, long expiryTicks) { + return new ChunkTicketType<>(name, expiryTicks); + } + + public static ChunkTicketType create(String name) { + return new ChunkTicketType<>(name); + } + + private static net.minecraft.server.world.ChunkTicketType _of(String name, long expiryTicks) { + net.minecraft.server.world.ChunkTicketType type = net.minecraft.server.world.ChunkTicketType.create(name, Comparator.comparingLong(ChunkPos::toLong), (int) expiryTicks); + return (net.minecraft.server.world.ChunkTicketType) type; + } } diff --git a/info.properties b/info.properties index b295f21d9..2b6bc8062 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.1.9 +mod_version=3.2.0 maven_group=net.pitan76 changelog=fix APIs \ No newline at end of file From 22e5edee8b057d8087bf3895e56f1187a272097a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 3 Apr 2025 11:34:01 +0900 Subject: [PATCH 459/622] 1213 --- .../net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java index dfc864e53..f2b87d329 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java @@ -11,7 +11,7 @@ public static void spawnParticles(ServerWorld world, ParticleEffect particle, do public static void spawnParticles(ServerWorld world, Player player, ParticleEffect particle, boolean force, double x, double y, double z, int count, double velocityX, double velocityY, double velocityZ, double speed) { if (player.isServer()) { - world.spawnParticles(player.getServerPlayer().get(), particle, force, false, x, y, z, count, velocityX, velocityY, velocityZ, speed); + world.spawnParticles(player.getServerPlayer().get(), particle, force, x, y, z, count, velocityX, velocityY, velocityZ, speed); } } } From 863265ec6cd817fe51ee5daaa9299c306c8880b8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Apr 2025 18:23:29 +0900 Subject: [PATCH 460/622] add APIs --- .../api/event/item/InventoryTickEvent.java | 81 ++++++++++++ .../api/event/item/PostMineEvent.java | 43 ++++++ .../event/v0/event/RecipeManagerEvent.java | 15 +++ .../api/event/v2/ItemEventRegistry.java | 7 + .../event/v2/listener/InventoryTickTask.java | 8 ++ .../api/gui/SimpleScreenHandler.java | 7 +- .../api/gui/args/SlotClickEvent.java | 67 ++++++++++ .../api/gui/slot/CompatSlotActionType.java | 50 +++++++ .../mcpitanlib/api/item/stack/LoreUtil.java | 46 +++++++ .../item/tool/CompatibleMiningToolItem.java | 33 +++++ .../mcpitanlib/api/item/v2/CompatItem.java | 14 ++ .../api/item/v2/CompatItemProvider.java | 5 + .../pitan76/mcpitanlib/api/tag/TagKey.java | 9 +- .../mcpitanlib/api/util/BlockStateUtil.java | 37 ++++++ .../api/util/CompatibleRecipeEntryUtil.java | 10 ++ .../mcpitanlib/api/util/EntityUtil.java | 124 +++++++++++++++++ .../mcpitanlib/api/util/IngredientUtil.java | 21 +++ .../mcpitanlib/api/util/ItemStackUtil.java | 4 + .../pitan76/mcpitanlib/api/util/NbtUtil.java | 42 ++++++ .../mcpitanlib/api/util/ServerUtil.java | 5 + .../api/util/entity/EquipmentSlotUtil.java | 52 ++++++++ .../api/util/entity/ItemEntityUtil.java | 14 ++ .../api/util/entity/LivingEntityUtil.java | 10 ++ .../api/util/world/ServerWorldUtil.java | 17 +++ .../midohra/component/ItemComponentTypes.java | 125 ++++++++++++++++++ .../item/CustomNameComponentType.java | 31 +++++ .../component/item/ItemComponentType.java | 31 +++++ .../component/item/RarityComponentType.java | 31 +++++ .../mcpitanlib/midohra/item/ItemStack.java | 33 +++++ .../mcpitanlib/midohra/resource/Resource.java | 74 +++++++++++ .../midohra/resource/ResourceManager.java | 84 ++++++++++++ .../mcpitanlib/midohra/server/MCServer.java | 5 +- .../mcpitanlib/midohra/world/WorldAccess.java | 5 + .../pitan76/mcpitanlib/mixin/ItemMixin.java | 24 ++++ info.properties | 4 +- 35 files changed, 1160 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/item/InventoryTickEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/ItemEventRegistry.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/listener/InventoryTickTask.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/SlotClickEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatSlotActionType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/stack/LoreUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/component/ItemComponentTypes.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/CustomNameComponentType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/ItemComponentType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/RarityComponentType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/Resource.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/ResourceManager.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/InventoryTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/InventoryTickEvent.java new file mode 100644 index 000000000..58b0913e9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/InventoryTickEvent.java @@ -0,0 +1,81 @@ +package net.pitan76.mcpitanlib.api.event.item; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EquipmentSlot; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.api.util.entity.EquipmentSlotUtil; +import net.pitan76.mcpitanlib.api.util.entity.LivingEntityUtil; + +public class InventoryTickEvent extends BaseEvent { + public ItemStack stack; + public World world; + public Entity entity; + public int slot; + public boolean selected; + public EquipmentSlot equipmentSlot; + + public InventoryTickEvent(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + this.stack = stack; + this.world = world; + this.entity = entity; + this.slot = slot; + this.selected = selected; + this.equipmentSlot = EquipmentSlotUtil.fromEntitySlotId(slot); + } + + public InventoryTickEvent(ItemStack stack, ServerWorld world, Entity entity, EquipmentSlot slot) { + this(stack, world, entity, EquipmentSlotUtil.getEntitySlotId(slot), isSelected(entity, slot, stack)); + this.equipmentSlot = slot; + } + + private static boolean isSelected(Entity entity, EquipmentSlot slot, ItemStack stack) { + if (entity instanceof LivingEntity) { + LivingEntity livingEntity = (LivingEntity) entity; + ItemStack equippedStack = LivingEntityUtil.getEquippedStack(livingEntity, slot); + return equippedStack.isOf(stack.getItem()) && equippedStack.getCount() == stack.getCount(); + } else { + return false; + } + } + + public ItemStack getStack() { + return stack; + } + + public World getWorld() { + return world; + } + + public boolean isServer() { + return !isClient(); + } + + public ServerWorld getServerWorld() { + return (ServerWorld) world; + } + + public Entity getEntity() { + return entity; + } + + public int getSlot() { + return slot; + } + + public boolean isSelected() { + return selected; + } + + public boolean isClient() { + return WorldUtil.isClient(world); + } + + public EquipmentSlot getEquipmentSlot() { + return equipmentSlot; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java index 9f7b9938c..e5294cce0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/PostMineEvent.java @@ -5,10 +5,13 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.BlockUtil; import net.pitan76.mcpitanlib.api.util.WorldUtil; @@ -72,4 +75,44 @@ public boolean stateIsOf(Block block) { public void damageStack(int amount, EquipmentSlot slot) { stack.damage(amount, miner, slot); } + + /** + * Damages the stack in the given slot + * @param amount the amount of damage to deal + * @param type the type of armor equipment + */ + public void damageStack(int amount, ArmorEquipmentType type) { + stack.damage(amount, miner, type.getSlot()); + } + + /** + * Damages the stack in the main hand + * @param amount the amount of damage to deal + */ + public void damageStack(int amount) { + stack.damage(amount, miner, EquipmentSlot.MAINHAND); + } + + public boolean isPlayer() { + return miner instanceof PlayerEntity; + } + + public Player getPlayer() { + if (isPlayer()) + return new Player((PlayerEntity) miner); + + return null; + } + + public boolean isCreative() { + return isPlayer() && getPlayer().isCreative(); + } + + public boolean isSneaking() { + return miner.isSneaking(); + } + + public ItemStack getMainHandStack() { + return miner.getMainHandStack(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java index 3ea708bfe..e79b9e791 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v0/event/RecipeManagerEvent.java @@ -11,6 +11,7 @@ import net.minecraft.util.profiler.Profiler; import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; import net.pitan76.mcpitanlib.api.recipe.v2.CompatRecipeEntry; +import net.pitan76.mcpitanlib.api.recipe.v3.CompatRecipe; import java.util.Map; @@ -55,6 +56,10 @@ public ResourceManager getResourceManager() { return resourceManager; } + public net.pitan76.mcpitanlib.midohra.resource.ResourceManager getResourceManagerM() { + return net.pitan76.mcpitanlib.midohra.resource.ResourceManager.of(resourceManager); + } + public void putCompatibleRecipeEntry(Identifier id, CompatibleRecipeEntry entry) { putCompatibleRecipeEntry(entry); } @@ -68,4 +73,14 @@ public > void putCompatibleRecipeEntry(CompatRecipeEntry recipesById.put(entry.getId(), entry.getRecipeEntry()); recipesByType.put(entry.getType(), entry.getRecipeEntry()); } + + public void putRecipeEntry(net.pitan76.mcpitanlib.midohra.recipe.entry.RecipeEntry entry) { + recipesById.put(entry.getId().toMinecraft(), entry.toMinecraft()); + recipesByType.put(entry.getRawRecipeType(), entry.toMinecraft()); + } + + public void putRecipe(CompatRecipe recipe) { + recipesById.put(recipe.getId(), recipe.getRecipeEntry().getRecipeEntry()); + recipesByType.put(recipe.getType(), recipe.getRecipeEntry().getRecipeEntry()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/ItemEventRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/ItemEventRegistry.java new file mode 100644 index 000000000..822804845 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/ItemEventRegistry.java @@ -0,0 +1,7 @@ +package net.pitan76.mcpitanlib.api.event.v2; + +import net.pitan76.mcpitanlib.api.event.v2.listener.InventoryTickTask; + +public class ItemEventRegistry { + public static OrderedEvent INVENTORY_TICK = new OrderedEvent<>(); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/listener/InventoryTickTask.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/listener/InventoryTickTask.java new file mode 100644 index 000000000..4f66ba34f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/v2/listener/InventoryTickTask.java @@ -0,0 +1,8 @@ +package net.pitan76.mcpitanlib.api.event.v2.listener; + +import net.pitan76.mcpitanlib.api.event.item.InventoryTickEvent; + +@FunctionalInterface +public interface InventoryTickTask { + void inventoryTick(InventoryTickEvent event); +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java index 4b2794167..334c42388 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/SimpleScreenHandler.java @@ -10,6 +10,7 @@ import net.minecraft.screen.slot.SlotActionType; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.gui.args.CreateMenuEvent; +import net.pitan76.mcpitanlib.api.gui.args.SlotClickEvent; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; import net.pitan76.mcpitanlib.api.util.SlotUtil; @@ -236,7 +237,11 @@ public void onSlotClick(int slotIndex, int button, SlotActionType actionType, Pl } public void overrideOnSlotClick(int slotIndex, int button, SlotActionType actionType, Player player) { - super.onSlotClick(slotIndex, button, actionType, player.getPlayerEntity()); + onSlotClick(new SlotClickEvent(slotIndex, button, actionType, player)); + } + + public void onSlotClick(SlotClickEvent e) { + super.onSlotClick(e.slot, e.button, e.actionType, e.player.getEntity()); } @Override diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/SlotClickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/SlotClickEvent.java new file mode 100644 index 000000000..2c63f0d20 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/args/SlotClickEvent.java @@ -0,0 +1,67 @@ +package net.pitan76.mcpitanlib.api.gui.args; + +import net.minecraft.screen.slot.SlotActionType; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.gui.slot.CompatSlotActionType; + +public class SlotClickEvent { + public int slot; + public int button; + public SlotActionType actionType; + public Player player; + + public SlotClickEvent(int slot, int button, SlotActionType actionType, Player player) { + this.slot = slot; + this.button = button; + this.actionType = actionType; + this.player = player; + } + + public int getSlot() { + return slot; + } + + public int getButton() { + return button; + } + + public SlotActionType getRawActionType() { + return actionType; + } + + public CompatSlotActionType getActionType() { + return CompatSlotActionType.of(actionType); + } + + public Player getPlayer() { + return player; + } + + public boolean isClient() { + return player.isClient(); + } + + public boolean isServer() { + return player.isServer(); + } + + public boolean isSwapAction() { + return actionType == SlotActionType.SWAP; + } + + public boolean isPickupAction() { + return actionType == SlotActionType.PICKUP; + } + + public boolean isQuickCraftAction() { + return actionType == SlotActionType.QUICK_CRAFT; + } + + public boolean isQuickMoveAction() { + return actionType == SlotActionType.QUICK_MOVE; + } + + public boolean isThrowAction() { + return actionType == SlotActionType.THROW; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatSlotActionType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatSlotActionType.java new file mode 100644 index 000000000..b95c48eec --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatSlotActionType.java @@ -0,0 +1,50 @@ +package net.pitan76.mcpitanlib.api.gui.slot; + +import net.minecraft.screen.slot.SlotActionType; + +public class CompatSlotActionType { + public static final CompatSlotActionType PICKUP = new CompatSlotActionType(SlotActionType.PICKUP); + public static final CompatSlotActionType QUICK_MOVE = new CompatSlotActionType(SlotActionType.QUICK_MOVE); + public static final CompatSlotActionType SWAP = new CompatSlotActionType(SlotActionType.SWAP); + public static final CompatSlotActionType THROW = new CompatSlotActionType(SlotActionType.THROW); + public static final CompatSlotActionType CLONE = new CompatSlotActionType(SlotActionType.CLONE); + public static final CompatSlotActionType QUICK_CRAFT = new CompatSlotActionType(SlotActionType.QUICK_CRAFT); + public static final CompatSlotActionType PICKUP_ALL = new CompatSlotActionType(SlotActionType.PICKUP_ALL); + + public final SlotActionType raw; + + protected CompatSlotActionType(SlotActionType raw) { + this.raw = raw; + } + + public static CompatSlotActionType of(SlotActionType raw) { + if (raw == SlotActionType.PICKUP) return PICKUP; + if (raw == SlotActionType.QUICK_MOVE) return QUICK_MOVE; + if (raw == SlotActionType.SWAP) return SWAP; + if (raw == SlotActionType.THROW) return THROW; + if (raw == SlotActionType.CLONE) return CLONE; + if (raw == SlotActionType.QUICK_CRAFT) return QUICK_CRAFT; + if (raw == SlotActionType.PICKUP_ALL) return PICKUP_ALL; + return new CompatSlotActionType(raw); + } + + public boolean isSwapOrPickupOrQuickMoveOrThrow() { + return raw == SlotActionType.SWAP || raw == SlotActionType.PICKUP || raw == SlotActionType.QUICK_MOVE || raw == SlotActionType.THROW; + } + + public SlotActionType getRaw() { + return raw; + } + + public int getIndex() { + return raw.ordinal(); + } + + public String getName() { + return raw.name(); + } + + public boolean isOf(CompatSlotActionType type) { + return raw == type.raw; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/stack/LoreUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/stack/LoreUtil.java new file mode 100644 index 000000000..e29531d73 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/stack/LoreUtil.java @@ -0,0 +1,46 @@ +package net.pitan76.mcpitanlib.api.item.stack; + +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.LoreComponent; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; + +import java.util.List; + +public class LoreUtil { + public static boolean hasLore(ItemStack stack) { + return stack.contains(DataComponentTypes.LORE); + } + + public static List getLore(ItemStack stack) { + if (!hasLore(stack)) return List.of(); + return stack.get(DataComponentTypes.LORE).lines(); + } + + public static List getLoreAsStringList(ItemStack stack) { + return getLore(stack).stream() + .map(Text::getString) + .toList(); + } + + public static String getLoreAsString(ItemStack stack) { + return getLoreAsStringList(stack).stream() + .reduce("", (a, b) -> a + "\n" + b); + } + + public static void setLore(ItemStack stack, List lore) { + stack.set(DataComponentTypes.LORE, new LoreComponent(lore)); + } + + public static void setLoreStringList(ItemStack stack, List lore) { + setLore(stack, lore.stream() + .map(Text::of) + .toList()); + } + + public static void setLore(ItemStack stack, String lore) { + setLore(stack, lore.lines() + .map(Text::of) + .toList()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java index afdc2a73d..48ab15647 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/tool/CompatibleMiningToolItem.java @@ -3,16 +3,23 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.MiningToolItem; import net.minecraft.item.ToolMaterial; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.event.item.ItemUseOnEntityEvent; import net.pitan76.mcpitanlib.api.event.item.PostHitEvent; import net.pitan76.mcpitanlib.api.event.item.PostMineEvent; import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.tag.v2.CompatTagKey; +import net.pitan76.mcpitanlib.api.tag.v2.typed.BlockTagKey; +import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.ItemStackUtil; public class CompatibleMiningToolItem extends MiningToolItem implements CompatItemProvider { @@ -29,6 +36,16 @@ public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamag this.settings = settings; } + public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, CompatTagKey tagKey, CompatibleItemSettings settings) { + this(attackDamage, attackSpeed, material.build(), tagKey.getTagKey(), settings.build()); + this.settings = settings; + } + + public CompatibleMiningToolItem(CompatibleToolMaterial material, int attackDamage, float attackSpeed, BlockTagKey tagKey, CompatibleItemSettings settings) { + this(attackDamage, attackSpeed, material.build(), tagKey.getTagKey(), settings.build()); + this.settings = settings; + } + @Override public CompatibleItemSettings getCompatSettings() { return settings; @@ -88,4 +105,20 @@ public boolean postMine(ItemStack stack, World world, BlockState state, BlockPos public boolean isDamageableOnDefault() { return ItemStackUtil.getMaxDamage(this) > 0; } + + @Deprecated + @Override + public ActionResult useOnEntity(ItemStack stack, PlayerEntity user, LivingEntity entity, Hand hand) { + return onRightClickOnEntity(new ItemUseOnEntityEvent(stack, user, entity, hand)).toActionResult(); + } + + @Deprecated + @Override + public CompatActionResult onRightClickOnEntity(ItemUseOnEntityEvent event, Options options) { + return CompatItemProvider.super.onRightClickOnEntity(event, options); + } + + public CompatActionResult onRightClickOnEntity(ItemUseOnEntityEvent e) { + return CompatActionResult.of(super.useOnEntity(e.stack, e.user.getEntity(), e.entity, e.hand)); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java index 79d34227e..4b0439dac 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItem.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.api.item.v2; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Rarity; @@ -8,6 +10,7 @@ import net.pitan76.mcpitanlib.api.event.item.CanRepairArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantabilityArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantableArgs; +import net.pitan76.mcpitanlib.api.event.item.InventoryTickEvent; import net.pitan76.mcpitanlib.api.item.ExtendItem; import net.pitan76.mcpitanlib.api.item.args.RarityArgs; import net.pitan76.mcpitanlib.api.item.args.StoppedUsingArgs; @@ -17,6 +20,7 @@ import net.pitan76.mcpitanlib.api.util.CompatRarity; import net.pitan76.mcpitanlib.core.Dummy; import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; +import org.jetbrains.annotations.Nullable; public class CompatItem extends ExtendItem { @@ -94,4 +98,14 @@ public boolean onStoppedUsing(StoppedUsingArgs args) { super.onStoppedUsing(args.stack, args.world, args.user, args.remainingUseTicks); return false; } + + @Deprecated + @Override + public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + inventoryTick(new InventoryTickEvent(stack, world, entity, slot, selected)); + } + + public void inventoryTick(InventoryTickEvent e) { + super.inventoryTick(e.stack, e.world, e.entity, e.slot, e.selected); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java index 9b115e77c..67cb774ea 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatItemProvider.java @@ -4,6 +4,7 @@ import net.pitan76.mcpitanlib.api.event.item.CanRepairArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantabilityArgs; import net.pitan76.mcpitanlib.api.event.item.EnchantableArgs; +import net.pitan76.mcpitanlib.api.event.item.InventoryTickEvent; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.item.args.RarityArgs; import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; @@ -40,4 +41,8 @@ default boolean canRepair(CanRepairArgs args) { RepairIngredientTag tag = getCompatSettings().repairIngredientTag; return tag != null && tag.contains(args.stack); } + + default void inventoryTick(InventoryTickEvent e, Options options) { + options.cancel = false; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java index 33b9f069e..8c023e3a3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tag/TagKey.java @@ -7,10 +7,7 @@ import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.util.Identifier; -import net.pitan76.mcpitanlib.api.util.BlockUtil; -import net.pitan76.mcpitanlib.api.util.EntityTypeUtil; -import net.pitan76.mcpitanlib.api.util.FluidUtil; -import net.pitan76.mcpitanlib.api.util.ItemUtil; +import net.pitan76.mcpitanlib.api.util.*; public class TagKey { private final net.minecraft.registry.tag.TagKey tagKey; @@ -29,6 +26,10 @@ public static TagKey create(Type type, Identifier identifier) { }; } + public static TagKey create(Type type, CompatIdentifier id) { + return create(type, id.toMinecraft()); + } + @Deprecated public net.minecraft.registry.tag.TagKey getTagKey() { return tagKey; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index 1c03fccf1..79284f399 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -15,6 +15,7 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.pitan76.mcpitanlib.api.entity.Player; @@ -106,4 +107,40 @@ public static net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraDefaultS public static net.pitan76.mcpitanlib.midohra.block.BlockState getDefaultState(BlockWrapper block) { return block.getDefaultState(); } + + public static float getHardness(BlockState state, BlockView world, BlockPos pos) { + return state.getHardness(world, pos); + } + + public static float getHardness(BlockState state, World world, BlockPos pos) { + return state.getHardness(world, pos); + } + + public static int getLuminance(BlockState state) { + return state.getLuminance(); + } + + public static int getOpacity(BlockState state) { + return state.getOpacity(null, null); + } + + public static int getComparatorOutput(BlockState state, World world, BlockPos pos) { + return state.getComparatorOutput(world, pos); + } + + public static float getHardness(net.pitan76.mcpitanlib.midohra.block.BlockState state, net.pitan76.mcpitanlib.midohra.world.BlockView world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + return getHardness(state.toMinecraft(), world.getRaw(), pos.toMinecraft()); + } + + public static int getLuminance(net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return getLuminance(state.toMinecraft()); + } + + public static int getOpacity(net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return getOpacity(state.toMinecraft()); + } + + public static int getComparatorOutput(net.pitan76.mcpitanlib.midohra.block.BlockState state, net.pitan76.mcpitanlib.midohra.world.World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + return getComparatorOutput(state.toMinecraft(), world.getRaw(), pos.toMinecraft()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java index ab1fada7f..6201ecc60 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatibleRecipeEntryUtil.java @@ -5,6 +5,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.collection.DefaultedList; import net.pitan76.mcpitanlib.api.recipe.CompatibleRecipeEntry; +import net.pitan76.mcpitanlib.api.recipe.v3.CompatRecipe; +import net.pitan76.mcpitanlib.midohra.recipe.entry.RecipeEntry; public class CompatibleRecipeEntryUtil { public static CompatibleRecipeEntry createShapelessRecipe(Identifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { @@ -14,4 +16,12 @@ public static CompatibleRecipeEntry createShapelessRecipe(Identifier id, String public static CompatibleRecipeEntry createShapelessRecipe(CompatIdentifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { return createShapelessRecipe(id.toMinecraft(), group, category, output, input); } + + public static RecipeEntry createShapelessRecipeM(CompatIdentifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { + return RecipeEntry.of(RecipeUtil.createShapelessRecipe(id.toMinecraft(), group, category, output, input), id); + } + + public static CompatRecipe createShapelessAsCompatRecipe(CompatIdentifier id, String group, RecipeUtil.CompatibilityCraftingRecipeCategory category, ItemStack output, DefaultedList input) { + return new CompatRecipe(RecipeUtil.createShapelessRecipe(id.toMinecraft(), group, category, output, input), id.toMinecraft()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index f22aa08e4..446d8db17 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -3,11 +3,15 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.text.Text; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import java.util.UUID; + public class EntityUtil { public static World getWorld(Entity entity) { return entity.getWorld(); @@ -152,4 +156,124 @@ public static void setVehicle(Entity entity, Entity vehicle) { public static void applyRotation(Entity entity, BlockRotation rotation) { entity.applyRotation(rotation); } + + public static void setVelocity(Entity entity, Vec3d velocity) { + entity.setVelocity(velocity); + } + + public static void setFallDistance(Entity entity, double fallDistance) { + entity.fallDistance = (float) fallDistance; + } + + public static double getFallDistance(Entity entity) { + return entity.fallDistance; + } + + public static void setVelocityModified(Entity entity, boolean velocityModified) { + entity.velocityModified = velocityModified; + } + + public static boolean isVelocityModified(Entity entity) { + return entity.velocityModified; + } + + public static float getYaw(Entity entity) { + return entity.getYaw(); + } + + public static float getPitch(Entity entity) { + return entity.getPitch(); + } + + public static void setYaw(Entity entity, float yaw) { + entity.setYaw(yaw); + } + + public static void setPitch(Entity entity, float pitch) { + entity.setPitch(pitch); + } + + public static float getSpeed(Entity entity) { + return entity.speed; + } + + public static void setSpeed(Entity entity, float speed) { + entity.speed = speed; + } + + public static boolean isOnGround(Entity entity) { + return entity.isOnGround(); + } + + public static void setOnGround(Entity entity, boolean onGround) { + entity.setOnGround(onGround); + } + + public static boolean isAlive(Entity entity) { + return entity.isAlive(); + } + + public static UUID getUuid(Entity entity) { + return entity.getUuid(); + } + + public static String getUuidString(Entity entity) { + return entity.getUuidAsString(); + } + + public static void setUuid(Entity entity, UUID uuid) { + entity.setUuid(uuid); + } + + public static Text getName(Entity entity) { + return entity.getName(); + } + + public static Text getDisplayName(Entity entity) { + return entity.getDisplayName(); + } + + public static void setCustomName(Entity entity, Text customName) { + entity.setCustomName(customName); + } + + public static Text getCustomName(Entity entity) { + return entity.getCustomName(); + } + + public static void setCustomNameVisible(Entity entity, boolean visible) { + entity.setCustomNameVisible(visible); + } + + public static boolean isCustomNameVisible(Entity entity) { + return entity.isCustomNameVisible(); + } + + public static boolean hasCustomName(Entity entity) { + return entity.hasCustomName(); + } + + public static String getNameAsString(Entity entity) { + return entity.getName().getString(); + } + + public static String getDisplayNameAsString(Entity entity) { + if (entity.getDisplayName() == null) + return null; + return entity.getDisplayName().getString(); + } + + public static String getCustomNameAsString(Entity entity) { + if (entity.getCustomName() == null) + return null; + return entity.getCustomName().getString(); + } + + public static void setCustomName(Entity entity, String customName) { + entity.setCustomName(TextUtil.literal(customName)); + } + + public static Vec3d getRotationVector(Entity entity) { + return entity.getRotationVector(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java index bec9f4348..ef9f00870 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/IngredientUtil.java @@ -2,11 +2,13 @@ import it.unimi.dsi.fastutil.ints.IntList; import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.Registries; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; +import net.minecraft.util.collection.DefaultedList; import java.util.ArrayList; import java.util.Arrays; @@ -50,4 +52,23 @@ public static ItemStack[] getMatchingStacks(Ingredient ingredient) { public static Ingredient empty() { return Ingredient.EMPTY; } + + public static Ingredient ofItems(ItemConvertible... items) { + return Ingredient.ofItems(items); + } + + public static DefaultedList buildInput(Object[] input) { + DefaultedList list = DefaultedList.of(); + for (Object obj : input) { + if (obj instanceof Ingredient) { + list.add((Ingredient) obj); + continue; + } + + if (obj instanceof ItemConvertible) { + list.add(ofItems((ItemConvertible) obj)); + } + } + return list; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index d65efb01d..7a681d990 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -168,4 +168,8 @@ public static boolean isBreak(ItemStack stack) { public static ItemWrapper getItemWrapper(ItemStack stack) { return ItemWrapper.of(stack.getItem()); } + + public static int getMaxCount(ItemStack stack) { + return stack.getMaxCount(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index 91ddbd793..a43499f40 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -475,4 +475,46 @@ public static NbtElement getElement(NbtCompound nbt, String key) { public static void putElement(NbtCompound nbt, String key, NbtElement element) { nbt.put(key, element); } + + public static void setBlockPosDirect(NbtCompound nbt, BlockPos pos) { + putInt(nbt, "x", pos.getX()); + putInt(nbt, "y", pos.getY()); + putInt(nbt, "z", pos.getZ()); + } + + public static BlockPos getBlockPosDirect(NbtCompound nbt) { + return PosUtil.flooredBlockPos(getInt(nbt, "x"), getInt(nbt, "y"), getInt(nbt, "z")); + } + + public static void setVec3iDirect(NbtCompound nbt, Vec3i vec3i) { + putInt(nbt, "x", vec3i.getX()); + putInt(nbt, "y", vec3i.getY()); + putInt(nbt, "z", vec3i.getZ()); + } + + public static Vec3i getVec3iDirect(NbtCompound nbt) { + return Vec3iUtil.create(getInt(nbt, "x"), getInt(nbt, "y"), getInt(nbt, "z")); + } + + public static void setVec3dDirect(NbtCompound nbt, Vec3d vec3d) { + putDouble(nbt, "x", vec3d.getX()); + putDouble(nbt, "y", vec3d.getY()); + putDouble(nbt, "z", vec3d.getZ()); + } + + public static Vec3d getVec3dDirect(NbtCompound nbt) { + return Vec3dUtil.create(getDouble(nbt, "x"), getDouble(nbt, "y"), getDouble(nbt, "z")); + } + + public static void setVec3iDirect(NbtCompound nbt, int x, int y, int z) { + putInt(nbt, "x", x); + putInt(nbt, "y", y); + putInt(nbt, "z", z); + } + + public static void setVec3dDirect(NbtCompound nbt, double x, double y, double z) { + putDouble(nbt, "x", x); + putDouble(nbt, "y", y); + putDouble(nbt, "z", z); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java index f19efd9b3..84db97e6d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java @@ -3,6 +3,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.PlayerManager; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.entity.Player; public class ServerUtil { public static MinecraftServer getServer(World world) { @@ -52,4 +53,8 @@ public static boolean isSingleplayer(MinecraftServer server) { public static PlayerManager getPlayerManager(MinecraftServer server) { return server.getPlayerManager(); } + + public static MinecraftServer getServer(Player player) { + return getServer(player.getWorld()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java new file mode 100644 index 000000000..6f741b48e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java @@ -0,0 +1,52 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.EquipmentSlot; +import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; + +public class EquipmentSlotUtil { + public static boolean isArmor(EquipmentSlot slot) { + return slot == EquipmentSlot.HEAD || slot == EquipmentSlot.CHEST || slot == EquipmentSlot.LEGS || slot == EquipmentSlot.FEET; + } + + public static boolean isMainHand(EquipmentSlot slot) { + return slot == EquipmentSlot.MAINHAND; + } + + public static boolean isOffHand(EquipmentSlot slot) { + return slot == EquipmentSlot.OFFHAND; + } + + public static boolean isWeapon(EquipmentSlot slot) { + return slot == EquipmentSlot.MAINHAND || slot == EquipmentSlot.OFFHAND; + } + + public static int getEntitySlotId(EquipmentSlot slot) { + return slot.getEntitySlotId(); + } + + public static EquipmentSlot fromEntitySlotId(int id) { + for (EquipmentSlot slot : EquipmentSlot.values()) { + if (slot.getEntitySlotId() == id) { + return slot; + } + } + return null; + } + + public static ArmorEquipmentType getArmorEquipmentType(EquipmentSlot slot) { + switch (slot) { + case HEAD: + return ArmorEquipmentType.HEAD; + case CHEST: + return ArmorEquipmentType.CHEST; + case LEGS: + return ArmorEquipmentType.LEGS; + case FEET: + return ArmorEquipmentType.FEET; + case BODY: + return ArmorEquipmentType.BODY; + default: + return null; + } + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java index 2454910ab..a24cc5327 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java @@ -2,6 +2,8 @@ import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; public class ItemEntityUtil { @@ -9,6 +11,14 @@ public static ItemEntity create(World world, double x, double y, double z, ItemS return new ItemEntity(world, x, y, z, stack); } + public static ItemEntity create(World world, BlockPos pos, ItemStack stack) { + return create(world, pos.getX(), pos.getY(), pos.getZ(), stack); + } + + public static ItemEntity create(World world, Vec3d pos, ItemStack stack) { + return create(world, pos.x, pos.y, pos.z, stack); + } + public static ItemEntity create(World world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) { ItemEntity itemEntity = create(world, x, y, z, stack); setVelocity(itemEntity, velocityX, velocityY, velocityZ); @@ -19,6 +29,10 @@ public static void setVelocity(ItemEntity itemEntity, double velocityX, double v itemEntity.setVelocity(velocityX, velocityY, velocityZ); } + public static void setVelocity(ItemEntity itemEntity, Vec3d vec3d) { + itemEntity.setVelocity(vec3d); + } + public static void setPickupDelay(ItemEntity itemEntity, int pickupDelay) { itemEntity.setPickupDelay(pickupDelay); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java index 7af9ca3a7..9e74fc58f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/LivingEntityUtil.java @@ -1,7 +1,9 @@ package net.pitan76.mcpitanlib.api.util.entity; +import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffectInstance; @@ -44,4 +46,12 @@ public static void setHealth(LivingEntity entity, float health) { public static float getMaxHealth(LivingEntity entity) { return entity.getMaxHealth(); } + + public static ItemStack getEquippedStack(LivingEntity entity, EquipmentSlot slot) { + return entity.getEquippedStack(slot); + } + + public static void setEquippedStack(LivingEntity entity, EquipmentSlot slot, ItemStack stack) { + entity.equipStack(slot, stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java index f2b87d329..483645374 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java @@ -1,8 +1,17 @@ package net.pitan76.mcpitanlib.api.util.world; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleEffect; import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import org.jetbrains.annotations.Nullable; + +import java.util.List; public class ServerWorldUtil { public static void spawnParticles(ServerWorld world, ParticleEffect particle, double x, double y, double z, int count, double velocityX, double velocityY, double velocityZ, double speed) { @@ -14,4 +23,12 @@ public static void spawnParticles(ServerWorld world, Player player, ParticleEffe world.spawnParticles(player.getServerPlayer().get(), particle, force, x, y, z, count, velocityX, velocityY, velocityZ, speed); } } + + public static List getDroppedStacksOnBlock(BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntity blockEntity) { + return Block.getDroppedStacks(state, world, pos, blockEntity); + } + + public static List getDroppedStacksOnBlock(BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntityWrapper blockEntity) { + return getDroppedStacksOnBlock(state, world, pos, blockEntity.get()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/ItemComponentTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/ItemComponentTypes.java new file mode 100644 index 000000000..abc105a9e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/ItemComponentTypes.java @@ -0,0 +1,125 @@ +package net.pitan76.mcpitanlib.midohra.component; + +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.NbtComponent; +import net.minecraft.component.type.UnbreakableComponent; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; +import net.minecraft.util.Rarity; +import net.pitan76.mcpitanlib.api.item.stack.LoreUtil; +import net.pitan76.mcpitanlib.api.util.BlockEntityDataUtil; +import net.pitan76.mcpitanlib.api.util.CustomDataUtil; +import net.pitan76.mcpitanlib.api.util.NbtUtil; +import net.pitan76.mcpitanlib.midohra.component.item.CustomNameComponentType; +import net.pitan76.mcpitanlib.midohra.component.item.ItemComponentType; +import net.pitan76.mcpitanlib.midohra.component.item.RarityComponentType; + +import java.util.List; + +public class ItemComponentTypes { + public static final ItemComponentType CUSTOM_DATA = new ItemComponentType<>(DataComponentTypes.CUSTOM_DATA) { + @Override + public void put(ItemStack stack, NbtCompound value) { + CustomDataUtil.setNbt(stack, value); + } + + @Override + public NbtCompound get(ItemStack stack) { + return CustomDataUtil.getNbt(stack); + } + }; + + public static final ItemComponentType MAX_STACK_SIZE = new ItemComponentType<>(DataComponentTypes.MAX_STACK_SIZE) { + @Override + public void put(ItemStack stack, Integer value) { + stack.set(DataComponentTypes.MAX_STACK_SIZE, value); + } + + @Override + public Integer get(ItemStack stack) { + return stack.getMaxCount(); + } + }; + + public static final ItemComponentType MAX_DAMAGE = new ItemComponentType<>(DataComponentTypes.MAX_DAMAGE) { + @Override + public void put(ItemStack stack, Integer value) { + stack.set(DataComponentTypes.MAX_DAMAGE, value); + } + + @Override + public Integer get(ItemStack stack) { + return stack.getMaxDamage(); + } + }; + + public static final ItemComponentType DAMAGE = new ItemComponentType<>(DataComponentTypes.DAMAGE) { + @Override + public void put(ItemStack stack, Integer value) { + stack.setDamage(value); + } + + @Override + public Integer get(ItemStack stack) { + return stack.getDamage(); + } + }; + + public static final ItemComponentType UNBREAKABLE = new ItemComponentType<>(DataComponentTypes.UNBREAKABLE) { + @Override + public void put(ItemStack stack, Boolean value) { + if (value) { + stack.set(DataComponentTypes.UNBREAKABLE, new UnbreakableComponent(true)); + } else { + stack.remove(DataComponentTypes.UNBREAKABLE); + } + } + + @Override + public Boolean get(ItemStack stack) { + return has(stack); + } + }; + + public static final ItemComponentType RARITY = new RarityComponentType(); + + public static final CustomNameComponentType CUSTOM_NAME = new CustomNameComponentType(); + + public static final ItemComponentType BLOCK_ENTITY_DATA = new ItemComponentType<>(DataComponentTypes.BLOCK_ENTITY_DATA) { + @Override + public void put(ItemStack stack, NbtCompound value) { + BlockEntityDataUtil.setBlockEntityNbt(stack, value); + } + + @Override + public NbtCompound get(ItemStack stack) { + return BlockEntityDataUtil.getBlockEntityNbt(stack); + } + }; + + public static final ItemComponentType ENTITY_DATA = new ItemComponentType<>(DataComponentTypes.ENTITY_DATA) { + @Override + public void put(ItemStack stack, NbtCompound value) { + stack.set(DataComponentTypes.ENTITY_DATA, NbtComponent.of(value)); + } + + @Override + public NbtCompound get(ItemStack stack) { + if (!has(stack)) return NbtUtil.create(); + return stack.get(DataComponentTypes.ENTITY_DATA).copyNbt(); + } + }; + + public static final ItemComponentType> LORE = new ItemComponentType<>(DataComponentTypes.LORE) { + @Override + public void put(ItemStack stack, List value) { + LoreUtil.setLore(stack, value); + } + + @Override + public List get(ItemStack stack) { + return LoreUtil.getLore(stack); + } + }; +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/CustomNameComponentType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/CustomNameComponentType.java new file mode 100644 index 000000000..b4fd2b700 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/CustomNameComponentType.java @@ -0,0 +1,31 @@ +package net.pitan76.mcpitanlib.midohra.component.item; + +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; + +public class CustomNameComponentType extends ItemComponentType { + + public CustomNameComponentType() { + super(DataComponentTypes.CUSTOM_NAME); + } + + @Override + public void put(ItemStack stack, Text value) { + stack.set(DataComponentTypes.CUSTOM_NAME, value); + } + + @Override + public Text get(ItemStack stack) { + if (!has(stack)) return Text.empty(); + return stack.get(DataComponentTypes.CUSTOM_NAME); + } + + public String getAsString(ItemStack stack) { + return get(stack).getString(); + } + + public void put(ItemStack stack, String name) { + put(stack, Text.literal(name)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/ItemComponentType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/ItemComponentType.java new file mode 100644 index 000000000..e45e00eef --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/ItemComponentType.java @@ -0,0 +1,31 @@ +package net.pitan76.mcpitanlib.midohra.component.item; + +import net.minecraft.component.ComponentType; +import net.minecraft.item.ItemStack; + +public abstract class ItemComponentType { + + private final ComponentType type; + + protected ItemComponentType(ComponentType type) { + this.type = type; + } + + public abstract void put(ItemStack stack, T value); + + public abstract T get(ItemStack stack); + + public boolean has(ItemStack stack) { + return stack.contains(type); + } + + public void putOrDefault(ItemStack stack, T value, T defaultValue) { + if (value.equals(defaultValue)) return; + put(stack, value); + } + + public T getOrDefault(ItemStack stack, T defaultValue) { + if (!has(stack)) return defaultValue; + return get(stack); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/RarityComponentType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/RarityComponentType.java new file mode 100644 index 000000000..2fb1ef26e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/component/item/RarityComponentType.java @@ -0,0 +1,31 @@ +package net.pitan76.mcpitanlib.midohra.component.item; + +import net.minecraft.component.DataComponentTypes; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Rarity; +import net.pitan76.mcpitanlib.api.util.CompatRarity; + +public class RarityComponentType extends ItemComponentType { + + public RarityComponentType() { + super(DataComponentTypes.RARITY); + } + + @Override + public void put(ItemStack stack, Rarity value) { + stack.set(DataComponentTypes.RARITY, value); + } + + @Override + public Rarity get(ItemStack stack) { + return stack.getRarity(); + } + + public void put(ItemStack stack, CompatRarity rarity) { + put(stack, rarity.get()); + } + + public CompatRarity getCompatRarity(ItemStack stack) { + return CompatRarity.of(get(stack)); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java index 1e689e2ae..ec41cd6e7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java @@ -1,12 +1,17 @@ package net.pitan76.mcpitanlib.midohra.item; +import net.minecraft.component.DataComponentTypes; +import net.minecraft.component.type.LoreComponent; import net.minecraft.item.ItemConvertible; import net.minecraft.nbt.NbtCompound; +import net.minecraft.text.Text; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.enchantment.CompatEnchantment; +import net.pitan76.mcpitanlib.api.item.stack.LoreUtil; import net.pitan76.mcpitanlib.api.util.*; import org.jetbrains.annotations.Nullable; +import java.util.List; import java.util.Map; public class ItemStack { @@ -84,6 +89,34 @@ public void setEnchantments(Map enchantments, @Nulla EnchantmentUtil.setEnchantment(stack, enchantments, world); } + public int getMaxCount() { + return ItemStackUtil.getMaxCount(stack); + } + + public boolean hasLore() { + return LoreUtil.hasLore(stack); + } + + public List getLore() { + return LoreUtil.getLore(stack); + } + + public List getLoreAsStringList() { + return LoreUtil.getLoreAsStringList(stack); + } + + public void setLore(List lore) { + LoreUtil.setLore(stack, lore); + } + + public void setLoreString(List lore) { + LoreUtil.setLoreStringList(stack, lore); + } + + public void setLore(String lore) { + LoreUtil.setLore(stack, lore); + } + @Deprecated public net.minecraft.item.ItemStack toMinecraft() { return stack; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/Resource.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/Resource.java new file mode 100644 index 000000000..ecfae63c7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/Resource.java @@ -0,0 +1,74 @@ +package net.pitan76.mcpitanlib.midohra.resource; + +import net.pitan76.mcpitanlib.api.util.LoggerUtil; +import net.pitan76.mcpitanlib.api.util.ResourceUtil; +import org.apache.commons.io.IOUtils; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; + +public class Resource { + private final net.minecraft.resource.Resource resource; + + protected Resource(net.minecraft.resource.Resource resource) { + this.resource = resource; + } + + public static Resource of(net.minecraft.resource.Resource resource) { + return new Resource(resource); + } + + public net.minecraft.resource.Resource getRaw() { + return resource; + } + + public net.minecraft.resource.Resource toMinecraft() { + return getRaw(); + } + + public BufferedReader getReader() throws IOException { + return resource.getReader(); + } + + public String getPackId() { + return resource.getPackId(); + } + + public InputStream getInputStream() { + try { + return ResourceUtil.getInputStream(resource); + } catch (IOException e) { + LoggerUtil.error(LoggerUtil.getLogger(), "Failed to read resource: " + e.getMessage()); + return null; + } + } + + public void close() { + try { + ResourceUtil.close(resource); + } catch (IOException e) { + LoggerUtil.error(LoggerUtil.getLogger(), "Failed to close resource: " + e.getMessage()); + } + } + + public String getContent() throws IOException { + String content = IOUtils.toString(getInputStream(), StandardCharsets.UTF_8); + close(); + return content; + } + + public String getContent(String encoding) throws IOException { + String content = IOUtils.toString(getInputStream(), encoding); + close(); + return content; + } + + public String getContent(Charset encoding) throws IOException { + String content = IOUtils.toString(getInputStream(), encoding); + close(); + return content; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/ResourceManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/ResourceManager.java new file mode 100644 index 000000000..76b541509 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/resource/ResourceManager.java @@ -0,0 +1,84 @@ +package net.pitan76.mcpitanlib.midohra.resource; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.MinecraftClient; +import net.minecraft.util.Identifier; +import net.minecraft.world.WorldAccess; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.LoggerUtil; +import net.pitan76.mcpitanlib.api.util.ResourceUtil; +import net.pitan76.mcpitanlib.midohra.server.MCServer; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +public class ResourceManager { + private final net.minecraft.resource.ResourceManager resourceManager; + + protected ResourceManager(net.minecraft.resource.ResourceManager resourceManager) { + this.resourceManager = resourceManager; + } + + public static ResourceManager of(net.minecraft.resource.ResourceManager resourceManager) { + return new ResourceManager(resourceManager); + } + + public static ResourceManager of(net.minecraft.server.MinecraftServer server) { + return of(MCServer.of(server)); + } + + public static ResourceManager of(MCServer server) { + return of(server.getRaw()); + } + + @Environment(EnvType.CLIENT) + public static ResourceManager of(MinecraftClient client) { + return of(client.getResourceManager()); + } + + public static ResourceManager of(WorldAccess worldAccess) { + return of(worldAccess.getServer()); + } + + public static ResourceManager of(net.pitan76.mcpitanlib.midohra.world.WorldAccess worldAccess) { + return of(worldAccess.getServer()); + } + + public net.minecraft.resource.ResourceManager getRaw() { + return resourceManager; + } + + public net.minecraft.resource.ResourceManager toMinecraft() { + return getRaw(); + } + + public Map findResources(String startPath, String endPath) { + Map map = new HashMap<>(); + try { + Map rawMap = ResourceUtil.findResources(resourceManager, startPath, endPath); + for (Map.Entry entry : rawMap.entrySet()) { + map.put(CompatIdentifier.fromMinecraft(entry.getKey()), Resource.of(entry.getValue())); + } + } catch (IOException e) { + LoggerUtil.error(LoggerUtil.getLogger(), "Failed to read " + startPath + ": " + e.getMessage()); + return null; + } + + return map; + } + + public Resource getResource(CompatIdentifier id) { + Optional resource = resourceManager.getResource(id.toMinecraft()); + return resource.map(Resource::of).orElse(null); + } + + public List getAllResources(CompatIdentifier id) { + return resourceManager.getAllResources(id.toMinecraft()) + .stream().map(Resource::of).toList(); + } + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java index fbc5678ed..d6f30f6b5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java @@ -4,6 +4,7 @@ import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.ServerUtil; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.resource.ResourceManager; import net.pitan76.mcpitanlib.midohra.world.ServerWorld; public class MCServer { @@ -85,5 +86,7 @@ public ServerWorld getEnd() { return ServerWorld.of(WorldUtil.getEnd(server)); } - + public ResourceManager getResourceManager() { + return ResourceManager.of(server.getResourceManager()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java index 73c3bf30b..dda78a0c0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldAccess.java @@ -14,6 +14,7 @@ import net.pitan76.mcpitanlib.api.util.world.WorldAccessUtil; import net.pitan76.mcpitanlib.midohra.block.BlockState; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.server.MCServer; import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; import java.util.Optional; @@ -121,4 +122,8 @@ public void playSound(BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCate public void playSound(BlockPos pos, CompatSoundEvent soundEvent, CompatSoundCategory category) { playSound(null, pos.toMinecraft(), soundEvent.get(), category.get()); } + + public MCServer getMCServer() { + return MCServer.of(getServer()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 3e50bc73f..5f9ce7f86 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -17,6 +17,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.item.*; +import net.pitan76.mcpitanlib.api.event.v2.ItemEventRegistry; +import net.pitan76.mcpitanlib.api.event.v2.listener.InventoryTickTask; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider.Options; import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; @@ -210,4 +212,26 @@ public class ItemMixin { cir.setReturnValue(returnValue.getUseAction()); } } + + @Inject(method = "inventoryTick", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected, CallbackInfo ci) { + // イベントを呼び出す + if (!ItemEventRegistry.INVENTORY_TICK.isEmpty()) { + int maxPriority = ItemEventRegistry.INVENTORY_TICK.getMaxPriority(); + for (int p = maxPriority; p >= 0; p--) { + for (InventoryTickTask listener : ItemEventRegistry.INVENTORY_TICK.getListenersAsList(p)) { + listener.inventoryTick(new InventoryTickEvent(stack, world, entity, slot, selected)); + } + } + } + + // CompatItemProviderを実装している場合 + if (this instanceof CompatItemProvider) { + CompatItemProvider provider = (CompatItemProvider) this; + Options options = new Options(); + provider.inventoryTick(new InventoryTickEvent(stack, world, entity, slot, selected), options); + if (options.cancel) + ci.cancel(); + } + } } diff --git a/info.properties b/info.properties index 2b6bc8062..61674125f 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.0 +mod_version=3.2.1 maven_group=net.pitan76 -changelog=fix APIs \ No newline at end of file +changelog=add APIs \ No newline at end of file From 23eb822d70a78661580197ded37d175ca66bf364 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Apr 2025 21:53:59 +0900 Subject: [PATCH 461/622] add APIs-2 --- .../pitan76/mcpitanlib/api/util/NbtUtil.java | 36 +++++++++++++++++-- .../mcpitanlib/midohra/nbt/NbtElement.java | 4 +++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index a43499f40..392223622 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -2,9 +2,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.nbt.NbtElement; -import net.minecraft.nbt.NbtList; +import net.minecraft.nbt.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; @@ -517,4 +515,36 @@ public static void setVec3dDirect(NbtCompound nbt, double x, double y, double z) putDouble(nbt, "y", y); putDouble(nbt, "z", z); } + + public static String asString(NbtElement nbt) { + return nbt.asString(); + } + + public static NbtString createString(String string) { + return NbtString.of(string); + } + + public static NbtInt createInt(int value) { + return NbtInt.of(value); + } + + public static NbtFloat createFloat(float value) { + return NbtFloat.of(value); + } + + public static NbtDouble createDouble(double value) { + return NbtDouble.of(value); + } + + public static NbtLong createLong(long value) { + return NbtLong.of(value); + } + + public static NbtByte createByte(byte value) { + return NbtByte.of(value); + } + + public static NbtShort createShort(short value) { + return NbtShort.of(value); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java index 89d71c04b..ac7d84d13 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/nbt/NbtElement.java @@ -42,4 +42,8 @@ public net.minecraft.nbt.NbtElement toMinecraft() { public NbtElement toElement() { return this; } + + public String asString() { + return nbt.asString(); + } } From 37ef3e9bdc19bf0ed1460d9f11869cad78594e4a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 7 Apr 2025 21:19:49 +0900 Subject: [PATCH 462/622] rm import --- .../main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java index 0dc9cc111..cc416d13c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemStackMixin.java @@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.math.random.Random; import net.pitan76.mcpitanlib.api.event.v0.event.ItemStackActionEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; From cbfd9cfce3fd52ee31a6c9d5cd442693ebc18ed8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 7 Apr 2025 21:01:37 +0900 Subject: [PATCH 463/622] add APIs --- .../mcpitanlib/api/block/CompatBlocks.java | 6 + .../api/client/SimpleHandledScreen.java | 36 +++++ .../gui/widget/CompatTextFieldWidget.java | 143 ++++++++++++++++++ .../api/gui/slot/CompatibleSlot.java | 10 ++ .../mcpitanlib/api/item/CompatItems.java | 51 +++++++ .../mcpitanlib/api/util/BlockUtil.java | 11 +- .../mcpitanlib/api/util/ItemStackUtil.java | 4 + .../mcpitanlib/api/util/WorldUtil.java | 4 + .../api/util/client/widget/TextFieldUtil.java | 51 +++++++ .../api/util/entity/EquipmentSlotUtil.java | 5 +- .../mcpitanlib/api/util/math/PosUtil.java | 68 ++++++++- .../mcpitanlib/api/util/v2/BlockUtilV2.java | 10 ++ .../api/util/world/ServerWorldUtil.java | 5 + .../mcpitanlib/midohra/item/ItemStack.java | 14 +- info.properties | 2 +- 15 files changed, 412 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatTextFieldWidget.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java index 293cb29c4..e855ccf32 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatBlocks.java @@ -87,4 +87,10 @@ public class CompatBlocks { public static final Block WATER = Blocks.WATER; public static final Block LAVA = Blocks.LAVA; public static final Block BEDROCK = Blocks.BEDROCK; + + // ---- + + public static boolean isExist(Block block) { + return block != null && block != Blocks.AIR; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java index 6cf23365c..060e17547 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/SimpleHandledScreen.java @@ -21,6 +21,7 @@ import net.pitan76.mcpitanlib.api.util.IdentifierUtil; import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; +import net.pitan76.mcpitanlib.core.datafixer.Pair; @Deprecated public abstract class SimpleHandledScreen extends HandledScreen { @@ -277,4 +278,39 @@ public int getTitleX() { public int getTitleY() { return titleY; } + + @Deprecated + @Override + public Text getTitle() { + return callGetTitle(); + } + + public Text callGetTitle() { + return super.getTitle(); + } + + public Pair getTitlePosP() { + return new Pair<>(getTitleX(), getTitleY()); + } + + public int getPlayerInvTitleX() { + return playerInventoryTitleX; + } + + public int getPlayerInvTitleY() { + return playerInventoryTitleY; + } + + public void setPlayerInvTitleX(int x) { + playerInventoryTitleX = x; + } + + public void setPlayerInvTitleY(int y) { + playerInventoryTitleY = y; + } + + public void setPlayerInvTitle(int x, int y) { + setPlayerInvTitleX(x); + setPlayerInvTitleY(y); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatTextFieldWidget.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatTextFieldWidget.java new file mode 100644 index 000000000..a29256a75 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/widget/CompatTextFieldWidget.java @@ -0,0 +1,143 @@ +package net.pitan76.mcpitanlib.api.client.gui.widget; + +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.util.TextUtil; +import org.jetbrains.annotations.Nullable; + +public class CompatTextFieldWidget extends TextFieldWidget { + public CompatTextFieldWidget(TextRenderer textRenderer, int width, int height) { + this(textRenderer, width, height, TextUtil.empty()); + } + + public CompatTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height) { + this(textRenderer, x, y, width, height, TextUtil.empty()); + } + + // ---- + + public CompatTextFieldWidget(TextRenderer textRenderer, int width, int height, Text text) { + super(textRenderer, width, height, text); + } + + public CompatTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, Text text) { + super(textRenderer, x, y, width, height, text); + } + + public CompatTextFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, @Nullable TextFieldWidget copyFrom, Text text) { + super(textRenderer, x, y, width, height, copyFrom, text); + } + + // ---- + + @Deprecated + @Override + public void setDrawsBackground(boolean drawsBackground) { + callSetDrawsBackground(drawsBackground); + } + + public void callSetDrawsBackground(boolean drawsBackground) { + super.setDrawsBackground(drawsBackground); + } + + @Deprecated + @Override + public void setFocused(boolean focused) { + callSetFocused(focused); + } + + public void callSetFocused(boolean focused) { + super.setFocused(focused); + } + + @Deprecated + @Override + public void setFocusUnlocked(boolean focusUnlocked) { + callSetFocusUnlocked(focusUnlocked); + } + + public void callSetFocusUnlocked(boolean focusUnlocked) { + super.setFocusUnlocked(focusUnlocked); + } + + @Deprecated + @Override + public void setMaxLength(int maxLength) { + callSetMaxLength(maxLength); + } + + public void callSetMaxLength(int maxLength) { + super.setMaxLength(maxLength); + } + + @Deprecated + @Override + public void setText(String text) { + callSetText(text); + } + + public void callSetText(String text) { + super.setText(text); + } + + @Deprecated + @Override + public String getText() { + return callGetText(); + } + + public String callGetText() { + return super.getText(); + } + + @Deprecated + @Override + public void setEditable(boolean editable) { + callSetEditable(editable); + } + + public void callSetEditable(boolean editable) { + super.setEditable(editable); + } + + @Deprecated + @Override + public boolean isFocused() { + return callIsFocused(); + } + + public boolean callIsFocused() { + return super.isFocused(); + } + + @Deprecated + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + return callKeyPressed(keyCode, scanCode, modifiers); + } + + public boolean callKeyPressed(int keyCode, int scanCode, int modifiers) { + return super.keyPressed(keyCode, scanCode, modifiers); + } + + @Deprecated + @Override + public boolean keyReleased(int keyCode, int scanCode, int modifiers) { + return callKeyReleased(keyCode, scanCode, modifiers); + } + + public boolean callKeyReleased(int keyCode, int scanCode, int modifiers) { + return super.keyReleased(keyCode, scanCode, modifiers); + } + + @Deprecated + @Override + public boolean charTyped(char chr, int modifiers) { + return callCharTyped(chr, modifiers); + } + + public boolean callCharTyped(char chr, int modifiers) { + return super.charTyped(chr, modifiers); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java index 861cc2b32..fce0c65e2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java @@ -102,4 +102,14 @@ public boolean canInsert(net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { public boolean canTakeItems(Player player) { return super.canTakeItems(player.getEntity()); } + + @Deprecated + @Override + public boolean canTakePartial(PlayerEntity player) { + return canTakePartial(new Player(player)); + } + + public boolean canTakePartial(Player player) { + return super.canTakePartial(player.getEntity()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java index e243dd1c0..d7c0e9958 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/CompatItems.java @@ -12,6 +12,57 @@ public class CompatItems { public static Item GRASS = SHORT_GRASS; public static Item SCUTE = TURTLE_SCUTE; + // ---- + + public static Item AIR = Items.AIR; + public static Item STONE = Items.STONE; + public static Item COBBLESTONE = Items.COBBLESTONE; + public static Item GRASS_BLOCK = Items.GRASS_BLOCK; + public static Item DIRT = Items.DIRT; + public static Item SAND = Items.SAND; + public static Item RED_SAND = Items.RED_SAND; + public static Item GRANITE = Items.GRANITE; + public static Item POLISHED_GRANITE = Items.POLISHED_GRANITE; + public static Item DIORITE = Items.DIORITE; + public static Item POLISHED_DIORITE = Items.POLISHED_DIORITE; + public static Item ANDESITE = Items.ANDESITE; + public static Item POLISHED_ANDESITE = Items.POLISHED_ANDESITE; + public static Item COARSE_DIRT = Items.COARSE_DIRT; + public static Item PODZOL = Items.PODZOL; + public static Item OAK_LOG = Items.OAK_LOG; + public static Item SPRUCE_LOG = Items.SPRUCE_LOG; + public static Item BIRCH_LOG = Items.BIRCH_LOG; + public static Item JUNGLE_LOG = Items.JUNGLE_LOG; + public static Item ACACIA_LOG = Items.ACACIA_LOG; + public static Item DARK_OAK_LOG = Items.DARK_OAK_LOG; + public static Item OAK_PLANKS = Items.OAK_PLANKS; + public static Item SPRUCE_PLANKS = Items.SPRUCE_PLANKS; + public static Item BIRCH_PLANKS = Items.BIRCH_PLANKS; + public static Item JUNGLE_PLANKS = Items.JUNGLE_PLANKS; + public static Item ACACIA_PLANKS = Items.ACACIA_PLANKS; + public static Item DARK_OAK_PLANKS = Items.DARK_OAK_PLANKS; + public static Item GLASS = Items.GLASS; + + public static Item STICK = Items.STICK; + public static Item GLASS_BOTTLE = Items.GLASS_BOTTLE; + public static Item EXP_BOTTLE = Items.EXPERIENCE_BOTTLE; + + public static Item GUNPOWDER = Items.GUNPOWDER; + public static Item REDSTONE = Items.REDSTONE; + public static Item COAL = Items.COAL; + public static Item CHARCOAL = Items.CHARCOAL; + public static Item IRON_INGOT = Items.IRON_INGOT; + public static Item COPPER_INGOT = Items.COPPER_INGOT; + public static Item GOLD_INGOT = Items.GOLD_INGOT; + public static Item DIAMOND = Items.DIAMOND; + public static Item EMERALD = Items.EMERALD; + public static Item LAPIS_LAZULI = Items.LAPIS_LAZULI; + public static Item NETHERITE_INGOT = Items.NETHERITE_INGOT; + public static Item NETHERITE_SCRAP = Items.NETHERITE_SCRAP; + public static Item QUARTZ = Items.QUARTZ; + + // ---- + public static boolean isExist(Item item) { return item != null && item != Items.AIR; } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java index 5b5651bf7..0a5532540 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockUtil.java @@ -2,7 +2,8 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; -import net.minecraft.registry.Registries; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.tag.MineableToolTags; @@ -246,4 +247,12 @@ public static boolean isBlockInTag(Block block, Identifier identifier) { public static boolean isBlockInTag(Block block, String id) { return BlockUtilV2.isBlockInTag(block, id); } + + public static Block fromItem(Item item) { + return BlockUtilV2.fromItem(item); + } + + public static Block fromItem(ItemStack stack) { + return BlockUtilV2.fromItem(stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index 7a681d990..ec99b7004 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -172,4 +172,8 @@ public static ItemWrapper getItemWrapper(ItemStack stack) { public static int getMaxCount(ItemStack stack) { return stack.getMaxCount(); } + + public static Item getItem(ItemStack stack) { + return stack.getItem(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index df9876b95..08addcdc6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -380,4 +380,8 @@ public static void playSound(net.pitan76.mcpitanlib.midohra.world.World world, @ public static void dropStackOnBlock(World world, BlockPos pos, ItemStack stack) { Block.dropStack(world, pos, stack); } + + public static float getSkyAngle(World world, float tickDelta) { + return world.getSkyAngle(tickDelta); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java index 33114cc19..4f41f13cc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java @@ -1,7 +1,10 @@ package net.pitan76.mcpitanlib.api.util.client.widget; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.text.Text; import net.pitan76.mcpitanlib.api.client.render.handledscreen.RenderArgs; +import net.pitan76.mcpitanlib.api.util.TextUtil; public class TextFieldUtil { public static void setFocused(TextFieldWidget widget, boolean focused) { @@ -23,4 +26,52 @@ public static void setMaxLength(TextFieldWidget widget, int maxLength) { public static void setSuggestion(TextFieldWidget widget, String suggestion) { widget.setSuggestion(suggestion); } + + public static void setText(TextFieldWidget widget, String text) { + widget.setText(text); + } + + public static String getText(TextFieldWidget widget) { + return widget.getText(); + } + + public static void setDrawsBackground(TextFieldWidget widget, boolean drawsBackground) { + widget.setDrawsBackground(drawsBackground); + } + + public static void setFocusUnlocked(TextFieldWidget widget, boolean focusUnlocked) { + widget.setFocusUnlocked(focusUnlocked); + } + + public static boolean isFocused(TextFieldWidget widget) { + return widget.isFocused(); + } + + public static boolean keyPressed(TextFieldWidget widget, int keyCode, int scanCode, int modifiers) { + return widget.keyPressed(keyCode, scanCode, modifiers); + } + + public static boolean keyReleased(TextFieldWidget widget, int keyCode, int scanCode, int modifiers) { + return widget.keyReleased(keyCode, scanCode, modifiers); + } + + public static boolean charTyped(TextFieldWidget widget, char chr, int modifiers) { + return widget.charTyped(chr, modifiers); + } + + public static TextFieldWidget create(TextRenderer renderer, int x, int y, int width, int height, Text text) { + return new TextFieldWidget(renderer, x, y, width, height, text); + } + + public static TextFieldWidget create(TextRenderer renderer, int x, int y, Text text) { + return new TextFieldWidget(renderer, x, y, text); + } + + public static TextFieldWidget create(TextRenderer renderer, int x, int y, int width, int height) { + return new TextFieldWidget(renderer, x, y, width, height, TextUtil.empty()); + } + + public static TextFieldWidget create(TextRenderer renderer, int x, int y) { + return new TextFieldWidget(renderer, x, y, TextUtil.empty()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java index 6f741b48e..dec1f836b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/EquipmentSlotUtil.java @@ -21,6 +21,9 @@ public static boolean isWeapon(EquipmentSlot slot) { } public static int getEntitySlotId(EquipmentSlot slot) { + if (slot == null) + return 0; + return slot.getEntitySlotId(); } @@ -30,7 +33,7 @@ public static EquipmentSlot fromEntitySlotId(int id) { return slot; } } - return null; + return EquipmentSlot.MAINHAND; } public static ArmorEquipmentType getArmorEquipmentType(EquipmentSlot slot) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java index 16b6f3fee..b5ab899fa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java @@ -1,8 +1,6 @@ package net.pitan76.mcpitanlib.api.util.math; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Position; -import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.*; public class PosUtil { public static BlockPos flooredBlockPos(double x, double y, double z) { @@ -43,4 +41,68 @@ public static Iterable iterate(BlockPos start, BlockPos end) { public static BlockPos[] getNeighborPoses(BlockPos pos) { return new BlockPos[]{pos.north(), pos.south(), pos.east(), pos.west(), pos.up(), pos.down()}; } + + public static BlockPos up(BlockPos pos) { + return pos.up(); + } + + public static BlockPos down(BlockPos pos) { + return pos.down(); + } + + public static BlockPos north(BlockPos pos) { + return pos.north(); + } + + public static BlockPos south(BlockPos pos) { + return pos.south(); + } + + public static BlockPos east(BlockPos pos) { + return pos.east(); + } + + public static BlockPos west(BlockPos pos) { + return pos.west(); + } + + public static BlockPos add(BlockPos pos, int x, int y, int z) { + return pos.add(x, y, z); + } + + public static BlockPos sub(BlockPos pos, int x, int y, int z) { + return pos.subtract(new Vec3i(x, y, z)); + } + + public static BlockPos mul(BlockPos pos, int n) { + return pos.multiply(n); + } + + public static int x(BlockPos pos) { + return pos.getX(); + } + + public static int y(BlockPos pos) { + return pos.getY(); + } + + public static int z(BlockPos pos) { + return pos.getZ(); + } + + public static BlockPos offset(BlockPos pos, Direction direction) { + return pos.offset(direction); + } + + public static BlockPos offset(BlockPos pos, Direction direction, int n) { + return pos.offset(direction, n); + } + + public static BlockPos offset(BlockPos pos, net.pitan76.mcpitanlib.midohra.util.math.Direction direction) { + return pos.offset(direction.toMinecraft()); + } + + public static BlockPos offset(BlockPos pos, net.pitan76.mcpitanlib.midohra.util.math.Direction direction, int n) { + return pos.offset(direction.toMinecraft(), n); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java index 754b03937..5024e1b7a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/v2/BlockUtilV2.java @@ -1,6 +1,8 @@ package net.pitan76.mcpitanlib.api.util.v2; import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.util.BlockUtil; @@ -112,4 +114,12 @@ public static boolean isBlockInTag(Block block, Identifier identifier) { public static boolean isBlockInTag(Block block, String id) { return isBlockInTag(block, IdentifierUtil.id(id)); } + + public static Block fromItem(Item item) { + return Block.getBlockFromItem(item); + } + + public static Block fromItem(ItemStack stack) { + return fromItem(stack.getItem()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java index 483645374..2b1202093 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java @@ -3,6 +3,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; +import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleEffect; import net.minecraft.server.world.ServerWorld; @@ -31,4 +32,8 @@ public static List getDroppedStacksOnBlock(BlockState state, ServerWo public static List getDroppedStacksOnBlock(BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntityWrapper blockEntity) { return getDroppedStacksOnBlock(state, world, pos, blockEntity.get()); } + + public static List getDroppedStacksOnBlock(BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack stack) { + return Block.getDroppedStacks(state, world, pos, blockEntity, entity, stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java index ec41cd6e7..5081a2cb0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemStack.java @@ -1,7 +1,6 @@ package net.pitan76.mcpitanlib.midohra.item; -import net.minecraft.component.DataComponentTypes; -import net.minecraft.component.type.LoreComponent; +import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.nbt.NbtCompound; import net.minecraft.text.Text; @@ -122,6 +121,17 @@ public net.minecraft.item.ItemStack toMinecraft() { return stack; } + public ItemWrapper getItem() { + if (isEmpty()) + return ItemWrapper.of(); + + return ItemWrapper.of(getRawItem()); + } + + public Item getRawItem() { + return ItemStackUtil.getItem(stack); + } + public static class Builder { protected CompatIdentifier id; diff --git a/info.properties b/info.properties index 61674125f..420b12083 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.1 +mod_version=3.2.2 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 92dab15408983b02b6b3c2cec3f9d4c96a8adb3a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Tue, 8 Apr 2025 13:59:04 +0900 Subject: [PATCH 464/622] fix args --- .../mcpitanlib/api/util/client/widget/TextFieldUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java index 4f41f13cc..fb7cce693 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/widget/TextFieldUtil.java @@ -63,15 +63,15 @@ public static TextFieldWidget create(TextRenderer renderer, int x, int y, int wi return new TextFieldWidget(renderer, x, y, width, height, text); } - public static TextFieldWidget create(TextRenderer renderer, int x, int y, Text text) { - return new TextFieldWidget(renderer, x, y, text); + public static TextFieldWidget create(TextRenderer renderer, int width, int height, Text text) { + return new TextFieldWidget(renderer, width, height, text); } public static TextFieldWidget create(TextRenderer renderer, int x, int y, int width, int height) { return new TextFieldWidget(renderer, x, y, width, height, TextUtil.empty()); } - public static TextFieldWidget create(TextRenderer renderer, int x, int y) { - return new TextFieldWidget(renderer, x, y, TextUtil.empty()); + public static TextFieldWidget create(TextRenderer renderer, int width, int height) { + return new TextFieldWidget(renderer, width, height, TextUtil.empty()); } } From bf5d43f185f2976a063b805e69fdaf13e2f018d1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 9 Apr 2025 11:19:59 +0900 Subject: [PATCH 465/622] add APIs --- .../gui/screen/SimpleHandledScreen.java | 53 +++++++++++++++++++ info.properties | 2 +- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index 522170b43..a8bcf376b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -23,6 +23,7 @@ import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.RenderUtil; import net.pitan76.mcpitanlib.api.util.client.ScreenUtil; +import net.pitan76.mcpitanlib.core.datafixer.Pair; public abstract class SimpleHandledScreen extends HandledScreen { @@ -304,4 +305,56 @@ public void drawText(DrawObjectDM drawObjectDM, Text text, int x, int y) { public void drawText(DrawObjectDM drawObjectDM, TextComponent text, int x, int y) { ScreenUtil.RendererUtil.drawText(textRenderer, drawObjectDM, text, x, y); } + + @Deprecated + @Override + public Text getTitle() { + return callGetTitle(); + } + + public Text callGetTitle() { + return super.getTitle(); + } + + public Pair getTitlePosP() { + return new Pair<>(getTitleX(), getTitleY()); + } + + public int getPlayerInvTitleX() { + return playerInventoryTitleX; + } + + public int getPlayerInvTitleY() { + return playerInventoryTitleY; + } + + public void setPlayerInvTitleX(int x) { + playerInventoryTitleX = x; + } + + public void setPlayerInvTitleY(int y) { + playerInventoryTitleY = y; + } + + public void setPlayerInvTitle(int x, int y) { + setPlayerInvTitleX(x); + setPlayerInvTitleY(y); + } + + public TextRenderer callGetTextRenderer() { + if (textRenderer != null) + return textRenderer; + + if (super.getTextRenderer() != null) + return super.getTextRenderer(); + + return ClientUtil.getTextRenderer(); + } + + public ItemRenderer callGetItemRenderer() { + if (itemRenderer != null) + return itemRenderer; + + return ClientUtil.getItemRenderer(); + } } diff --git a/info.properties b/info.properties index 420b12083..aa277f59d 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.2 +mod_version=3.2.3 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 3073efef1635fb06a051de1880a2824331640e30 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 9 Apr 2025 12:23:14 +0900 Subject: [PATCH 466/622] 1211 --- .../mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index a8bcf376b..a2db9397c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -345,8 +345,8 @@ public TextRenderer callGetTextRenderer() { if (textRenderer != null) return textRenderer; - if (super.getTextRenderer() != null) - return super.getTextRenderer(); + if (super.textRenderer != null) + return super.textRenderer; return ClientUtil.getTextRenderer(); } From 31c4007f10f17974aa9a8130150b0b71ce64cfe5 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 13 Apr 2025 11:45:24 +0900 Subject: [PATCH 467/622] [cp] fix readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 064ca6afb..2726ff33e 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ dependencies { `gradle.properties`に以下のように記述してください。 ```properties -# Example: mcpitanlib_version=+1.18.2:3.0.4 +# Example: mcpitanlib_version=+1.18.2:3.2.4 mcpitanlib_version=x.x.x ``` @@ -85,7 +85,7 @@ dependencies { Write as follows in `gradle.properties`. ```properties -# Example: mcpitanlib_version=+1.18.2:2.0.1 +# Example: mcpitanlib_version=+1.18.2:3.2.4 mcpitanlib_version=+x.x.x:x.x.x ``` From 75d619a5a9be29936cfdb4d6b3b2bacbcce34e0d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 13 Apr 2025 12:00:52 +0900 Subject: [PATCH 468/622] [cp] fix cp --- .github/workflows/auto-cherry-pick.yml | 44 ++++++++++++++++++++++ .github/workflows/cherry-pick.sh | 52 ++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 .github/workflows/auto-cherry-pick.yml create mode 100644 .github/workflows/cherry-pick.sh diff --git a/.github/workflows/auto-cherry-pick.yml b/.github/workflows/auto-cherry-pick.yml new file mode 100644 index 000000000..894017d61 --- /dev/null +++ b/.github/workflows/auto-cherry-pick.yml @@ -0,0 +1,44 @@ +name: Auto Cherry-Pick +on: + push: + branches: + - "1.*" # 1.21.5, 1.21.4...のブランチでpushされたとき + pull_request: + types: + - closed # PRがmergeされたとき +jobs: + cherry-pick: + if: | + (github.event_name == 'push' || + (github.event_name == 'pull_request' && github.event.pull_request.merged == true)) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Check + id: check + run: | + COMMIT_MSG=$(git log -1 --pretty=%B) + if echo "$COMMIT_MSG" | grep -q '^\[cp\]'; then + echo "pickable=true" >> $GITHUB_ENV + fi + - name: Setup Git + if: env.pickable == 'true' + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + - name: Chmod cherry-pick.sh + if: env.pickable == 'true' + run: | + if [ ! -f .github/workflows/cherry-pick.sh ]; then + echo "cherry-pick.sh not found" + exit 1 + fi + git update-index --assume-unchanged .github/workflows/cherry-pick.sh + chmod +x .github/workflows/cherry-pick.sh + - name: Run cherry-pick.sh + if: env.pickable == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: .github/workflows/cherry-pick.sh \ No newline at end of file diff --git a/.github/workflows/cherry-pick.sh b/.github/workflows/cherry-pick.sh new file mode 100644 index 000000000..064ae6243 --- /dev/null +++ b/.github/workflows/cherry-pick.sh @@ -0,0 +1,52 @@ +#!/bin/bash +set -e + +git fetch --all +CURRENT_BRANCH="${GITHUB_REF##*/}" +SHA=$(git log -1 --pretty=format:"%H") +MSG=$(git log -1 --pretty=%B) + +echo "Current: $CURRENT_BRANCH" +echo "SHA: $SHA" + +BRANCHES=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin | grep -E '^origin/1\.' | sed 's|origin/||' | sort -Vr) + +TARGETS=() +FOUND=0 +while read -r b; do + if [ "$FOUND" = "1" ]; then + TARGETS+=("$b") + fi + if [ "$b" = "$CURRENT_BRANCH" ]; then + FOUND=1 + fi +done <<< "$BRANCHES" + +for TARGET_BRANCH in "${TARGETS[@]}"; do + if [ -z "$TARGET_BRANCH" ]; then + continue + fi + + echo "Trying to cherry-pick to $TARGET_BRANCH..." + + git reset --hard + git switch -c "$TARGET_BRANCH" "origin/$TARGET_BRANCH" + + echo "Cherry-picking $SHA from $CURRENT_BRANCH to $TARGET_BRANCH..." + if git cherry-pick "$SHA"; then + git push origin "$TARGET_BRANCH" + echo "Cherry-pick successful. Pushed to $TARGET_BRANCH." + continue + fi + + echo "Cherry-pick failed. Attempting to resolve conflicts..." + + git cherry-pick --abort + gh auth setup-git + gh pr create \ + --base "$TARGET_BRANCH" \ + --head "$CURRENT_BRANCH" \ + --title "Manual Cherry-pick needed: $SHA" \ + --body "Cherry-pick of $SHA from $CURRENT_BRANCH to $TARGET_BRANCH failed due to conflicts." + exit 0 +done \ No newline at end of file From a587186db22fe29f699844fa442b8f2a40c6b274 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 12 Apr 2025 20:47:05 +0900 Subject: [PATCH 469/622] [cp] add APIs --- .../gui/screen/SimpleHandledScreen.java | 4 + .../api/gui/slot/CompatibleSlot.java | 10 +++ .../mcpitanlib/api/util/EntityTypeUtil.java | 9 ++ .../pitan76/mcpitanlib/api/util/SlotUtil.java | 5 ++ .../mcpitanlib/api/util/WorldUtil.java | 23 +++++ .../mcpitanlib/api/util/block/BlockUtil.java | 10 +++ .../api/util/entity/ItemEntityUtil.java | 13 +++ .../api/util/entity/ThrownItemEntityUtil.java | 4 + .../mcpitanlib/api/util/math/BoxUtil.java | 4 + .../mcpitanlib/api/util/nbt/NbtListUtil.java | 88 +++++++++++++++++++ .../midohra/entity/EntityTypeWrapper.java | 56 ++++++++++++ .../midohra/entity/EntityTypes.java | 75 ++++++++++++++++ info.properties | 2 +- 13 files changed, 302 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java index a2db9397c..fd7773668 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/gui/screen/SimpleHandledScreen.java @@ -357,4 +357,8 @@ public ItemRenderer callGetItemRenderer() { return ClientUtil.getItemRenderer(); } + + public Text getPlayerInvTitle() { + return playerInventoryTitle; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java index fce0c65e2..f49db49df 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/gui/slot/CompatibleSlot.java @@ -7,8 +7,18 @@ import net.pitan76.mcpitanlib.api.entity.Player; public class CompatibleSlot extends Slot { + + public Inventory inventory; + public int index; + public int x; + public int y; + public CompatibleSlot(Inventory inventory, int index, int x, int y) { super(inventory, index, x, y); + this.inventory = inventory; + this.index = index; + this.x = x; + this.y = y; } public void callSetStack(ItemStack stack) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java index 171144592..196fb231c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityTypeUtil.java @@ -2,6 +2,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.registry.Registries; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; public class EntityTypeUtil { @@ -36,4 +37,12 @@ public static int getRawId(EntityType type) { public static EntityType fromIndex(int index) { return Registries.ENTITY_TYPE.get(index); } + + public static Text getName(EntityType entityType) { + return entityType.getName(); + } + + public static String getTranslationKey(EntityType entityType) { + return entityType.getTranslationKey(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java index 23a65c55c..018aad006 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SlotUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util; +import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; import net.pitan76.mcpitanlib.api.entity.Player; @@ -36,4 +37,8 @@ public static boolean canTakeItems(Slot slot) { public static void onTakeItem(Slot slot, Player player, ItemStack stack) { slot.onTakeItem(player.getEntity(), stack); } + + public static Inventory getInventory(Slot slot) { + return slot.inventory; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 08addcdc6..ad7a350d4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -14,6 +14,7 @@ import net.minecraft.fluid.FluidState; import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleEffect; +import net.minecraft.predicate.entity.EntityPredicates; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.server.MinecraftServer; @@ -30,6 +31,8 @@ import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.entity.EntityTypeWrapper; import net.pitan76.mcpitanlib.midohra.world.chunk.ChunkTicketType; import org.jetbrains.annotations.Nullable; @@ -384,4 +387,24 @@ public static void dropStackOnBlock(World world, BlockPos pos, ItemStack stack) public static float getSkyAngle(World world, float tickDelta) { return world.getSkyAngle(tickDelta); } + + public static Block getBlock(World world, BlockPos pos) { + return getBlockState(world, pos).getBlock(); + } + + public static BlockWrapper getBlockWrapper(World world, BlockPos pos) { + return BlockWrapper.of(getBlock(world, pos)); + } + + public static List getEntitiesByType(World world, EntityType filter, Box box) { + return getEntitiesByType(world, filter, box, EntityPredicates.VALID_ENTITY); + } + + public static List getEntitiesByType(World world, EntityTypeWrapper filter, Box box, Predicate predicate) { + return getEntitiesByType(world, (EntityType) filter.get(), box, predicate); + } + + public static List getEntitiesByType(World world, EntityTypeWrapper filter, Box box) { + return getEntitiesByType(world, filter.get(), box); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java index d0b2969be..4f1eae397 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/block/BlockUtil.java @@ -2,10 +2,12 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.pitan76.mcpitanlib.api.block.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.tag.TagKey; import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.v2.BlockUtilV2; import java.util.ArrayList; import java.util.List; @@ -222,4 +224,12 @@ public static TextComponent getName(Block block) { public static String getTranslationKey(Block block) { return block.getTranslationKey(); } + + public static Block fromItem(Item item) { + return BlockUtilV2.fromItem(item); + } + + public static Block fromItem(ItemStack stack) { + return BlockUtilV2.fromItem(stack); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java index a24cc5327..083d0d00b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java @@ -1,10 +1,15 @@ package net.pitan76.mcpitanlib.api.util.entity; +import net.minecraft.entity.EntityType; import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.util.WorldUtil; + +import java.util.List; public class ItemEntityUtil { public static ItemEntity create(World world, double x, double y, double z, ItemStack stack) { @@ -40,4 +45,12 @@ public static void setPickupDelay(ItemEntity itemEntity, int pickupDelay) { public static void setToDefaultPickupDelay(ItemEntity itemEntity) { itemEntity.setToDefaultPickupDelay(); } + + public static ItemStack getStack(ItemEntity entity) { + return entity.getStack(); + } + + public static List getEntities(World world, Box box) { + return WorldUtil.getEntitiesByType(world, EntityType.ITEM, box); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java index c883b01fe..a5416441a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java @@ -11,4 +11,8 @@ public static ItemStack getItem(ThrownItemEntity entity) { public static void setItem(ThrownItemEntity entity, ItemStack stack) { entity.setItem(stack); } + + public static ItemStack getStack(ThrownItemEntity entity) { + return entity.getStack(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java index b267f096a..aec3d4fbc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java @@ -35,4 +35,8 @@ public static Box createBox(BlockPos pos, int size) { public static Box createBox(BlockPos pos, int sizeX, int sizeY, int sizeZ) { return createBox(pos, pos.add(sizeX, sizeY, sizeZ)); } + + public static Box createBoxCenter(BlockPos pos, int size) { + return createBox(pos.add(-size, -size, -size), pos.add(size, size, size)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java new file mode 100644 index 000000000..a8f2c17e7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java @@ -0,0 +1,88 @@ +package net.pitan76.mcpitanlib.api.util.nbt; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtElement; +import net.minecraft.nbt.NbtList; +import net.pitan76.mcpitanlib.api.util.NbtUtil; + +import java.util.Optional; +import java.util.stream.Stream; + +public class NbtListUtil { + public static NbtList create() { + return NbtUtil.createNbtList(); + } + + public static NbtList copy(NbtList list) { + return list.copy(); + } + + public static Stream stream(NbtList list) { + return list.stream(); + } + + public static Optional getStringOptional(NbtList list, int index) { + return list.getString(index); + } + + public static NbtElement get(NbtList list, int index) { + return list.get(index); + } + + public static NbtElement getOrDefault(NbtList list, int index, NbtElement defaultValue) { + NbtElement nbt = get(list, index); + return nbt == null ? defaultValue : nbt; + } + + public static void set(NbtList list, int index, NbtElement value) { + list.set(index, value); + } + + public static void add(NbtList list, NbtElement value) { + list.add(value); + } + + public static void set(NbtList list, int index, String value) { + set(list, index, NbtUtil.createString(value)); + } + + public static boolean has(NbtList list, NbtElement value) { + return list.contains(value); + } + + public static int size(NbtList list) { + return list.size(); + } + + public static void remove(NbtList list, int index) { + list.remove(index); + } + + public static void clear(NbtList list) { + list.clear(); + } + + public static boolean isEmpty(NbtList list) { + return list.isEmpty(); + } + + public static String getString(NbtList list, int index) { + return getStringOptional(list, index).orElse(""); + } + + public static void setString(NbtList list, int index, String value) { + list.set(index, NbtUtil.createString(value)); + } + + public static void addString(NbtList list, String value) { + list.add(NbtUtil.createString(value)); + } + + public static NbtList getList(NbtList list, int index) { + return list.getList(index).orElse(create()); + } + + public static NbtCompound getCompound(NbtList list, int index) { + return list.getCompound(index).orElse(NbtUtil.create()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java new file mode 100644 index 000000000..bf90199bb --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java @@ -0,0 +1,56 @@ +package net.pitan76.mcpitanlib.midohra.entity; + +import net.pitan76.mcpitanlib.api.text.TextComponent; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.api.util.EntityTypeUtil; + +public class EntityTypeWrapper { + private final net.minecraft.entity.EntityType entityType; + + protected EntityTypeWrapper() { + this.entityType = null; + } + + protected EntityTypeWrapper(net.minecraft.entity.EntityType entityType) { + this.entityType = entityType; + } + + public static EntityTypeWrapper of(net.minecraft.entity.EntityType entityType) { + return new EntityTypeWrapper(entityType); + } + + public static EntityTypeWrapper of() { + return new EntityTypeWrapper(); + } + + public boolean isExist() { + return !isEmpty(); + } + + public boolean isEmpty() { + return entityType == null; + } + + public net.minecraft.entity.EntityType get() { + return entityType; + } + + public CompatIdentifier getId() { + if (isEmpty()) return CompatIdentifier.empty(); + return EntityTypeUtil.toCompatID(entityType); + } + + public TextComponent getName() { + if (isEmpty()) return TextComponent.of(""); + return new TextComponent(EntityTypeUtil.getName(entityType)); + } + + public String getTranslationKey() { + if (isEmpty()) return ""; + return EntityTypeUtil.getTranslationKey(entityType); + } + + public boolean rawEquals(EntityTypeWrapper other) { + return entityType == other.entityType; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java new file mode 100644 index 000000000..a7c65bbfe --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java @@ -0,0 +1,75 @@ +package net.pitan76.mcpitanlib.midohra.entity; + +import net.minecraft.entity.EntityType; + +public class EntityTypes { + public static final EntityTypeWrapper BOAT = EntityTypeWrapper.of(EntityType.OAK_BOAT); + public static final EntityTypeWrapper ACACIA_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ACACIA_BOAT); + public static final EntityTypeWrapper ACACIA_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ACACIA_CHEST_BOAT); + public static final EntityTypeWrapper BIRCH_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BIRCH_BOAT); + public static final EntityTypeWrapper BIRCH_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BIRCH_CHEST_BOAT); + public static final EntityTypeWrapper DARK_OAK_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.DARK_OAK_BOAT); + public static final EntityTypeWrapper DARK_OAK_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.DARK_OAK_CHEST_BOAT); + public static final EntityTypeWrapper JUNGLE_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.JUNGLE_BOAT); + public static final EntityTypeWrapper JUNGLE_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.JUNGLE_CHEST_BOAT); + public static final EntityTypeWrapper SPRUCE_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.SPRUCE_BOAT); + public static final EntityTypeWrapper SPRUCE_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.SPRUCE_CHEST_BOAT); + public static final EntityTypeWrapper FURNACE_MINECART = EntityTypeWrapper.of(net.minecraft.entity.EntityType.FURNACE_MINECART); + public static final EntityTypeWrapper HOPPER_MINECART = EntityTypeWrapper.of(net.minecraft.entity.EntityType.HOPPER_MINECART); + public static final EntityTypeWrapper MINECART = EntityTypeWrapper.of(net.minecraft.entity.EntityType.MINECART); + public static final EntityTypeWrapper TNT_MINECART = EntityTypeWrapper.of(net.minecraft.entity.EntityType.TNT_MINECART); + public static final EntityTypeWrapper CHEST_MINECART = EntityTypeWrapper.of(EntityType.CHEST_MINECART); + public static final EntityTypeWrapper HORSE = EntityTypeWrapper.of(net.minecraft.entity.EntityType.HORSE); + public static final EntityTypeWrapper LLAMA = EntityTypeWrapper.of(net.minecraft.entity.EntityType.LLAMA); + + public static final EntityTypeWrapper ITEM = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ITEM); + public static final EntityTypeWrapper ITEM_DISPLAY = EntityTypeWrapper.of(EntityType.ITEM_DISPLAY); + public static final EntityTypeWrapper ITEM_FRAME = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ITEM_FRAME); + public static final EntityTypeWrapper GLOW_ITEM_FRAME = EntityTypeWrapper.of(EntityType.GLOW_ITEM_FRAME); + public static final EntityTypeWrapper EXPERIENCE_BOTTLE = EntityTypeWrapper.of(EntityType.EXPERIENCE_BOTTLE); + public static final EntityTypeWrapper EXPERIENCE_ORB = EntityTypeWrapper.of(EntityType.EXPERIENCE_ORB); + + public static final EntityTypeWrapper SNOWBALL = EntityTypeWrapper.of(EntityType.SNOWBALL); + public static final EntityTypeWrapper FIREBALL = EntityTypeWrapper.of(EntityType.FIREBALL); + public static final EntityTypeWrapper SMALL_FIREBALL = EntityTypeWrapper.of(EntityType.SMALL_FIREBALL); + public static final EntityTypeWrapper DRAGON_FIREBALL = EntityTypeWrapper.of(EntityType.DRAGON_FIREBALL); + public static final EntityTypeWrapper FIREWORK_ROCKET = EntityTypeWrapper.of(EntityType.FIREWORK_ROCKET); + + public static final EntityTypeWrapper ALLAY = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ALLAY); + public static final EntityTypeWrapper AXOLOTL = EntityTypeWrapper.of(net.minecraft.entity.EntityType.AXOLOTL); + public static final EntityTypeWrapper BAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BAT); + public static final EntityTypeWrapper BEE = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BEE); + public static final EntityTypeWrapper BLAZE = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BLAZE); + public static final EntityTypeWrapper CAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.CAT); + public static final EntityTypeWrapper CHICKEN = EntityTypeWrapper.of(net.minecraft.entity.EntityType.CHICKEN); + public static final EntityTypeWrapper COD = EntityTypeWrapper.of(net.minecraft.entity.EntityType.COD); + public static final EntityTypeWrapper COW = EntityTypeWrapper.of(net.minecraft.entity.EntityType.COW); + public static final EntityTypeWrapper CREEPER = EntityTypeWrapper.of(net.minecraft.entity.EntityType.CREEPER); + public static final EntityTypeWrapper DOLPHIN = EntityTypeWrapper.of(net.minecraft.entity.EntityType.DOLPHIN); + public static final EntityTypeWrapper DONKEY = EntityTypeWrapper.of(net.minecraft.entity.EntityType.DONKEY); + public static final EntityTypeWrapper DROWNED = EntityTypeWrapper.of(net.minecraft.entity.EntityType.DROWNED); + public static final EntityTypeWrapper ELDER_GUARDIAN = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ELDER_GUARDIAN); + public static final EntityTypeWrapper ENDER_DRAGON = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ENDER_DRAGON); + public static final EntityTypeWrapper ENDERMAN = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ENDERMAN); + public static final EntityTypeWrapper ENDERMITE = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ENDERMITE); + public static final EntityTypeWrapper EVOKER = EntityTypeWrapper.of(net.minecraft.entity.EntityType.EVOKER); + public static final EntityTypeWrapper FOX = EntityTypeWrapper.of(net.minecraft.entity.EntityType.FOX); + public static final EntityTypeWrapper FROG = EntityTypeWrapper.of(net.minecraft.entity.EntityType.FROG); + public static final EntityTypeWrapper GHAST = EntityTypeWrapper.of(net.minecraft.entity.EntityType.GHAST); + public static final EntityTypeWrapper GIANT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.GIANT); + public static final EntityTypeWrapper GLOW_SQUID = EntityTypeWrapper.of(net.minecraft.entity.EntityType.GLOW_SQUID); + public static final EntityTypeWrapper GOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.GOAT); + public static final EntityTypeWrapper GUARDIAN = EntityTypeWrapper.of(net.minecraft.entity.EntityType.GUARDIAN); + public static final EntityTypeWrapper HUSK = EntityTypeWrapper.of(net.minecraft.entity.EntityType.HUSK); + public static final EntityTypeWrapper ILLUSIONER = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ILLUSIONER); + public static final EntityTypeWrapper IRON_GOLEM = EntityTypeWrapper.of(net.minecraft.entity.EntityType.IRON_GOLEM); + public static final EntityTypeWrapper LLAMA_SPIT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.LLAMA_SPIT); + public static final EntityTypeWrapper MAGMA_CUBE = EntityTypeWrapper.of(net.minecraft.entity.EntityType.MAGMA_CUBE); + public static final EntityTypeWrapper MARKER = EntityTypeWrapper.of(net.minecraft.entity.EntityType.MARKER); + public static final EntityTypeWrapper MOOSHROOM = EntityTypeWrapper.of(net.minecraft.entity.EntityType.MOOSHROOM); + public static final EntityTypeWrapper MULE = EntityTypeWrapper.of(net.minecraft.entity.EntityType.MULE); + public static final EntityTypeWrapper SKELETON = EntityTypeWrapper.of(net.minecraft.entity.EntityType.SKELETON); + public static final EntityTypeWrapper VILLAGER = EntityTypeWrapper.of(net.minecraft.entity.EntityType.VILLAGER); + public static final EntityTypeWrapper ZOMBIE = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ZOMBIE); + public static final EntityTypeWrapper ZOMBIE_VILLAGER = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ZOMBIE_VILLAGER); +} diff --git a/info.properties b/info.properties index aa277f59d..14a572f2f 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.3 +mod_version=3.2.4 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From f6c85189021965eeaf3e490698edb1bbda9b3591 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 13 Apr 2025 12:09:14 +0900 Subject: [PATCH 470/622] [cp] fix APIs-1214 --- .../net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java index a8f2c17e7..076e0c11f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtListUtil.java @@ -22,7 +22,10 @@ public static Stream stream(NbtList list) { } public static Optional getStringOptional(NbtList list, int index) { - return list.getString(index); + if (index < 0 || index >= list.size()) + return Optional.empty(); + + return Optional.of(list.getString(index)); } public static NbtElement get(NbtList list, int index) { @@ -79,10 +82,10 @@ public static void addString(NbtList list, String value) { } public static NbtList getList(NbtList list, int index) { - return list.getList(index).orElse(create()); + return list.getList(index); } public static NbtCompound getCompound(NbtList list, int index) { - return list.getCompound(index).orElse(NbtUtil.create()); + return list.getCompound(index); } } From ec98c6db7d6a06579b60aff4ab46e10fafa44491 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 13 Apr 2025 13:11:43 +0900 Subject: [PATCH 471/622] [cp] fix boat --- .../midohra/entity/EntityTypes.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java index a7c65bbfe..c4a866ef0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypes.java @@ -3,17 +3,17 @@ import net.minecraft.entity.EntityType; public class EntityTypes { - public static final EntityTypeWrapper BOAT = EntityTypeWrapper.of(EntityType.OAK_BOAT); - public static final EntityTypeWrapper ACACIA_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ACACIA_BOAT); - public static final EntityTypeWrapper ACACIA_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.ACACIA_CHEST_BOAT); - public static final EntityTypeWrapper BIRCH_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BIRCH_BOAT); - public static final EntityTypeWrapper BIRCH_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BIRCH_CHEST_BOAT); - public static final EntityTypeWrapper DARK_OAK_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.DARK_OAK_BOAT); - public static final EntityTypeWrapper DARK_OAK_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.DARK_OAK_CHEST_BOAT); - public static final EntityTypeWrapper JUNGLE_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.JUNGLE_BOAT); - public static final EntityTypeWrapper JUNGLE_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.JUNGLE_CHEST_BOAT); - public static final EntityTypeWrapper SPRUCE_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.SPRUCE_BOAT); - public static final EntityTypeWrapper SPRUCE_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.SPRUCE_CHEST_BOAT); + public static final EntityTypeWrapper BOAT = EntityTypeWrapper.of(EntityType.BOAT); + public static final EntityTypeWrapper ACACIA_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BOAT); + public static final EntityTypeWrapper ACACIA_CHEST_BOAT = EntityTypeWrapper.of(EntityType.CHEST_BOAT); + public static final EntityTypeWrapper BIRCH_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BOAT); + public static final EntityTypeWrapper BIRCH_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.CHEST_BOAT); + public static final EntityTypeWrapper DARK_OAK_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BOAT); + public static final EntityTypeWrapper DARK_OAK_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.CHEST_BOAT); + public static final EntityTypeWrapper JUNGLE_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BOAT); + public static final EntityTypeWrapper JUNGLE_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.CHEST_BOAT); + public static final EntityTypeWrapper SPRUCE_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.BOAT); + public static final EntityTypeWrapper SPRUCE_CHEST_BOAT = EntityTypeWrapper.of(net.minecraft.entity.EntityType.CHEST_BOAT); public static final EntityTypeWrapper FURNACE_MINECART = EntityTypeWrapper.of(net.minecraft.entity.EntityType.FURNACE_MINECART); public static final EntityTypeWrapper HOPPER_MINECART = EntityTypeWrapper.of(net.minecraft.entity.EntityType.HOPPER_MINECART); public static final EntityTypeWrapper MINECART = EntityTypeWrapper.of(net.minecraft.entity.EntityType.MINECART); From 4f229ab34f58e614676957cffd3212ace3356d0b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 13 Apr 2025 14:27:20 +0900 Subject: [PATCH 472/622] [cp] add note --- README.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2726ff33e..d1b8fb516 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ MCPitanLibはライブラリです。 1つのjarで複数のMCバージョンを - [FabricMC](https://fabricmc.net/) - [Minecraft Forge](https://files.minecraftforge.net/) - [NeoForge](https://neoforged.net/) -- [Architectury API (CurseForge)](https://www.curseforge.com/minecraft/mc-mods/architectury-api) +- Architectury API ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/architectury-api) | [Modrinth](https://modrinth.com/mod/architectury-api)) ### ダウンロード - [CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) @@ -56,7 +56,7 @@ I am creating it for my own use, so I don't expect others to use it much.
- [FabricMC](https://fabricmc.net/) - [Minecraft Forge](https://files.minecraftforge.net/) - [NeoForge](https://neoforged.net/) -- [Architectury API (CurseForge)](https://www.curseforge.com/minecraft/mc-mods/architectury-api) +- [Architectury API](https://www.curseforge.com/minecraft/mc-mods/architectury-api) ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/architectury-api) | [Modrinth](https://modrinth.com/mod/architectury-api)) ### Download - [CurseForge](https://www.curseforge.com/minecraft/mc-mods/mcpitanlibarch) @@ -93,3 +93,9 @@ Please check the version at [maven.pitan76.net](https://maven.pitan76.net/net/pi For MOD development using MCPitanLib, refer to "common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java". +## Note +### Auto Cherry-Pick (GitHub Actions) +コミットメッセージに [cp] を含むと、Actionsで自動的にCherry-Pickを行います。
+そのコミットしたブランチからそれより下位のバージョンのブランチにCherry-Pickし、コンフリを起こした場合はそこで停止し、PRを作成します。
+今のところ、そのPRは使えないので閉じる必要があります。(今後はissueにする予定です。) + From ec1f6d8ebc44b6b2812ca7ebf5aa4c496073c58b Mon Sep 17 00:00:00 2001 From: Pitan <58260965+PTOM76@users.noreply.github.com> Date: Sun, 13 Apr 2025 22:56:17 +0900 Subject: [PATCH 473/622] [cp] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1b8fb516..41a567d5a 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ dependencies { `gradle.properties`に以下のように記述してください。 ```properties # Example: mcpitanlib_version=+1.18.2:3.2.4 -mcpitanlib_version=x.x.x +mcpitanlib_version=+x.x.x:x.x.x ``` バージョンは[maven.pitan76.net](https://maven.pitan76.net/net/pitan76/)で確認してください。 From edd1d6c5cb7513e4aed35890fc6b7ff2be59f42f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 15 Apr 2025 10:26:23 +0900 Subject: [PATCH 474/622] [cp] add RenderUtil v2 --- .../mcpitanlib/api/util/client/v2/RenderUtil.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/RenderUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/RenderUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/RenderUtil.java new file mode 100644 index 000000000..cc3313a48 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/RenderUtil.java @@ -0,0 +1,9 @@ +package net.pitan76.mcpitanlib.api.util.client.v2; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class RenderUtil extends net.pitan76.mcpitanlib.api.util.client.RenderUtil { + public static void setShaderTexture(int texture, CompatIdentifier id) { + setShaderTexture(texture, id.toMinecraft()); + } +} From aea004e20c3d5eed4cb3f325d7c27fe33d33a32a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 16 Apr 2025 23:51:01 +0900 Subject: [PATCH 475/622] [cp] change readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 41a567d5a..d06519293 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # MCPitanLib +## License +- MIT License + ## 日本語 MCPitanLibはライブラリです。 1つのjarで複数のMCバージョンを対応させるためのものです。
開発中であるため、予告なく仕様が変更されることがあったり、不具合があるかもしれません。
From d12f047fe7500f31d39903a55f76bf3dcd88db2c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 17 Apr 2025 00:01:53 +0900 Subject: [PATCH 476/622] [cp] add api to ItemEntityUtil --- .../mcpitanlib/api/util/entity/ItemEntityUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java index 083d0d00b..4562d3619 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ItemEntityUtil.java @@ -53,4 +53,16 @@ public static ItemStack getStack(ItemEntity entity) { public static List getEntities(World world, Box box) { return WorldUtil.getEntitiesByType(world, EntityType.ITEM, box); } + + public static ItemEntity createWithSpawn(World world, ItemStack stack, double x, double y, double z) { + ItemEntity itemEntity = create(world, x, y, z, stack); + setToDefaultPickupDelay(itemEntity); + setVelocity(itemEntity, 0.0D, 0.0D, 0.0D); + WorldUtil.spawnEntity(world, itemEntity); + return itemEntity; + } + + public static ItemEntity createWithSpawn(World world, ItemStack stack, BlockPos pos) { + return createWithSpawn(world, stack, pos.getX(), pos.getY(), pos.getZ()); + } } From ad2e4691fcdef9412d9472f2df6fc02f766d30df Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Apr 2025 00:10:59 +0900 Subject: [PATCH 477/622] [cp] add method to ItemBuilder --- .../midohra/easybuilder/ItemBuilder.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java index d503dc624..17b942291 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java @@ -7,6 +7,7 @@ import net.pitan76.mcpitanlib.api.item.v2.ItemSettingsBuilder; import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; +import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.CompatRarity; @@ -15,6 +16,8 @@ import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; +import java.util.ArrayList; +import java.util.List; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -144,4 +147,22 @@ public ItemBuilder onItemBarStep(Function onItemBarSte this.onItemBarStep = onItemBarStep; return this; } + + private final List tooltip = new ArrayList<>(); + + public ItemBuilder addTooltip(TextComponent text) { + if (tooltip.isEmpty()) + onAppendTooltip = e -> e.getTooltip().add(text.getText()); + else { + onAppendTooltip = e -> { + for (TextComponent t : tooltip) { + e.getTooltip().add(t.getText()); + } + e.getTooltip().add(text.getText()); + }; + } + + this.tooltip.add(text); + return this; + } } From adea3fbdf6a5a2283d6dc7957db66d01337152d9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Apr 2025 14:29:03 +0900 Subject: [PATCH 478/622] [cp] fix builder --- .../midohra/easybuilder/BlockBuilder.java | 30 +++++++++++++++++++ .../midohra/easybuilder/ItemBuilder.java | 13 ++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index 4ac919323..62790f0bc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -2,6 +2,7 @@ import net.minecraft.item.Item; import net.minecraft.util.shape.VoxelShape; +import net.pitan76.mcpitanlib.api.CommonModInitializer; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; import net.pitan76.mcpitanlib.api.block.ExtendBlock; @@ -19,6 +20,7 @@ import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; import net.pitan76.mcpitanlib.api.sound.CompatBlockSoundGroup; +import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.color.CompatDyeColor; @@ -31,6 +33,8 @@ import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; import org.jetbrains.annotations.Nullable; +import java.util.ArrayList; +import java.util.List; import java.util.function.*; public class BlockBuilder { @@ -79,6 +83,14 @@ public SupplierBlockWrapper build(CompatRegistryV2 registry, CompatIdentifier id return SupplierBlockWrapper.of(result::get); } + public SupplierBlockWrapper build(CommonModInitializer initializer) { + return build(initializer.registry); + } + + public SupplierBlockWrapper build(CommonModInitializer initializer, CompatIdentifier id) { + return build(initializer.registry, id); + } + public Pair buildWithItem(CompatRegistryV2 registry, CompatibleItemSettings settings) { SupplierBlockWrapper block = build(registry); @@ -211,4 +223,22 @@ public BlockBuilder setDefaultState(BlockState defaultState) { this.defaultState = defaultState; return this; } + + private final List tooltip = new ArrayList<>(); + + public BlockBuilder addTooltip(TextComponent text) { + if (tooltip.isEmpty()) { + onAppendTooltip = e -> e.getTooltip().add(text.getText()); + } else { + onAppendTooltip = e -> { + for (TextComponent t : tooltip) { + e.getTooltip().add(t.getText()); + } + e.getTooltip().add(text.getText()); + }; + } + + this.tooltip.add(text); + return this; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java index 17b942291..a7fee868a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; +import net.pitan76.mcpitanlib.api.CommonModInitializer; import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; @@ -63,6 +64,14 @@ public SupplierItemWrapper build(CompatRegistryV2 registry, CompatIdentifier id) return SupplierItemWrapper.of(result::get); } + public SupplierItemWrapper build(CommonModInitializer initializer) { + return build(initializer.registry); + } + + public SupplierItemWrapper build(CommonModInitializer initializer, CompatIdentifier id) { + return build(initializer.registry, id); + } + public ItemBuilder maxCount(int maxCount) { settingsBuilder.maxCount(maxCount); return this; @@ -151,9 +160,9 @@ public ItemBuilder onItemBarStep(Function onItemBarSte private final List tooltip = new ArrayList<>(); public ItemBuilder addTooltip(TextComponent text) { - if (tooltip.isEmpty()) + if (tooltip.isEmpty()) { onAppendTooltip = e -> e.getTooltip().add(text.getText()); - else { + } else { onAppendTooltip = e -> { for (TextComponent t : tooltip) { e.getTooltip().add(t.getText()); From 39042ed823e0de32324ce3aa3968609eaa3aa10e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Apr 2025 14:31:09 +0900 Subject: [PATCH 479/622] [cp] fix builder --- .../mcpitanlib/midohra/easybuilder/BlockBuilder.java | 8 ++++++++ .../midohra/easybuilder/BlockWithBlockEntityBuilder.java | 9 +++++++++ 2 files changed, 17 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index 62790f0bc..71c614fe2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -107,6 +107,14 @@ public Pair buildWithItem(CompatRegis return Pair.of(block, SupplierItemWrapper.of(result::get)); } + public Pair buildWithItem(CommonModInitializer initializer, CompatibleItemSettings settings) { + return buildWithItem(initializer.registry, settings); + } + + public Pair buildWithItem(CommonModInitializer initializer, CompatIdentifier id, CompatibleItemSettings settings) { + return buildWithItem(initializer.registry, id, settings); + } + public BlockBuilder material(CompatibleMaterial material) { settingsBuilder.material(material); return this; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java index 651b16a5c..283478bd3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.CommonModInitializer; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.block.v2.BlockSettingsBuilder; import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; @@ -49,6 +50,14 @@ public SupplierBlockWrapper build(CompatRegistryV2 registry, CompatIdentifier id return SupplierBlockWrapper.of(result::get); } + public SupplierBlockWrapper build(CommonModInitializer initializer) { + return build(initializer.registry); + } + + public SupplierBlockWrapper build(CommonModInitializer initializer, CompatIdentifier id) { + return build(initializer.registry, id); + } + public static BlockWithBlockEntityBuilder of(CompatIdentifier id) { return new BlockWithBlockEntityBuilder(id); } From 3c5c4771a9dd35e897d7a74e13d1e6d3b3081eb2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Apr 2025 14:32:51 +0900 Subject: [PATCH 480/622] [cp] move to built package --- .../pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java | 1 + .../midohra/easybuilder/BlockWithBlockEntityBuilder.java | 1 + .../pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java | 1 + .../mcpitanlib/midohra/easybuilder/{ => built}/BuiltBlock.java | 3 ++- .../midohra/easybuilder/{ => built}/BuiltBlockWithEntity.java | 3 ++- .../mcpitanlib/midohra/easybuilder/{ => built}/BuiltItem.java | 3 ++- 6 files changed, 9 insertions(+), 3 deletions(-) rename common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/{ => built}/BuiltBlock.java (97%) rename common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/{ => built}/BuiltBlockWithEntity.java (88%) rename common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/{ => built}/BuiltItem.java (95%) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index 71c614fe2..fd8a26ddc 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -30,6 +30,7 @@ import net.pitan76.mcpitanlib.midohra.block.BlockState; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; +import net.pitan76.mcpitanlib.midohra.easybuilder.built.BuiltBlock; import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java index 283478bd3..839bbda1f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java @@ -8,6 +8,7 @@ import net.pitan76.mcpitanlib.api.util.BlockEntityTypeUtil; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; +import net.pitan76.mcpitanlib.midohra.easybuilder.built.BuiltBlockWithEntity; import java.util.function.Supplier; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java index a7fee868a..e435ae37e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java @@ -13,6 +13,7 @@ import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.CompatRarity; import net.pitan76.mcpitanlib.api.util.StackActionResult; +import net.pitan76.mcpitanlib.midohra.easybuilder.built.BuiltItem; import net.pitan76.mcpitanlib.midohra.item.ItemGroupWrapper; import net.pitan76.mcpitanlib.midohra.item.ItemWrapper; import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlock.java similarity index 97% rename from common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java rename to common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlock.java index ea68267c5..3fca28d2a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlock.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.midohra.easybuilder; +package net.pitan76.mcpitanlib.midohra.easybuilder.built; import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; @@ -16,6 +16,7 @@ import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.easybuilder.BlockBuilder; import org.jetbrains.annotations.Nullable; import java.util.function.Consumer; diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlockWithEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockWithEntity.java similarity index 88% rename from common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlockWithEntity.java rename to common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockWithEntity.java index d82ae53ff..9a83d588b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltBlockWithEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockWithEntity.java @@ -1,10 +1,11 @@ -package net.pitan76.mcpitanlib.midohra.easybuilder; +package net.pitan76.mcpitanlib.midohra.easybuilder.built; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; import net.pitan76.mcpitanlib.api.block.ExtendBlockEntityProvider; import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.easybuilder.BlockWithBlockEntityBuilder; import org.jetbrains.annotations.Nullable; public class BuiltBlockWithEntity extends BuiltBlock implements ExtendBlockEntityProvider { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltItem.java similarity index 95% rename from common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java rename to common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltItem.java index 7e8dec9a9..bd7ff8330 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BuiltItem.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltItem.java @@ -1,4 +1,4 @@ -package net.pitan76.mcpitanlib.midohra.easybuilder; +package net.pitan76.mcpitanlib.midohra.easybuilder.built; import net.pitan76.mcpitanlib.api.event.item.*; import net.pitan76.mcpitanlib.api.item.v2.CompatItem; @@ -6,6 +6,7 @@ import net.pitan76.mcpitanlib.api.util.CompatActionResult; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.StackActionResult; +import net.pitan76.mcpitanlib.midohra.easybuilder.ItemBuilder; import java.util.function.Consumer; import java.util.function.Function; From d4ea5e22b634cad0953cd4a80e717708e73d6aed Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Apr 2025 14:52:02 +0900 Subject: [PATCH 481/622] [cp] add share --- .../easybuilder/share/AbstractShare.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java new file mode 100644 index 000000000..9c6d93edf --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java @@ -0,0 +1,24 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder.share; + +public class AbstractShare { + + public T obj; + public S args; + + public AbstractShare(T object, S args) { + this.obj = object; + this.args = args; + } + + public T getObject() { + return obj; + } + + public S getArgs() { + return args; + } + + public boolean hasArgs() { + return args != null; + } +} From c76ad972d0f5e397218c0fdd1e7cc368ebc9a6e0 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Apr 2025 16:31:51 +0900 Subject: [PATCH 482/622] [cp] rename isExit to isPresent --- .../net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java | 6 +++--- .../mcpitanlib/midohra/block/entity/BlockEntityWrapper.java | 6 +++++- .../pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java | 2 +- .../net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java index b75bc3ad4..fa1618e11 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java @@ -32,17 +32,17 @@ public static BlockWrapper of(CompatIdentifier id) { } public static BlockWrapper of(CompatIdentifier id, CompatIdentifier... ids) { - if (of(id).isExist()) return of(id); + if (of(id).isPresent()) return of(id); for (CompatIdentifier id1 : ids) { - if (of(id1).isExist()) + if (of(id1).isPresent()) return of(id1); } return of(); } - public boolean isExist() { + public boolean isPresent() { return !isEmpty(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java index e2c94d201..5b3ab35a0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityWrapper.java @@ -14,6 +14,10 @@ public class BlockEntityWrapper { public static final BlockEntityWrapper EMPTY = new BlockEntityWrapper(null); + protected BlockEntityWrapper() { + this.blockEntity = null; + } + protected BlockEntityWrapper(net.minecraft.block.entity.BlockEntity blockEntity) { this.blockEntity = blockEntity; } @@ -34,7 +38,7 @@ public BlockPos getPos() { return BlockPos.of(get().getPos()); } - public boolean isExist() { + public boolean isPresent() { return !isEmpty(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java index 8bab1ef4c..2773aaa7a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemGroupWrapper.java @@ -29,7 +29,7 @@ public static ItemGroupWrapper of() { return new ItemGroupWrapper(); } - public boolean isExist() { + public boolean isPresent() { return !isEmpty(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java index 7b648b1ea..c16fc5f0f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/item/ItemWrapper.java @@ -33,17 +33,17 @@ public static ItemWrapper of(CompatIdentifier id) { } public static ItemWrapper of(CompatIdentifier id, CompatIdentifier... ids) { - if (of(id).isExist()) return of(id); + if (of(id).isPresent()) return of(id); for (CompatIdentifier id1 : ids) { - if (of(id1).isExist()) + if (of(id1).isPresent()) return of(id1); } return of(); } - public boolean isExist() { + public boolean isPresent() { return !isEmpty(); } From 9353edd9bf3a250410bbe1f8844e191f76b4391d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Apr 2025 17:14:10 +0900 Subject: [PATCH 483/622] [cp] add BlockEntityBuilder --- .../block/entity/BlockEntityTypeWrapper.java | 58 +++++++++++++++ .../RewritableBlockEntityTypeWrapper.java | 32 +++++++++ .../SupplierBlockEntityTypeWrapper.java | 27 +++++++ .../entity/SupplierBlockEntityWrapper.java | 27 +++++++ .../easybuilder/BlockEntityBuilder.java | 72 +++++++++++++++++++ .../easybuilder/built/BuiltBlockEntity.java | 65 +++++++++++++++++ .../easybuilder/share/AbstractShare.java | 24 ------- 7 files changed, 281 insertions(+), 24 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityTypeWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/RewritableBlockEntityTypeWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityTypeWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityWrapper.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockEntity.java delete mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityTypeWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityTypeWrapper.java new file mode 100644 index 000000000..0a066a984 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/BlockEntityTypeWrapper.java @@ -0,0 +1,58 @@ +package net.pitan76.mcpitanlib.midohra.block.entity; + +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.BlockView; + +public class BlockEntityTypeWrapper { + private final net.minecraft.block.entity.BlockEntityType type; + + public static final BlockEntityTypeWrapper EMPTY = new BlockEntityTypeWrapper(); + + protected BlockEntityTypeWrapper() { + this.type = null; + } + + protected BlockEntityTypeWrapper(net.minecraft.block.entity.BlockEntityType blockEntity) { + this.type = blockEntity; + } + + public static BlockEntityTypeWrapper of(net.minecraft.block.entity.BlockEntityType blockEntity) { + return new BlockEntityTypeWrapper(blockEntity); + } + + public static BlockEntityTypeWrapper of() { + return EMPTY; + } + + public net.minecraft.block.entity.BlockEntityType get() { + return type; + } + + public boolean isEmpty() { + return get() == null; + } + + public boolean isPresent() { + return get() != null; + } + + public boolean supports(BlockState state) { + return isPresent() && get().supports(state.toMinecraft()); + } + + public BlockEntityWrapper getBlockEntity(BlockView world, BlockPos pos) { + if (isEmpty()) + return BlockEntityWrapper.EMPTY; + + return SupplierBlockEntityWrapper.of(get().get(world.getRaw(), pos.toMinecraft())); + } + + public BlockEntityWrapper createBlockEntity(TileCreateEvent e) { + if (isEmpty()) + return BlockEntityWrapper.EMPTY; + + return SupplierBlockEntityWrapper.of(get().instantiate(e.getBlockPos(), e.getBlockState())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/RewritableBlockEntityTypeWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/RewritableBlockEntityTypeWrapper.java new file mode 100644 index 000000000..c8f5b38cf --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/RewritableBlockEntityTypeWrapper.java @@ -0,0 +1,32 @@ +package net.pitan76.mcpitanlib.midohra.block.entity; + +import net.minecraft.block.entity.BlockEntityType; + +public class RewritableBlockEntityTypeWrapper extends BlockEntityTypeWrapper { + private BlockEntityType type; + + protected RewritableBlockEntityTypeWrapper(BlockEntityType type) { + this.type = type; + } + + protected RewritableBlockEntityTypeWrapper() { + + } + + public static RewritableBlockEntityTypeWrapper of(BlockEntityType type) { + return new RewritableBlockEntityTypeWrapper(type); + } + + public static RewritableBlockEntityTypeWrapper of() { + return new RewritableBlockEntityTypeWrapper(); + } + + public void set(BlockEntityType type) { + this.type = type; + } + + @Override + public BlockEntityType get() { + return type; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityTypeWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityTypeWrapper.java new file mode 100644 index 000000000..c0ea96ed4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityTypeWrapper.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.midohra.block.entity; + +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; + +import java.util.function.Supplier; + +public class SupplierBlockEntityTypeWrapper extends BlockEntityTypeWrapper { + private final Supplier> supplier; + + protected SupplierBlockEntityTypeWrapper(Supplier> supplier) { + this.supplier = supplier; + } + + public static SupplierBlockEntityTypeWrapper of(Supplier> supplier) { + return new SupplierBlockEntityTypeWrapper(supplier); + } + + public static SupplierBlockEntityTypeWrapper of(RegistryResult> result) { + return new SupplierBlockEntityTypeWrapper(result::get); + } + + @Override + public BlockEntityType get() { + return supplier.get(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityWrapper.java new file mode 100644 index 000000000..202a0d31a --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/entity/SupplierBlockEntityWrapper.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.midohra.block.entity; + +import net.minecraft.block.entity.BlockEntity; +import net.pitan76.mcpitanlib.api.registry.result.RegistryResult; + +import java.util.function.Supplier; + +public class SupplierBlockEntityWrapper extends BlockEntityWrapper { + private final Supplier supplier; + + protected SupplierBlockEntityWrapper(Supplier supplier) { + this.supplier = supplier; + } + + public static SupplierBlockEntityWrapper of(Supplier supplier) { + return new SupplierBlockEntityWrapper(supplier); + } + + public static SupplierBlockEntityWrapper of(RegistryResult result) { + return new SupplierBlockEntityWrapper(result::get); + } + + @Override + public BlockEntity get() { + return supplier.get(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java new file mode 100644 index 000000000..2405c1dd6 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java @@ -0,0 +1,72 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder; + +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.registry.result.SupplierResult; +import net.pitan76.mcpitanlib.api.registry.v2.CompatRegistryV2; +import net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityTypeWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.RewritableBlockEntityTypeWrapper; +import net.pitan76.mcpitanlib.midohra.easybuilder.built.BuiltBlockEntity; + +import java.util.Arrays; +import java.util.function.BiConsumer; + +public class BlockEntityBuilder { + + public BiConsumer onWriteNbt; + public BiConsumer onReadNbt; + public BiConsumer onInit; + + public CompatIdentifier id; + + public BlockEntityBuilder(CompatIdentifier id) { + this.id = id; + } + + public static BlockEntityBuilder of(CompatIdentifier id) { + return new BlockEntityBuilder(id); + } + + public BlockEntityTypeWrapper build(CompatRegistryV2 registry, CompatIdentifier id, BlockWrapper... blocks) { + RewritableBlockEntityTypeWrapper type = RewritableBlockEntityTypeWrapper.of(); + BlockEntityBuilder builder = this; + + SupplierResult> result = registry.registerBlockEntityType(id, BlockEntityTypeBuilder.create( + e -> new BuiltBlockEntity(type, builder, e), + Arrays.stream(blocks).map(BlockWrapper::get).toArray(Block[]::new) + )); + + type.set(result.get()); + + return type; + } + + public BlockEntityTypeWrapper build(CompatRegistryV2 registry, BlockWrapper... blocks) { + if (id == null) + throw new IllegalStateException("BlockEntity id is not set. hint: use build(CompatRegistryV2, CompatIdentifier, BlockWrapper...)"); + + return build(registry, id, blocks); + } + + public BlockEntityBuilder onInit(BiConsumer onInit) { + this.onInit = onInit; + return this; + } + + public BlockEntityBuilder onWriteNbt(BiConsumer onWriteNbt) { + this.onWriteNbt = onWriteNbt; + return this; + } + + public BlockEntityBuilder onReadNbt(BiConsumer onReadNbt) { + this.onReadNbt = onReadNbt; + return this; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockEntity.java new file mode 100644 index 000000000..4143b69e7 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockEntity.java @@ -0,0 +1,65 @@ +package net.pitan76.mcpitanlib.midohra.easybuilder.built; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.api.event.block.TileCreateEvent; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityTypeWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.easybuilder.BlockEntityBuilder; + +import java.util.function.BiConsumer; + +public class BuiltBlockEntity extends CompatBlockEntity { + + public BiConsumer onWriteNbt; + public BiConsumer onReadNbt; + + public BuiltBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + } + + public BuiltBlockEntity(BlockEntityType type, TileCreateEvent e) { + super(type, e); + } + + public BuiltBlockEntity(BlockEntityTypeWrapper type, TileCreateEvent e) { + super(type.get(), e); + } + + public BuiltBlockEntity(BlockEntityTypeWrapper type, BlockEntityBuilder builder, TileCreateEvent e) { + this(type, e); + init(builder); + } + + protected void init(BlockEntityBuilder builder) { + this.onWriteNbt = builder.onWriteNbt; + this.onReadNbt = builder.onReadNbt; + + if (builder.onInit != null) + builder.onInit.accept(_wrap(), builder); + } + + @Override + public void writeNbt(WriteNbtArgs args) { + super.writeNbt(args); + if (onWriteNbt != null) { + onWriteNbt.accept(_wrap(), args); + } + } + + @Override + public void readNbt(ReadNbtArgs args) { + super.readNbt(args); + if (onReadNbt != null) { + onReadNbt.accept(_wrap(), args); + } + } + + public BlockEntityWrapper _wrap() { + return BlockEntityWrapper.of(this); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java deleted file mode 100644 index 9c6d93edf..000000000 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/share/AbstractShare.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.pitan76.mcpitanlib.midohra.easybuilder.share; - -public class AbstractShare { - - public T obj; - public S args; - - public AbstractShare(T object, S args) { - this.obj = object; - this.args = args; - } - - public T getObject() { - return obj; - } - - public S getArgs() { - return args; - } - - public boolean hasArgs() { - return args != null; - } -} From adb0e5b705ee715a9793bd2778375edd61e1b814 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 22 Apr 2025 20:01:18 +0900 Subject: [PATCH 484/622] [cp] add api to block builder --- .../midohra/easybuilder/BlockBuilder.java | 14 ++++++++++++++ .../midohra/easybuilder/built/BuiltBlock.java | 12 ++++++++++++ 2 files changed, 26 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index fd8a26ddc..ffc16e8c3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -14,6 +14,7 @@ import net.pitan76.mcpitanlib.api.block.v2.BlockSettingsBuilder; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; +import net.pitan76.mcpitanlib.api.event.block.DroppedStacksArgs; import net.pitan76.mcpitanlib.api.event.block.StateReplacedEvent; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.item.v2.CompatibleItemSettings; @@ -31,6 +32,7 @@ import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; import net.pitan76.mcpitanlib.midohra.easybuilder.built.BuiltBlock; +import net.pitan76.mcpitanlib.midohra.item.ItemStack; import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; import org.jetbrains.annotations.Nullable; @@ -52,6 +54,7 @@ public class BlockBuilder { public Function onRenderType; public Function onPlacementState; public Function onStateForNeighborUpdate; + public Function> onDroppedStacks; public BlockBuilder(BlockSettingsBuilder settingsBuilder) { this.settingsBuilder = settingsBuilder; @@ -250,4 +253,15 @@ public BlockBuilder addTooltip(TextComponent text) { this.tooltip.add(text); return this; } + + public BlockBuilder onDroppedStacksRaw(Function> onDroppedStacks) { + this.onDroppedStacks = onDroppedStacks; + return this; + } + + public BlockBuilder onDroppedStacks(Function> onDroppedStacks) { + return onDroppedStacksRaw(e -> onDroppedStacks.apply(e).stream() + .map(ItemStack::toMinecraft) + .toList()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlock.java index 3fca28d2a..c74686013 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlock.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.midohra.easybuilder.built; +import net.minecraft.item.ItemStack; import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; @@ -11,6 +12,7 @@ import net.pitan76.mcpitanlib.api.block.v2.CompatibleBlockSettings; import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; import net.pitan76.mcpitanlib.api.event.block.BlockUseEvent; +import net.pitan76.mcpitanlib.api.event.block.DroppedStacksArgs; import net.pitan76.mcpitanlib.api.event.block.StateReplacedEvent; import net.pitan76.mcpitanlib.api.event.item.ItemAppendTooltipEvent; import net.pitan76.mcpitanlib.api.util.CompatActionResult; @@ -19,6 +21,7 @@ import net.pitan76.mcpitanlib.midohra.easybuilder.BlockBuilder; import org.jetbrains.annotations.Nullable; +import java.util.List; import java.util.function.Consumer; import java.util.function.Function; @@ -33,6 +36,7 @@ public class BuiltBlock extends CompatBlock { protected Function onRenderType; protected Function onPlacementState; protected Function onStateForNeighborUpdate; + protected Function> onDroppedStacks; public BuiltBlock(CompatibleBlockSettings settings) { super(settings); @@ -131,4 +135,12 @@ public BlockState getStateForNeighborUpdate(StateForNeighborUpdateArgs args) { return super.getStateForNeighborUpdate(args); } + + @Override + public List getDroppedStacks(DroppedStacksArgs args) { + if (onDroppedStacks != null) + return onDroppedStacks.apply(args); + + return super.getDroppedStacks(args); + } } From b4351f4cc2bc3efb34f9ac51122bd3a43621df2f Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 22 Apr 2025 20:08:15 +0900 Subject: [PATCH 485/622] [cp] fix api to block builder --- .../midohra/easybuilder/BlockBuilder.java | 24 +++++- .../midohra/util/shape/VoxelShape.java | 76 +++++++++++++++++++ 2 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/shape/VoxelShape.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index ffc16e8c3..53625f5f5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -1,7 +1,6 @@ package net.pitan76.mcpitanlib.midohra.easybuilder; import net.minecraft.item.Item; -import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.CommonModInitializer; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.CompatibleMaterial; @@ -34,6 +33,7 @@ import net.pitan76.mcpitanlib.midohra.easybuilder.built.BuiltBlock; import net.pitan76.mcpitanlib.midohra.item.ItemStack; import net.pitan76.mcpitanlib.midohra.item.SupplierItemWrapper; +import net.pitan76.mcpitanlib.midohra.util.shape.VoxelShape; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -49,8 +49,8 @@ public class BlockBuilder { public Consumer onAppendProperties; public BlockState defaultState; public BiConsumer onInit; - public Function onOutlineShape; - public Function onCollisionShape; + public Function onOutlineShape; + public Function onCollisionShape; public Function onRenderType; public Function onPlacementState; public Function onStateForNeighborUpdate; @@ -190,11 +190,19 @@ public BlockBuilder onAppendProperties(Consumer onAppendPr } public BlockBuilder onOutlineShape(Function onOutlineShape) { + return onOutlineShapeRaw(e -> onOutlineShape.apply(e).raw()); + } + + public BlockBuilder onCollisionShape(Function onCollisionShape) { + return onCollisionShapeRaw(e -> onCollisionShape.apply(e).raw()); + } + + public BlockBuilder onOutlineShapeRaw(Function onOutlineShape) { this.onOutlineShape = onOutlineShape; return this; } - public BlockBuilder onCollisionShape(Function onCollisionShape) { + public BlockBuilder onCollisionShapeRaw(Function onCollisionShape) { this.onCollisionShape = onCollisionShape; return this; } @@ -222,6 +230,14 @@ public BlockBuilder setCollisionShape(VoxelShape shape) { return onCollisionShape(e -> shape); } + public BlockBuilder setOutlineShape(net.minecraft.util.shape.VoxelShape shape) { + return onOutlineShapeRaw(e -> shape); + } + + public BlockBuilder setCollisionShape(net.minecraft.util.shape.VoxelShape shape) { + return onCollisionShapeRaw(e -> shape); + } + public BlockBuilder setRenderType(CompatBlockRenderType renderType) { return onRenderType(e -> renderType); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/shape/VoxelShape.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/shape/VoxelShape.java new file mode 100644 index 000000000..a0e536955 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/shape/VoxelShape.java @@ -0,0 +1,76 @@ +package net.pitan76.mcpitanlib.midohra.util.shape; + +import net.pitan76.mcpitanlib.midohra.util.math.Direction; + +public class VoxelShape { + private final net.minecraft.util.shape.VoxelShape voxelShape; + + public static final VoxelShape EMPTY = of(net.minecraft.util.shape.VoxelShapes.empty()); + public static final VoxelShape FULL_CUBE = of(net.minecraft.util.shape.VoxelShapes.fullCube()); + + public VoxelShape(net.minecraft.util.shape.VoxelShape voxelShape) { + this.voxelShape = voxelShape; + } + + public static VoxelShape of(net.minecraft.util.shape.VoxelShape shape) { + return new VoxelShape(shape); + } + + @Deprecated + public net.minecraft.util.shape.VoxelShape raw() { + return voxelShape; + } + + public boolean isEmpty() { + return raw().isEmpty(); + } + + public VoxelShape union(VoxelShape other) { + return of(net.minecraft.util.shape.VoxelShapes.union(this.raw(), other.raw())); + } + + public VoxelShape asCuboid() { + return of(raw().asCuboid()); + } + + public VoxelShape offset(double x, double y, double z) { + return of(raw().offset(x, y, z)); + } + + public VoxelShape getFace(Direction direction) { + return of(raw().getFace(direction.toMinecraft())); + } + + public VoxelShape simplify() { + return of(raw().simplify()); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof VoxelShape)) return false; + VoxelShape other = (VoxelShape) obj; + return this.raw().equals(other.raw()); + } + + @Override + public int hashCode() { + return raw().hashCode(); + } + + public static VoxelShape empty() { + return EMPTY; + } + + public static VoxelShape fullCube() { + return FULL_CUBE; + } + + public static VoxelShape union(VoxelShape... shapes) { + net.minecraft.util.shape.VoxelShape result = net.minecraft.util.shape.VoxelShapes.empty(); + for (VoxelShape shape : shapes) { + result = net.minecraft.util.shape.VoxelShapes.union(result, shape.raw()); + } + return of(result); + } +} From cce5ef7a266d565e6044236ce53b6552891792ed Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Tue, 22 Apr 2025 21:41:39 +0900 Subject: [PATCH 486/622] [cp] fix #33 --- fabric/build.gradle | 3 ++- neoforge/build.gradle | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index beeb291cc..bf36714c5 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -29,7 +29,6 @@ dependencies { shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } shadowCommon 'org.yaml:snakeyaml:2.0' - include 'org.yaml:snakeyaml:2.0' modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") @@ -50,6 +49,8 @@ processResources { } shadowJar { + relocate "org.yaml.snakeyaml", "net.pitan76.mcpitanlib.shadow.yaml.snakeyaml" + exclude "architectury.common.json" configurations = [project.configurations.shadowCommon] diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 4a7143fd0..2e31db0ac 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -38,7 +38,6 @@ dependencies { shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } shadowCommon 'org.yaml:snakeyaml:2.0' - compileOnly 'org.yaml:snakeyaml:2.0' include("me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_config_version}") @@ -56,6 +55,8 @@ processResources { } shadowJar { + relocate "org.yaml.snakeyaml", "net.pitan76.mcpitanlib.shadow.yaml.snakeyaml" + exclude "fabric.mod.json" exclude "architectury.common.json" From 288c5c7c3cae77d201bbc2ff505a942d4a7dd11c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 23 Apr 2025 22:37:17 +0900 Subject: [PATCH 487/622] [cp] add isEmpty() in SimpleInventoryUtil --- .../net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java index de8392cc1..9176cee25 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SimpleInventoryUtil.java @@ -28,4 +28,8 @@ public static void clear(SimpleInventory inventory) { public static int size(SimpleInventory inventory) { return inventory.size(); } + + public static boolean isEmpty(SimpleInventory inventory) { + return inventory.isEmpty(); + } } From b2a45ccbc2b5d25cad49519a20c30989dd915be2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 26 Apr 2025 22:24:31 +0900 Subject: [PATCH 488/622] [cp] change info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 14a572f2f..bf021eaf4 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.4 +mod_version=3.2.5 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From ef2bb4863d153045651a6c16a825116dfc5ea6cd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 26 Apr 2025 23:28:23 +0900 Subject: [PATCH 489/622] gradle --- fabric/build.gradle | 2 +- neoforge/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index bf36714c5..5d27b796e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.github.johnrengelman.shadow" version "8.1.1" } architectury { diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 2e31db0ac..ae9d63539 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" + id "com.github.johnrengelman.shadow" version "8.1.1" } architectury { platformSetupLoomIde() From fcdad29973a1c0789bb987f2f364001db842b445 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 27 Apr 2025 16:45:33 +0900 Subject: [PATCH 490/622] [cp] Add CompatWaterloggable --- .../api/block/CompatWaterloggable.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatWaterloggable.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatWaterloggable.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatWaterloggable.java new file mode 100644 index 000000000..0402b719d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/CompatWaterloggable.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.block; + +import net.minecraft.block.Waterloggable; +import net.minecraft.sound.SoundEvent; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; + +import java.util.Optional; + +public interface CompatWaterloggable extends Waterloggable { + + @Override + default Optional getBucketFillSound() { + return getCompactBucketFillSound() + .map(CompatSoundEvent::get); + } + + default Optional getCompactBucketFillSound() { + return Waterloggable.super.getBucketFillSound() + .map(CompatSoundEvent::of); + } +} From 865a790cfdfe40df4759fadd364cde83b1fbb307 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 27 Apr 2025 16:47:43 +0900 Subject: [PATCH 491/622] [cp] add isClient() to StateForNeighborUpdateArgs --- .../api/block/args/v2/StateForNeighborUpdateArgs.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java index 5c39c24b7..c6d7a6845 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/StateForNeighborUpdateArgs.java @@ -90,4 +90,8 @@ public BlockEntityWrapper getBlockEntity() { public BlockEntity getRawBlockEntity() { return world.getBlockEntity(pos); } + + public boolean isClient() { + return world.isClient(); + } } From 0a92da5037e9bbe140f1eafc3c28e5620e52e467 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 28 Apr 2025 22:10:36 +0900 Subject: [PATCH 492/622] [cp] add apis to easybuilder --- .../api/block/v2/BlockSettingsBuilder.java | 52 ++++++++++++++++++- .../api/item/v2/ItemSettingsBuilder.java | 28 ++++++++++ .../midohra/easybuilder/BlockBuilder.java | 25 +++++++++ .../easybuilder/BlockEntityBuilder.java | 16 ++++++ .../BlockWithBlockEntityBuilder.java | 16 ++++++ .../midohra/easybuilder/ItemBuilder.java | 20 +++++++ 6 files changed, 156 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java index dffeee616..95b2afca6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/BlockSettingsBuilder.java @@ -7,6 +7,7 @@ import net.pitan76.mcpitanlib.api.util.color.CompatDyeColor; import net.pitan76.mcpitanlib.api.util.color.CompatMapColor; import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import java.util.function.ToIntFunction; @@ -23,6 +24,8 @@ public class BlockSettingsBuilder { public boolean dropsNothing; public ToIntFunction luminance; + protected BlockWrapper copyFromBlock = null; + public BlockSettingsBuilder(CompatIdentifier id) { this.id = id; } @@ -91,8 +94,14 @@ public AbstractBlock.Settings _build() { } public CompatibleBlockSettings build(CompatIdentifier id) { + CompatibleBlockSettings settings; + + if (copyFromBlock != null) { + settings = CompatibleBlockSettings.copy(id, copyFromBlock.get()); + } else { + settings = CompatibleBlockSettings.of(id); + } - CompatibleBlockSettings settings = CompatibleBlockSettings.of(id); if (material != null) settings = CompatibleBlockSettings.of(id, material); @@ -117,4 +126,45 @@ public CompatibleBlockSettings build(CompatIdentifier id) { public AbstractBlock.Settings _build(CompatIdentifier id) { return build(id).build(); } + + public BlockSettingsBuilder copy(CompatIdentifier id) { + BlockSettingsBuilder builder = new BlockSettingsBuilder(); + + builder.copyFromBlock = this.copyFromBlock; + + builder.id = id; + builder.hardness = this.hardness; + builder.resistance = this.resistance; + builder.blockSoundGroup = this.blockSoundGroup; + builder.material = this.material; + builder.mapColor = this.mapColor; + builder.dyeColor = this.dyeColor; + builder.requiresTool = this.requiresTool; + builder.dropsNothing = this.dropsNothing; + builder.luminance = this.luminance; + return builder; + } + + public BlockSettingsBuilder copy() { + return copy(this.id); + } + + public static BlockSettingsBuilder of(CompatIdentifier id) { + return new BlockSettingsBuilder(id); + } + + public static BlockSettingsBuilder of() { + return new BlockSettingsBuilder(); + } + + public static BlockSettingsBuilder copyBlock(BlockWrapper block) { + BlockSettingsBuilder builder = new BlockSettingsBuilder(block.getId()); + builder.copyFromBlock = block; + + return builder; + } + + public static BlockSettingsBuilder copyBlock(CompatIdentifier id) { + return copyBlock(BlockWrapper.of(id)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java index 6100b0839..a980204e6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/ItemSettingsBuilder.java @@ -122,4 +122,32 @@ public CompatibleItemSettings build(CompatIdentifier id) { public ExtendSettings _build(CompatIdentifier id) { return build(id).build(); } + + public ItemSettingsBuilder copy(CompatIdentifier id) { + ItemSettingsBuilder builder = new ItemSettingsBuilder(); + builder.id = id; + builder.maxCount = this.maxCount; + builder.maxDamage = this.maxDamage; + builder.maxDamageIfAbsent = this.maxDamageIfAbsent; + builder.enchantability = this.enchantability; + builder.repairIngredientTag = this.repairIngredientTag; + builder.foodComponent = this.foodComponent; + builder.rarity = this.rarity; + builder.recipeRemainder = this.recipeRemainder; + builder.itemGroupWrapper = this.itemGroupWrapper; + builder.itemGroupBuilder = this.itemGroupBuilder; + return builder; + } + + public ItemSettingsBuilder copy() { + return copy(this.id); + } + + public static ItemSettingsBuilder of(CompatIdentifier id) { + return new ItemSettingsBuilder(id); + } + + public static ItemSettingsBuilder of() { + return new ItemSettingsBuilder(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java index 53625f5f5..587531855 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockBuilder.java @@ -280,4 +280,29 @@ public BlockBuilder onDroppedStacks(Function> .map(ItemStack::toMinecraft) .toList()); } + + public BlockBuilder write(BlockBuilder copy) { + copy.onRightClick = onRightClick; + copy.onStateReplaced = onStateReplaced; + copy.onAppendTooltip = onAppendTooltip; + copy.onAppendProperties = onAppendProperties; + copy.defaultState = defaultState; + copy.onInit = onInit; + copy.onOutlineShape = onOutlineShape; + copy.onCollisionShape = onCollisionShape; + copy.onRenderType = onRenderType; + copy.onPlacementState = onPlacementState; + copy.onStateForNeighborUpdate = onStateForNeighborUpdate; + copy.onDroppedStacks = onDroppedStacks; + + return copy; + } + + public BlockBuilder copy(BlockSettingsBuilder settingsBuilder) { + return write(new BlockBuilder(settingsBuilder)); + } + + public BlockBuilder copy() { + return copy(this.settingsBuilder.copy()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java index 2405c1dd6..b85331534 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockEntityBuilder.java @@ -69,4 +69,20 @@ public BlockEntityBuilder onReadNbt(BiConsumer this.onReadNbt = onReadNbt; return this; } + + public BlockEntityBuilder write(BlockEntityBuilder copy) { + copy.onInit = this.onInit; + copy.onWriteNbt = this.onWriteNbt; + copy.onReadNbt = this.onReadNbt; + + return copy; + } + + public BlockEntityBuilder copy(CompatIdentifier id) { + return write(new BlockEntityBuilder(id)); + } + + public BlockEntityBuilder copy() { + return copy(this.id); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java index 839bbda1f..434cc295c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java @@ -83,4 +83,20 @@ public BlockBuilder applyBlockEntity(BlockEntityType blockEntityType) { public BlockBuilder applyBlockEntity(CompatIdentifier id) { return applyBlockEntity(BlockEntityTypeUtil.fromId(id)); } + + public BlockWithBlockEntityBuilder write(BlockWithBlockEntityBuilder copy) { + copy.settingsBuilder = this.settingsBuilder; + copy.blockEntityType = this.blockEntityType; + super.write(copy); + + return copy; + } + + public BlockWithBlockEntityBuilder copy(BlockSettingsBuilder settingsBuilder) { + return write(new BlockWithBlockEntityBuilder(settingsBuilder)); + } + + public BlockWithBlockEntityBuilder copy() { + return copy(this.settingsBuilder.copy()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java index e435ae37e..14c4b6a1b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/ItemBuilder.java @@ -175,4 +175,24 @@ public ItemBuilder addTooltip(TextComponent text) { this.tooltip.add(text); return this; } + + public ItemBuilder write(ItemBuilder copy) { + copy.settingsBuilder = this.settingsBuilder; + copy.onRightClick = this.onRightClick; + copy.onRightClickOnBlock = this.onRightClickOnBlock; + copy.onRightClickOnEntity = this.onRightClickOnEntity; + copy.onAppendTooltip = this.onAppendTooltip; + copy.onItemBarColor = this.onItemBarColor; + copy.onItemBarStep = this.onItemBarStep; + + return copy; + } + + public ItemBuilder copy(ItemSettingsBuilder builder) { + return write(new ItemBuilder(builder)); + } + + public ItemBuilder copy() { + return copy(this.settingsBuilder.copy()); + } } From 400370b313f634ea3d89b0f4c95b04c070f7f3d8 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 8 May 2025 11:38:35 +0900 Subject: [PATCH 493/622] [cp] add lang api --- .../api/util/client/LanguageUtil.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/LanguageUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/LanguageUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/LanguageUtil.java new file mode 100644 index 000000000..89ce635d4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/LanguageUtil.java @@ -0,0 +1,47 @@ +package net.pitan76.mcpitanlib.api.util.client; + +import net.minecraft.client.resource.language.I18n; +import net.minecraft.client.resource.language.LanguageManager; +import net.pitan76.mcpitanlib.midohra.resource.ResourceManager; + +public class LanguageUtil { + public static boolean hasTranslation(String key) { + return I18n.hasTranslation(key); + } + + public static String translate(String key) { + return I18n.translate(key); + } + + public static String translate(String key, Object... args) { + return I18n.translate(key, args); + } + + public static String translateWithFallback(String key, String fallback) { + return I18n.hasTranslation(key) ? I18n.translate(key) : fallback; + } + + public static String translateWithFallback(String key, String fallback, Object... args) { + return I18n.hasTranslation(key) ? I18n.translate(key, args) : fallback; + } + + public static LanguageManager getLanguageManager() { + return ClientUtil.getClient().getLanguageManager(); + } + + public static String getLanguage() { + return getLanguageManager().getLanguage(); + } + + public static void setLanguage(String language) { + getLanguageManager().setLanguage(language); + } + + public static void reload(net.minecraft.resource.ResourceManager resourceManager) { + getLanguageManager().reload(resourceManager); + } + + public static void reload(ResourceManager resourceManager) { + reload(resourceManager.getRaw()); + } +} From 3bb3f4d50a29b0fe6aa0d2cc78e1babb1f7cf403 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 23 May 2025 22:02:34 +0900 Subject: [PATCH 494/622] [cp] add apis rendering v2 --- .../entity/CompatBlockEntityRenderer.java | 19 +++++++++++++++++++ .../entity/event/BlockEntityRenderEvent.java | 10 ++++++++++ .../api/util/client/MatrixStackUtil.java | 4 ++++ 3 files changed, 33 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java index bdb78967b..22589bd1c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java @@ -15,4 +15,23 @@ default void render(T entity, float tickDelta, MatrixStack matrices, VertexConsu render(new BlockEntityRenderEvent<>(entity, tickDelta, matrices, vertexConsumers, light, overlay)); } + default boolean rendersOutsideBoundingBoxOverride(T blockEntity) { + return BlockEntityRenderer.super.rendersOutsideBoundingBox(blockEntity); + } + + default int getRenderDistanceOverride() { + return BlockEntityRenderer.super.getRenderDistance(); + } + + @Deprecated + @Override + default boolean rendersOutsideBoundingBox(T blockEntity) { + return rendersOutsideBoundingBoxOverride(blockEntity); + } + + @Deprecated + @Override + default int getRenderDistance() { + return getRenderDistanceOverride(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java index 5d7536490..bec1bce85 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java @@ -5,6 +5,8 @@ import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.util.math.MatrixStack; +import net.pitan76.mcpitanlib.api.client.render.CompatRenderLayer; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; import net.pitan76.mcpitanlib.api.util.MathUtil; import net.pitan76.mcpitanlib.api.util.client.ClientUtil; @@ -51,6 +53,10 @@ public VertexConsumer getVertexConsumer(RenderLayer layer) { return vertexConsumers.getBuffer(layer); } + public VertexConsumer getVertexConsumer(CompatRenderLayer layer) { + return getVertexConsumer(layer.raw()); + } + public VertexConsumerProvider getVertexConsumers() { return vertexConsumers; } @@ -82,4 +88,8 @@ public ItemRenderer getItemRenderer() { public boolean isRemoved() { return blockEntity.isRemoved(); } + + public DrawObjectMV getDrawObject(CompatRenderLayer layer) { + return new DrawObjectMV(getMatrices(), getVertexConsumer(layer)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java index cb3c46d85..52a5d0a56 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/MatrixStackUtil.java @@ -25,4 +25,8 @@ public static void translate(MatrixStack matrices, double x, double y, double z) public static void scale(MatrixStack matrices, float x, float y, float z) { matrices.scale(x, y, z); } + + public static MatrixStack.Entry peek(MatrixStack matrices) { + return matrices.peek(); + } } From 6e4704005d1362c08d2037c1f17d4e91c0646127 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Fri, 23 May 2025 22:05:55 +0900 Subject: [PATCH 495/622] [cp] add apis rendering --- .../api/client/render/CompatRenderLayer.java | 47 +++++++++++ .../api/client/render/DrawObjectMV.java | 63 ++++++++++++++ .../client/render/VertexConsumerUtil.java | 83 +++++++++++++++++++ .../client/render/VertexRenderingUtil.java | 32 +++++++ 4 files changed, 225 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java new file mode 100644 index 000000000..ec9585275 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java @@ -0,0 +1,47 @@ +package net.pitan76.mcpitanlib.api.client.render; + +import net.minecraft.client.render.RenderLayer; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class CompatRenderLayer { + public static final CompatRenderLayer CUTOUT = new CompatRenderLayer(RenderLayer.getCutout()); + public static final CompatRenderLayer CUTOUT_MIPPED = new CompatRenderLayer(RenderLayer.getCutoutMipped()); + public static final CompatRenderLayer TRANSLUCENT = new CompatRenderLayer(RenderLayer.getTranslucent()); + public static final CompatRenderLayer TRANSLUCENT_MOVING_BLOCK = new CompatRenderLayer(RenderLayer.getTranslucentMovingBlock()); + public static final CompatRenderLayer SOLID = new CompatRenderLayer(RenderLayer.getSolid()); + public static final CompatRenderLayer LINES = new CompatRenderLayer(RenderLayer.getLines()); + public static final CompatRenderLayer LINE_STRIP = new CompatRenderLayer(RenderLayer.getLineStrip()); + public static final CompatRenderLayer GLINT = new CompatRenderLayer(RenderLayer.getGlint()); + public static final CompatRenderLayer DEBUG_FILLED_BOX = new CompatRenderLayer(RenderLayer.getDebugFilledBox()); + public static final CompatRenderLayer DEBUG_QUADS = new CompatRenderLayer(RenderLayer.getDebugQuads()); + + public final RenderLayer layer; + + public CompatRenderLayer(RenderLayer layer) { + this.layer = layer; + } + + public RenderLayer raw() { + return layer; + } + + public static CompatRenderLayer getEntityCutout(CompatIdentifier id) { + return new CompatRenderLayer(RenderLayer.getEntityCutout(id.toMinecraft())); + } + + public static CompatRenderLayer getEntityCutoutNoCull(CompatIdentifier id) { + return new CompatRenderLayer(RenderLayer.getEntityCutoutNoCull(id.toMinecraft())); + } + + public static CompatRenderLayer getEntityTranslucent(CompatIdentifier id) { + return new CompatRenderLayer(RenderLayer.getEntityTranslucent(id.toMinecraft())); + } + + public static CompatRenderLayer getArmorCutoutNoCull(CompatIdentifier id) { + return new CompatRenderLayer(RenderLayer.getArmorCutoutNoCull(id.toMinecraft())); + } + + public static CompatRenderLayer getCrosshair(CompatIdentifier id) { + return new CompatRenderLayer(RenderLayer.getCrosshair(id.toMinecraft())); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java new file mode 100644 index 000000000..8a9540182 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java @@ -0,0 +1,63 @@ +package net.pitan76.mcpitanlib.api.client.render; + +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.util.math.MatrixStack; +import net.pitan76.mcpitanlib.api.util.client.render.VertexConsumerUtil; + +public class DrawObjectMV { + private final MatrixStack stack; + private final VertexConsumer buffer; + + public DrawObjectMV(MatrixStack stack, VertexConsumer buffer) { + this.stack = stack; + this.buffer = buffer; + } + + public DrawObjectMV(MatrixStack stack) { + this(stack, null); + } + + public DrawObjectMV(VertexConsumer buffer) { + this(null, buffer); + } + + public MatrixStack getStack() { + return stack; + } + + public VertexConsumer getBuffer() { + return buffer; + } + + public DrawObjectMV vertex(float x, float y, float z) { + return VertexConsumerUtil.vertex(this, x, y, z); + } + + public DrawObjectMV normal(float x, float y, float z) { + return VertexConsumerUtil.normal(this, x, y, z); + } + + public DrawObjectMV color(float red, float green, float blue, float alpha) { + return VertexConsumerUtil.color(this, red, green, blue, alpha); + } + + public DrawObjectMV color(int red, int green, int blue, int alpha) { + return VertexConsumerUtil.color(this, red, green, blue, alpha); + } + + public DrawObjectMV colorARGB(int argb) { + return VertexConsumerUtil.colorARGB(this, argb); + } + + public DrawObjectMV colorRGB(int rgb) { + return VertexConsumerUtil.colorRGB(this, rgb); + } + + public DrawObjectMV light(int light) { + return VertexConsumerUtil.light(this, light); + } + + public DrawObjectMV overlay(int overlay) { + return VertexConsumerUtil.overlay(this, overlay); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java new file mode 100644 index 000000000..b1248789e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java @@ -0,0 +1,83 @@ +package net.pitan76.mcpitanlib.api.util.client.render; + +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.util.math.MatrixStack; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; + +public class VertexConsumerUtil { + public static VertexConsumer vertex(VertexConsumer vertexConsumer, float x, float y, float z) { + return vertexConsumer.vertex(x, y, z); + } + + public static VertexConsumer vertex(VertexConsumer vertexConsumer, MatrixStack stack, float x, float y, float z) { + return vertexConsumer.vertex(stack.peek(), x, y, z); + } + + public static VertexConsumer normal(VertexConsumer vertexConsumer, float x, float y, float z) { + return vertexConsumer.normal(x, y, z); + } + + public static VertexConsumer color(VertexConsumer vertexConsumer, float red, float green, float blue, float alpha) { + return vertexConsumer.color(red, green, blue, alpha); + } + + public static VertexConsumer color(VertexConsumer vertexConsumer, int red, int green, int blue, int alpha) { + return vertexConsumer.color(red, green, blue, alpha); + } + + public static VertexConsumer colorARGB(VertexConsumer vertexConsumer, int argb) { + return vertexConsumer.color(argb); + } + + public static VertexConsumer colorRGB(VertexConsumer vertexConsumer, int rgb) { + return vertexConsumer.colorRgb(rgb); + } + + public static VertexConsumer light(VertexConsumer vertexConsumer, int light) { + return vertexConsumer.light(light); + } + + public static VertexConsumer overlay(VertexConsumer vertexConsumer, int overlay) { + return vertexConsumer.overlay(overlay); + } + + public static DrawObjectMV vertex(DrawObjectMV drawObject, float x, float y, float z) { + vertex(drawObject.getBuffer(), drawObject.getStack(), x, y, z); + return drawObject; + } + + public static DrawObjectMV normal(DrawObjectMV drawObject, float x, float y, float z) { + normal(drawObject.getBuffer(), x, y, z); + return drawObject; + } + + public static DrawObjectMV color(DrawObjectMV drawObject, float red, float green, float blue, float alpha) { + color(drawObject.getBuffer(), red, green, blue, alpha); + return drawObject; + } + + public static DrawObjectMV color(DrawObjectMV drawObject, int red, int green, int blue, int alpha) { + color(drawObject.getBuffer(), red, green, blue, alpha); + return drawObject; + } + + public static DrawObjectMV colorARGB(DrawObjectMV drawObject, int argb) { + colorARGB(drawObject.getBuffer(), argb); + return drawObject; + } + + public static DrawObjectMV colorRGB(DrawObjectMV drawObject, int rgb) { + colorRGB(drawObject.getBuffer(), rgb); + return drawObject; + } + + public static DrawObjectMV light(DrawObjectMV drawObject, int light) { + light(drawObject.getBuffer(), light); + return drawObject; + } + + public static DrawObjectMV overlay(DrawObjectMV drawObject, int overlay) { + overlay(drawObject.getBuffer(), overlay); + return drawObject; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java new file mode 100644 index 000000000..dd2ba2542 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java @@ -0,0 +1,32 @@ +package net.pitan76.mcpitanlib.api.util.client.render; + +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexRendering; +import net.minecraft.client.util.math.MatrixStack; +import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; + +public class VertexRenderingUtil { + public static void drawBox(MatrixStack matrices, VertexConsumer buffer, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { + VertexRendering.drawBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); + } + + public static void drawBox(MatrixStack matrices, VertexConsumer buffer, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha, float xAxisRed, float yAxisGreen, float zAxisBlue) { + VertexRendering.drawBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha, xAxisRed, yAxisGreen, zAxisBlue); + } + + public static void drawFilledBox(MatrixStack matrices, VertexConsumer buffer, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { + VertexRendering.drawFilledBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); + } + + public static void drawBox(DrawObjectMV drawObject, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { + drawBox(drawObject.getStack(), drawObject.getBuffer(), minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); + } + + public static void drawBox(DrawObjectMV drawObject, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha, float xAxisRed, float yAxisGreen, float zAxisBlue) { + drawBox(drawObject.getStack(), drawObject.getBuffer(), minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha, xAxisRed, yAxisGreen, zAxisBlue); + } + + public static void drawFilledBox(DrawObjectMV drawObject, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { + drawFilledBox(drawObject.getStack(), drawObject.getBuffer(), minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); + } +} From 010bb5089ca6d50f797b6c39b11dc91832d3a5d1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 May 2025 16:22:21 +0900 Subject: [PATCH 496/622] [cp] change VertexRendering calls to WorldRenderer --- .../api/util/client/render/VertexRenderingUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java index dd2ba2542..c7d071534 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java @@ -1,21 +1,21 @@ package net.pitan76.mcpitanlib.api.util.client.render; import net.minecraft.client.render.VertexConsumer; -import net.minecraft.client.render.VertexRendering; +import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.util.math.MatrixStack; import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; public class VertexRenderingUtil { public static void drawBox(MatrixStack matrices, VertexConsumer buffer, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { - VertexRendering.drawBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); + WorldRenderer.drawBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); } public static void drawBox(MatrixStack matrices, VertexConsumer buffer, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha, float xAxisRed, float yAxisGreen, float zAxisBlue) { - VertexRendering.drawBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha, xAxisRed, yAxisGreen, zAxisBlue); + WorldRenderer.drawBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha, xAxisRed, yAxisGreen, zAxisBlue); } public static void drawFilledBox(MatrixStack matrices, VertexConsumer buffer, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { - VertexRendering.drawFilledBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); + WorldRenderer.renderFilledBox(matrices, buffer, minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); } public static void drawBox(DrawObjectMV drawObject, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { From c2b53269a42220b4158e194514bc20c55b2704a0 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 May 2025 16:38:16 +0900 Subject: [PATCH 497/622] [cp] delete render layer --- .../mcpitanlib/api/client/render/CompatRenderLayer.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java index ec9585275..03be9441e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java @@ -12,8 +12,6 @@ public class CompatRenderLayer { public static final CompatRenderLayer LINES = new CompatRenderLayer(RenderLayer.getLines()); public static final CompatRenderLayer LINE_STRIP = new CompatRenderLayer(RenderLayer.getLineStrip()); public static final CompatRenderLayer GLINT = new CompatRenderLayer(RenderLayer.getGlint()); - public static final CompatRenderLayer DEBUG_FILLED_BOX = new CompatRenderLayer(RenderLayer.getDebugFilledBox()); - public static final CompatRenderLayer DEBUG_QUADS = new CompatRenderLayer(RenderLayer.getDebugQuads()); public final RenderLayer layer; @@ -40,8 +38,4 @@ public static CompatRenderLayer getEntityTranslucent(CompatIdentifier id) { public static CompatRenderLayer getArmorCutoutNoCull(CompatIdentifier id) { return new CompatRenderLayer(RenderLayer.getArmorCutoutNoCull(id.toMinecraft())); } - - public static CompatRenderLayer getCrosshair(CompatIdentifier id) { - return new CompatRenderLayer(RenderLayer.getCrosshair(id.toMinecraft())); - } } From 676aef3b54a24d773cc46a85b0f38d836835bedc Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 May 2025 17:04:28 +0900 Subject: [PATCH 498/622] [cp] info --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index bf021eaf4..935597ba3 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.5 +mod_version=3.2.6 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From e6073c73446548684dd18b3cd38cc1f0cd44153e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 May 2025 17:50:37 +0900 Subject: [PATCH 499/622] [cp] add null checks in ItemStack creation methods --- .../java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java index ec99b7004..95c879614 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ItemStackUtil.java @@ -131,22 +131,27 @@ public static ItemStack empty() { } public static ItemStack create(Item item) { + if (item == null) return empty(); return new ItemStack(item); } public static ItemStack create(Item item, int count) { + if (item == null) return empty(); return new ItemStack(item, count); } public static ItemStack create(ItemConvertible item) { + if (item == null) return empty(); return new ItemStack(item); } public static ItemStack create(ItemConvertible item, int count) { + if (item == null) return empty(); return new ItemStack(item, count); } public static boolean isEmpty(ItemStack stack) { + if (stack == null) return true; return stack.isEmpty(); } From 0fe8bdb2983fe92a95e1cec17cf31cf6e3cffaf9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 24 May 2025 17:51:02 +0900 Subject: [PATCH 500/622] [cp] bump mod version to 3.2.7 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 935597ba3..6dd81eed0 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.6 +mod_version=3.2.7 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From f7a9d5d766932c1fc5197de43db29b1fffdac16a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 1 Jun 2025 21:01:23 +0900 Subject: [PATCH 501/622] [cp] fix CompatInventory --- .../mcpitanlib/api/util/inventory/CompatInventory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java index 40d10ab56..bda546630 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java @@ -41,6 +41,10 @@ public final ItemStack superRemoveStack(int slot, int amount) { @Override public ItemStack removeStack(int slot, int amount) { + return callRemoveStack(slot, amount); + } + + public ItemStack callRemoveStack(int slot, int amount) { return super.removeStack(slot, amount); } From 909b28fee903dbde81e2ec2388d2eb92b7152016 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 1 Jun 2025 21:02:56 +0900 Subject: [PATCH 502/622] [cp] remove unused @ExpectPlatform annotation from registerScreen method --- .../client/registry/CompatRegistryClient.java | 1 - .../neoforge/CompatRegistryClientImpl.java | 22 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index 2e1a25f6c..00d55af2e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -53,7 +53,6 @@ public static > void registerScreen(String modId, ScreenHandlerType type, ScreenFactory factory) { MenuRegistry.registerScreenFactory(type, factory::create); } diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java deleted file mode 100644 index d57dd6a2b..000000000 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.pitan76.mcpitanlib.api.client.registry.neoforge; - -import dev.architectury.platform.hooks.EventBusesHooks; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; -import net.minecraft.screen.ScreenHandler; -import net.minecraft.screen.ScreenHandlerType; -import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; -import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; - -import java.util.Objects; - -public class CompatRegistryClientImpl { - public static > void registerScreen(String modId, ScreenHandlerType type, CompatRegistryClient.ScreenFactory factory) { - EventBusesHooks.whenAvailable(modId, (bus) -> { - bus.addListener(RegisterMenuScreensEvent.class, (event) -> { - Objects.requireNonNull(factory); - event.register(type, factory::create); - }); - }); - } -} From f42c4a20e0eda878d8374f18ac6b09baef97fedc Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 1 Jun 2025 21:05:15 +0900 Subject: [PATCH 503/622] [cp] fix --- common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java index 7f23dd682..d91c5ce9b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/MCPitanLib.java @@ -37,7 +37,7 @@ public class MCPitanLib { public static List blockBlackList = new ArrayList<>(); // MCPitanLibのアイテム、ブロック、タイルエンティティの登録 - public static CompatRegistry registry = CompatRegistry.createRegistry(MOD_ID); + public static CompatRegistry registry; /** * MCPitanLibの初期化 @@ -48,6 +48,8 @@ public static void init() { if (PlatformUtil.isDevelopmentEnvironment() || (config.has("debugMode") && config.getBoolean("debugMode"))) { System.out.println("MCPitanLib: Debug Mode"); + + registry = CompatRegistry.createRegistry(MOD_ID); DebugTool.register(); registry.allRegister(); From cb8b38d451edc9352ccf80a53c1587a14983be62 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 1 Jun 2025 21:05:38 +0900 Subject: [PATCH 504/622] [cp] dump version 3.2.8 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 6dd81eed0..69e0b33d7 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.7 +mod_version=3.2.8 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 80426c8ec7a14aff565ea5198d1b9cafda215c61 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 7 Jun 2025 14:13:44 +0900 Subject: [PATCH 505/622] [cp] add GameOptionsWrapper --- .../api/client/option/GameOptionsWrapper.java | 19 +++++++++++++++++++ .../api/util/client/ClientUtil.java | 13 +++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/option/GameOptionsWrapper.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/GameOptionsWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/GameOptionsWrapper.java new file mode 100644 index 000000000..3bdfa6bfe --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/GameOptionsWrapper.java @@ -0,0 +1,19 @@ +package net.pitan76.mcpitanlib.api.client.option; + +import net.minecraft.client.option.GameOptions; + +public class GameOptionsWrapper { + public final GameOptions raw; + + public GameOptionsWrapper(GameOptions options) { + this.raw = options; + } + + public GameOptions getRaw() { + return raw; + } + + public void write() { + raw.write(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java index 4262b0edf..06c17a933 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/ClientUtil.java @@ -15,6 +15,7 @@ import net.minecraft.resource.ResourceManager; import net.minecraft.util.hit.HitResult; import net.minecraft.util.profiler.Profiler; +import net.pitan76.mcpitanlib.api.client.option.GameOptionsWrapper; import net.pitan76.mcpitanlib.api.entity.Player; import java.io.File; @@ -102,4 +103,16 @@ public static Window getWindow() { public static Mouse getMouse() { return getClient().mouse; } + + public static boolean isInSingleplayer() { + return getClient().isInSingleplayer(); + } + + public static boolean isPaused() { + return getClient().isPaused(); + } + + public static GameOptionsWrapper getOptions() { + return new GameOptionsWrapper(getClient().options); + } } From 329fb6bd8984b56238e5991b27fa53688cc0dd63 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 00:24:58 +0900 Subject: [PATCH 506/622] [cp] add Midohra method --- .../net/pitan76/mcpitanlib/api/entity/Player.java | 4 ++++ .../api/network/v2/args/ServerReceiveEvent.java | 14 ++++++++++++++ .../pitan76/mcpitanlib/api/util/ServerUtil.java | 4 ++++ .../mcpitanlib/midohra/server/MCServer.java | 4 ++++ 4 files changed, 26 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 2707c0fa1..f19e1f173 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -500,4 +500,8 @@ public float getBlockBreakingSpeed(BlockState state) { public boolean canHarvest(BlockState state) { return getEntity().canHarvest(state); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(getWorld()); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java index b1afedc0d..bcf0e7a27 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java @@ -3,7 +3,9 @@ import net.minecraft.network.PacketByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.midohra.server.MCServer; public class ServerReceiveEvent { public MinecraftServer server; @@ -33,4 +35,16 @@ public MinecraftServer getServer() { public PacketByteBuf getBuf() { return buf; } + + public World world () { + return getPlayer().getWorld(); + } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world()); + } + + public MCServer getMidohraServer() { + return MCServer.of(server); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java index 84db97e6d..6718b610d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/ServerUtil.java @@ -57,4 +57,8 @@ public static PlayerManager getPlayerManager(MinecraftServer server) { public static MinecraftServer getServer(Player player) { return getServer(player.getWorld()); } + + public static void execute(MinecraftServer server, Runnable runnable) { + server.execute(runnable); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java index d6f30f6b5..997dafb98 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/server/MCServer.java @@ -89,4 +89,8 @@ public ServerWorld getEnd() { public ResourceManager getResourceManager() { return ResourceManager.of(server.getResourceManager()); } + + public void execute(Runnable runnable) { + ServerUtil.execute(getRaw(), runnable); + } } From 04caac6808f67ee10483ce29d6fba79e9c1f643a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 00:45:41 +0900 Subject: [PATCH 507/622] [cp] add apis --- .../api/client/render/DrawObjectMV.java | 117 ++++++++++++++++++ .../entity/event/BlockEntityRenderEvent.java | 19 +++ .../pitan76/mcpitanlib/api/entity/Player.java | 4 + .../client/render/VertexConsumerUtil.java | 18 +++ 4 files changed, 158 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java index 8a9540182..810d9ef4c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java @@ -3,6 +3,8 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.pitan76.mcpitanlib.api.util.client.render.VertexConsumerUtil; +import org.joml.Matrix3f; +import org.joml.Matrix4f; public class DrawObjectMV { private final MatrixStack stack; @@ -60,4 +62,119 @@ public DrawObjectMV light(int light) { public DrawObjectMV overlay(int overlay) { return VertexConsumerUtil.overlay(this, overlay); } + + public Matrix4f matrix4f; + public Matrix3f matrix3f; + + public Matrix4f getMatrix4f() { + if (matrix4f == null) + matrix4f = stack.peek().getPositionMatrix(); + + return matrix4f; + } + + public Matrix3f getMatrix3f() { + if (matrix3f == null) + matrix3f = stack.peek().getNormalMatrix(); + + return matrix3f; + } + + DrawObjectMV vertexWithMatrix4f(float x, float y, float z) { + VertexConsumerUtil.vertex(buffer, getMatrix4f(), x, y, z); + return this; + } + + DrawObjectMV vertexWithMatrix(float x, float y, float z) { + VertexConsumerUtil.vertex(buffer, stack, x, y, z); + return this; + } + + DrawObjectMV normalWithMatrix(float x, float y, float z) { + VertexConsumerUtil.normal(buffer, stack, x, y, z); + return this; + } + + DrawObjectMV texture(float u, float v) { + VertexConsumerUtil.texture(buffer, u, v); + return this; + } + + DrawObjectMV next() { + VertexConsumerUtil.next(buffer); + return this; + } + + private void renderQuad(float x1, float y1, float z1, float x2, float y2, float z2, + float normalX, float normalY, float normalZ, int r, int g, int b) { + + if (Math.abs(normalY) > 0.5f) { + float y = y1; + + if (normalY > 0) { + vertexWithMatrix4f(x1, y, z1).color(r, g, b, 255).texture(0, 0) + .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x1, y, z2).color(r, g, b, 255).texture(0, 0) + .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y, z2).color(r, g, b, 255).texture(0, 0) + .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y, z1).color(r, g, b, 255).texture(0, 0) + .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); + } else { + vertexWithMatrix4f(x1, y, z1).color(r, g, b, 255).texture(0, 0) + .light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y, z1).color(r, g, b, 255).texture(0, 0) + .light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y, z2).color(r, g, b, 255).texture(0, 0) + .light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x1, y, z2).color(r, g, b, 255).texture(0, 0) + .light(15728880).normal(normalX, normalY, normalZ).next(); + } + + } else if (Math.abs(normalZ) > 0.5f) { + float z = z1; + + if (normalZ > 0) { + // TODO: Fix + vertexWithMatrix4f(x1, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + + vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + + } else { + vertexWithMatrix4f(x1, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + + vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x2, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + } + + } else if (Math.abs(normalX) > 0.5f) { + float x = x1; + + if (normalX > 0) { + vertexWithMatrix4f(x, y1, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + + vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y2, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + + } else { + vertexWithMatrix4f(x, y1, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + + vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y2, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); + } + } + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java index bec1bce85..d21a4d34b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java @@ -11,6 +11,8 @@ import net.pitan76.mcpitanlib.api.util.MathUtil; import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.MatrixStackUtil; +import org.joml.Matrix3f; +import org.joml.Matrix4f; public class BlockEntityRenderEvent { public T blockEntity; @@ -92,4 +94,21 @@ public boolean isRemoved() { public DrawObjectMV getDrawObject(CompatRenderLayer layer) { return new DrawObjectMV(getMatrices(), getVertexConsumer(layer)); } + + public Matrix4f matrix4f; + public Matrix3f matrix3f; + + public Matrix4f getMatrix4f() { + if (matrix4f == null) + matrix4f = matrices.peek().getPositionMatrix(); + + return matrix4f; + } + + public Matrix3f getMatrix3f() { + if (matrix3f == null) + matrix3f = matrices.peek().getNormalMatrix(); + + return matrix3f; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index f19e1f173..e6169bed6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -504,4 +504,8 @@ public boolean canHarvest(BlockState state) { public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { return net.pitan76.mcpitanlib.midohra.world.World.of(getWorld()); } + + public void eatFood(ItemStack stack, CompatFoodComponent foodComponent) { + getEntity().getHungerManager().eat(foodComponent.build()); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java index b1248789e..166ce4fd1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java @@ -3,6 +3,8 @@ import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; +import org.joml.Matrix3f; +import org.joml.Matrix4f; public class VertexConsumerUtil { public static VertexConsumer vertex(VertexConsumer vertexConsumer, float x, float y, float z) { @@ -80,4 +82,20 @@ public static DrawObjectMV overlay(DrawObjectMV drawObject, int overlay) { overlay(drawObject.getBuffer(), overlay); return drawObject; } + + public static VertexConsumer texture(VertexConsumer vertexConsumer, float u, float v) { + return vertexConsumer.texture(u, v); + } + + public static VertexConsumer vertex(VertexConsumer vertexConsumer, Matrix4f matrix4f, float x, float y, float z) { + return vertexConsumer.vertex(matrix4f, x, y, z); + } + + public static VertexConsumer normal(VertexConsumer vertexConsumer, MatrixStack stack, float x, float y, float z) { + return vertexConsumer.normal(stack.peek(), x, y, z); + } + + public static VertexConsumer next(VertexConsumer vertexConsumer) { + return vertexConsumer; + } } From a040d4e3576c9e12143bbb5f23ce537f19fe256f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 01:42:43 +0900 Subject: [PATCH 508/622] [cp] refactor: change blockEntityType to Supplier in BlockWithBlockEntityBuilder and related classes --- .../entity/event/BlockEntityRenderEvent.java | 9 +++++++++ .../BlockWithBlockEntityBuilder.java | 19 ++++++++++++------- .../built/BuiltBlockWithEntity.java | 9 +++++++-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java index d21a4d34b..7b0a172e0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java @@ -5,6 +5,7 @@ import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.api.client.render.CompatRenderLayer; import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; @@ -111,4 +112,12 @@ public Matrix3f getMatrix3f() { return matrix3f; } + + public BlockPos getPos() { + return blockEntity.callGetPos(); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getPos()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java index 434cc295c..16ce75a16 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/BlockWithBlockEntityBuilder.java @@ -14,7 +14,7 @@ public class BlockWithBlockEntityBuilder extends BlockBuilder { - public BlockEntityType blockEntityType; + public Supplier> blockEntityType; public BlockWithBlockEntityBuilder(BlockSettingsBuilder settingsBuilder) { super(settingsBuilder); @@ -24,12 +24,12 @@ public BlockWithBlockEntityBuilder(CompatIdentifier id) { super(id); } - public BlockWithBlockEntityBuilder(BlockSettingsBuilder settingsBuilder, BlockEntityType blockEntityType) { + public BlockWithBlockEntityBuilder(BlockSettingsBuilder settingsBuilder, Supplier> blockEntityType) { super(settingsBuilder); this.blockEntityType = blockEntityType; } - public BlockWithBlockEntityBuilder(CompatIdentifier id, BlockEntityType blockEntityType) { + public BlockWithBlockEntityBuilder(CompatIdentifier id, Supplier> blockEntityType) { super(id); this.blockEntityType = blockEntityType; } @@ -67,20 +67,25 @@ public static BlockWithBlockEntityBuilder of(BlockSettingsBuilder settingsBuilde return new BlockWithBlockEntityBuilder(settingsBuilder); } - public static BlockWithBlockEntityBuilder of(CompatIdentifier id, BlockEntityType blockEntityType) { + public static BlockWithBlockEntityBuilder of(CompatIdentifier id, Supplier> blockEntityType) { return new BlockWithBlockEntityBuilder(id, blockEntityType); } - public static BlockWithBlockEntityBuilder of(BlockSettingsBuilder settingsBuilder, BlockEntityType blockEntityType) { + public static BlockWithBlockEntityBuilder of(BlockSettingsBuilder settingsBuilder, Supplier> blockEntityType) { return new BlockWithBlockEntityBuilder(settingsBuilder, blockEntityType); } - public BlockBuilder applyBlockEntity(BlockEntityType blockEntityType) { + public BlockWithBlockEntityBuilder applyBlockEntity(Supplier> blockEntityType) { this.blockEntityType = blockEntityType; return this; } - public BlockBuilder applyBlockEntity(CompatIdentifier id) { + public BlockWithBlockEntityBuilder applyBlockEntity(BlockEntityType blockEntityType) { + this.blockEntityType = () -> blockEntityType; + return this; + } + + public BlockWithBlockEntityBuilder applyBlockEntity(CompatIdentifier id) { return applyBlockEntity(BlockEntityTypeUtil.fromId(id)); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockWithEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockWithEntity.java index 9a83d588b..6297eb9c0 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockWithEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/easybuilder/built/BuiltBlockWithEntity.java @@ -8,9 +8,11 @@ import net.pitan76.mcpitanlib.midohra.easybuilder.BlockWithBlockEntityBuilder; import org.jetbrains.annotations.Nullable; +import java.util.function.Supplier; + public class BuiltBlockWithEntity extends BuiltBlock implements ExtendBlockEntityProvider { - public BlockEntityType blockEntityType; + public Supplier> blockEntityType; public BuiltBlockWithEntity(CompatibleBlockSettings settings) { super(settings); @@ -30,6 +32,9 @@ public BuiltBlockWithEntity(BlockWithBlockEntityBuilder builder, CompatIdentifie @Override public @Nullable BlockEntityType getBlockEntityType() { - return (BlockEntityType) blockEntityType; + if (blockEntityType == null) + return null; + + return (BlockEntityType) blockEntityType.get(); } } From 2733cda5c81a36d23d8ecb60198fbd8162156325 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 01:44:19 +0900 Subject: [PATCH 509/622] [cp] bump version to 3.2.9 and update copyright years in LICENSE --- LICENSE | 2 +- info.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 1263235d6..21068a6f0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Pitan +Copyright (c) 2022-2025 Pitan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/info.properties b/info.properties index 69e0b33d7..4f3136664 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.8 +mod_version=3.2.9 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 530ed272624aac99bb7349d28800b335155db14d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 16:39:18 +0900 Subject: [PATCH 510/622] [cp] feat: add CompatPacketByteBuf and enhance networking methods for compatibility --- .../api/network/v2/ClientNetworking.java | 10 ++ .../api/network/v2/ServerNetworking.java | 42 +++++++ .../network/v2/args/ClientReceiveEvent.java | 14 +++ .../network/v2/args/ServerReceiveEvent.java | 13 +- .../midohra/network/CompatPacketByteBuf.java | 116 ++++++++++++++++++ 5 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/network/CompatPacketByteBuf.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java index 92c660eaf..67fef00ce 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/ClientNetworking.java @@ -1,8 +1,10 @@ package net.pitan76.mcpitanlib.api.network.v2; import net.minecraft.network.PacketByteBuf; +import net.pitan76.mcpitanlib.api.network.PacketByteUtil; import net.pitan76.mcpitanlib.api.network.v2.args.ClientReceiveEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.network.CompatPacketByteBuf; import java.util.function.Consumer; @@ -16,4 +18,12 @@ public static void registerReceiver(CompatIdentifier id, Consumer players, CompatIdentifier id, CompatPacketByteBuf buf) { + send(players, id, buf.getRaw()); + } + + public static void sendAll(MinecraftServer server, CompatIdentifier id, CompatPacketByteBuf buf) { + sendAll(server, id, buf.getRaw()); + } + + public static void sendAll(World world, CompatIdentifier id, CompatPacketByteBuf buf) { + sendAll(world.getServer(), id, buf.getRaw()); + } + + public static void send(ServerPlayerEntity serverPlayerEntity, CompatIdentifier id) { + send(serverPlayerEntity, id, PacketByteUtil.create()); + } + + public static void send(Player player, CompatIdentifier id) { + send(player, id, PacketByteUtil.create()); + } + + public static void send(Iterable players, CompatIdentifier id) { + send(players, id, PacketByteUtil.create()); + } + + public static void sendAll(MinecraftServer server, CompatIdentifier id) { + sendAll(server, id, PacketByteUtil.create()); + } + + public static void sendAll(World world, CompatIdentifier id) { + sendAll(world.getServer(), id, PacketByteUtil.create()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java index a2de5923e..568c74d07 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ClientReceiveEvent.java @@ -3,7 +3,9 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.network.PacketByteBuf; +import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.midohra.network.CompatPacketByteBuf; public class ClientReceiveEvent { public MinecraftClient client; @@ -33,4 +35,16 @@ public MinecraftClient getClient() { public PacketByteBuf getBuf() { return buf; } + + public CompatPacketByteBuf getCompatBuf() { + return CompatPacketByteBuf.of(buf); + } + + public World getWorld() { + return getPlayer().getWorld(); + } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(getWorld()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java index bcf0e7a27..3fbe2834e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/network/v2/args/ServerReceiveEvent.java @@ -5,6 +5,7 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.midohra.network.CompatPacketByteBuf; import net.pitan76.mcpitanlib.midohra.server.MCServer; public class ServerReceiveEvent { @@ -36,15 +37,23 @@ public PacketByteBuf getBuf() { return buf; } - public World world () { + public World getWorld() { return getPlayer().getWorld(); } public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { - return net.pitan76.mcpitanlib.midohra.world.World.of(world()); + return net.pitan76.mcpitanlib.midohra.world.World.of(getWorld()); } public MCServer getMidohraServer() { return MCServer.of(server); } + + public CompatPacketByteBuf getCompatBuf() { + return CompatPacketByteBuf.of(buf); + } + + public void execute(Runnable runnable) { + server.execute(runnable); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/network/CompatPacketByteBuf.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/network/CompatPacketByteBuf.java new file mode 100644 index 000000000..c2c5566fe --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/network/CompatPacketByteBuf.java @@ -0,0 +1,116 @@ +package net.pitan76.mcpitanlib.midohra.network; + +import net.minecraft.network.PacketByteBuf; +import net.pitan76.mcpitanlib.api.network.PacketByteUtil; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; + +public class CompatPacketByteBuf extends PacketByteBuf { + public CompatPacketByteBuf(PacketByteBuf buf) { + super(buf); + } + + public CompatPacketByteBuf() { + super(PacketByteUtil.create()); + } + + public static CompatPacketByteBuf create() { + return new CompatPacketByteBuf(); + } + + public static CompatPacketByteBuf of(PacketByteBuf buf) { + return new CompatPacketByteBuf(buf); + } + + public PacketByteBuf getRaw() { + return this; + } + + public CompatPacketByteBuf writeInt(int value) { + super.writeInt(value); + return this; + } + + public int readInt() { + return super.readInt(); + } + + public CompatPacketByteBuf writeLong(long value) { + super.writeLong(value); + return this; + } + + public long readLong() { + return super.readLong(); + } + + public CompatPacketByteBuf writeBoolean(boolean value) { + super.writeBoolean(value); + return this; + } + + public boolean readBoolean() { + return super.readBoolean(); + } + + public CompatPacketByteBuf writeFloat(float value) { + super.writeFloat(value); + return this; + } + + public float readFloat() { + return super.readFloat(); + } + + public CompatPacketByteBuf writeDouble(double value) { + super.writeDouble(value); + return this; + } + + public double readDouble() { + return super.readDouble(); + } + + public CompatPacketByteBuf writeShort(short value) { + super.writeShort(value); + return this; + } + + public short readShort() { + return super.readShort(); + } + + public CompatPacketByteBuf writeByteArray(byte[] array) { + super.writeByteArray(array); + return this; + } + + public byte[] readByteArray() { + return super.readByteArray(); + } + + public CompatPacketByteBuf writeString(String string) { + super.writeString(string); + return this; + } + + public String readString() { + return super.readString(); + } + + public CompatPacketByteBuf writeBlockPos(net.minecraft.util.math.BlockPos pos) { + super.writeBlockPos(pos); + return this; + } + + public net.minecraft.util.math.BlockPos readBlockPos() { + return super.readBlockPos(); + } + + public CompatPacketByteBuf writeBlockPos(BlockPos pos) { + return writeBlockPos(pos.toMinecraft()); + } + + public BlockPos readBlockPosMidohra() { + return BlockPos.of(readBlockPos()); + } +} From df5a5684be64bd2a176effe8eac506191c04e1b0 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 17:07:20 +0900 Subject: [PATCH 511/622] [cp] feat: enhance rendering utilities and add WorldRendererUtil for lightmap coordinates --- .../api/client/render/CompatRenderLayer.java | 14 +++ .../api/client/render/DrawObjectMV.java | 79 ++------------ .../client/render/VertexConsumerUtil.java | 102 ++++++++++++++++++ .../client/render/VertexRenderingUtil.java | 10 ++ .../util/client/render/WorldRendererUtil.java | 15 +++ .../midohra/util/math/BlockPos.java | 4 + 6 files changed, 154 insertions(+), 70 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/WorldRendererUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java index 03be9441e..07bab9634 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.api.client.render; +import com.mojang.blaze3d.pipeline.RenderPipeline; +import net.minecraft.client.render.BuiltBuffer; import net.minecraft.client.render.RenderLayer; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; @@ -38,4 +40,16 @@ public static CompatRenderLayer getEntityTranslucent(CompatIdentifier id) { public static CompatRenderLayer getArmorCutoutNoCull(CompatIdentifier id) { return new CompatRenderLayer(RenderLayer.getArmorCutoutNoCull(id.toMinecraft())); } + + public static CompatRenderLayer getEntitySolid(CompatIdentifier id) { + return new CompatRenderLayer(RenderLayer.getEntitySolid(id.toMinecraft())); + } + + public static CompatRenderLayer create(String name, int size, boolean hasCrumbling, boolean translucent, RenderPipeline pipeline, RenderLayer.MultiPhaseParameters params) { + return new CompatRenderLayer(RenderLayer.of(name, size, hasCrumbling, translucent, pipeline, params)); + } + + public void draw(BuiltBuffer buffer) { + layer.draw(buffer); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java index 810d9ef4c..c27273748 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.client.render; +import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.pitan76.mcpitanlib.api.util.client.render.VertexConsumerUtil; @@ -63,6 +64,10 @@ public DrawObjectMV overlay(int overlay) { return VertexConsumerUtil.overlay(this, overlay); } + public DrawObjectMV overlayDefaultUV() { + return VertexConsumerUtil.overlayDefaultUV(this); + } + public Matrix4f matrix4f; public Matrix3f matrix3f; @@ -106,75 +111,9 @@ DrawObjectMV next() { } private void renderQuad(float x1, float y1, float z1, float x2, float y2, float z2, - float normalX, float normalY, float normalZ, int r, int g, int b) { - - if (Math.abs(normalY) > 0.5f) { - float y = y1; - - if (normalY > 0) { - vertexWithMatrix4f(x1, y, z1).color(r, g, b, 255).texture(0, 0) - .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x1, y, z2).color(r, g, b, 255).texture(0, 0) - .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y, z2).color(r, g, b, 255).texture(0, 0) - .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y, z1).color(r, g, b, 255).texture(0, 0) - .light(15728880).normalWithMatrix(normalX, normalY, normalZ).next(); - } else { - vertexWithMatrix4f(x1, y, z1).color(r, g, b, 255).texture(0, 0) - .light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y, z1).color(r, g, b, 255).texture(0, 0) - .light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y, z2).color(r, g, b, 255).texture(0, 0) - .light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x1, y, z2).color(r, g, b, 255).texture(0, 0) - .light(15728880).normal(normalX, normalY, normalZ).next(); - } - - } else if (Math.abs(normalZ) > 0.5f) { - float z = z1; - - if (normalZ > 0) { - // TODO: Fix - vertexWithMatrix4f(x1, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - - vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - - } else { - vertexWithMatrix4f(x1, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - - vertexWithMatrix4f(x2, y1, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x2, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x1, y2, z).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - } - - } else if (Math.abs(normalX) > 0.5f) { - float x = x1; - - if (normalX > 0) { - vertexWithMatrix4f(x, y1, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - - vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y2, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - - } else { - vertexWithMatrix4f(x, y1, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - - vertexWithMatrix4f(x, y1, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y2, z2).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - vertexWithMatrix4f(x, y2, z1).color(r, g, b, 255).texture(0, 0).light(15728880).normal(normalX, normalY, normalZ).next(); - } - } + float normalX, float normalY, float normalZ, int r, int g, int b, int alpha, int u, int v, int overlay, int light) { + VertexConsumerUtil.renderQuad(buffer, stack, getMatrix4f(), getMatrix3f(), + x1, y1, z1, x2, y2, z2, + normalX, normalY, normalZ, r, g, b, alpha, u, v, overlay, light); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java index 166ce4fd1..8848cd85c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexConsumerUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util.client.render; +import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.MatrixStack; import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; @@ -43,6 +44,10 @@ public static VertexConsumer overlay(VertexConsumer vertexConsumer, int overlay) return vertexConsumer.overlay(overlay); } + public static VertexConsumer overlayDefaultUV(VertexConsumer vertexConsumer) { + return vertexConsumer.overlay(OverlayTexture.DEFAULT_UV); + } + public static DrawObjectMV vertex(DrawObjectMV drawObject, float x, float y, float z) { vertex(drawObject.getBuffer(), drawObject.getStack(), x, y, z); return drawObject; @@ -83,6 +88,11 @@ public static DrawObjectMV overlay(DrawObjectMV drawObject, int overlay) { return drawObject; } + public static DrawObjectMV overlayDefaultUV(DrawObjectMV drawObject) { + overlayDefaultUV(drawObject.getBuffer()); + return drawObject; + } + public static VertexConsumer texture(VertexConsumer vertexConsumer, float u, float v) { return vertexConsumer.texture(u, v); } @@ -98,4 +108,96 @@ public static VertexConsumer normal(VertexConsumer vertexConsumer, MatrixStack s public static VertexConsumer next(VertexConsumer vertexConsumer) { return vertexConsumer; } + + public static void renderQuad(VertexConsumer vertexConsumer, MatrixStack stack, Matrix4f matrix4f, Matrix3f matrix3f, + float x1, float y1, float z1, float x2, float y2, float z2, + float normalX, float normalY, float normalZ, int r, int g, int b, int alpha, int u, int v, int overlay, int light) { + + float[][] vertexes = new float[4][3]; + + if (Math.abs(normalY) > 0.5f) { + if (normalY > 0) { + vertexes = new float[][]{ + {x1, y1, z1}, + {x1, y1, z2}, + {x2, y1, z2}, + {x2, y1, z1} + }; + + } else { + vertexes = new float[][]{ + {x1, y1, z1}, + {x2, y1, z1}, + {x2, y1, z2}, + {x1, y1, z2} + }; + } + } else if (Math.abs(normalZ) > 0.5f) { + if (normalZ > 0) { + vertexes = new float[][]{ + {x1, y1, z1}, + {x2, y1, z1}, + {x2, y2, z1}, + {x1, y2, z1} + }; + } else { + vertexes = new float[][]{ + {x1, y1, z1}, + {x1, y2, z1}, + {x2, y2, z1}, + {x2, y1, z1} + }; + } + } else if (Math.abs(normalX) > 0.5f) { + if (normalX > 0) { + vertexes = new float[][]{ + {x1, y1, z1}, + {x1, y2, z1}, + {x1, y2, z2}, + {x1, y1, z2} + }; + } else { + vertexes = new float[][]{ + {x1, y1, z1}, + {x1, y1, z2}, + {x1, y2, z2}, + {x1, y2, z1} + }; + } + } + + for (float[] vertex : vertexes) { + if (vertex.length != 3) continue; + + vertex(vertexConsumer, matrix4f, vertex[0], vertex[1], vertex[2]); + color(vertexConsumer, r, g, b, alpha); + texture(vertexConsumer, u, v); + light(vertexConsumer, light); + normal(vertexConsumer, stack, normalX, normalY, normalZ); + next(vertexConsumer); + } + } + + public static void renderQuad(DrawObjectMV drawObject, Matrix4f matrix4f, Matrix3f matrix3f, + float x1, float y1, float z1, float x2, float y2, float z2, + float normalX, float normalY, float normalZ, int r, int g, int b, int alpha, int u, int v, int overlay, int light) { + renderQuad(drawObject.getBuffer(), drawObject.getStack(), matrix4f, matrix3f, + x1, y1, z1, x2, y2, z2, + normalX, normalY, normalZ, r, g, b, alpha, u, v, overlay, light); + + } + + public static void renderQuad(DrawObjectMV drawObject, + float x1, float y1, float z1, float x2, float y2, float z2, + float normalX, float normalY, float normalZ, int r, int g, int b, int alpha, int u, int v, int overlay, int light) { + + Matrix4f matrix4f = drawObject.getMatrix4f(); + Matrix3f matrix3f = drawObject.getMatrix3f(); + + renderQuad(drawObject.getBuffer(), drawObject.getStack(), matrix4f, matrix3f, + x1, y1, z1, x2, y2, z2, + normalX, normalY, normalZ, r, g, b, alpha, u, v, overlay, light); + + } } + diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java index c7d071534..4eeee7e64 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/VertexRenderingUtil.java @@ -4,6 +4,8 @@ import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.util.math.MatrixStack; import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; +import org.joml.Matrix3f; +import org.joml.Matrix4f; public class VertexRenderingUtil { public static void drawBox(MatrixStack matrices, VertexConsumer buffer, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { @@ -29,4 +31,12 @@ public static void drawBox(DrawObjectMV drawObject, double minX, double minY, do public static void drawFilledBox(DrawObjectMV drawObject, double minX, double minY, double minZ, double maxX, double maxY, double maxZ, float red, float green, float blue, float alpha) { drawFilledBox(drawObject.getStack(), drawObject.getBuffer(), minX, minY, minZ, maxX, maxY, maxZ, red, green, blue, alpha); } + + public static void renderQuad(VertexConsumer vertexConsumer, MatrixStack stack, Matrix4f matrix4f, Matrix3f matrix3f, float x1, float y1, float z1, float x2, float y2, float z2, float normalX, float normalY, float normalZ, int r, int g, int b, int alpha, int u, int v, int overlay, int light) { + VertexConsumerUtil.renderQuad(vertexConsumer, stack, matrix4f, matrix3f, x1, y1, z1, x2, y2, z2, normalX, normalY, normalZ, r, g, b, alpha, u, v, overlay, light); + } + + public static void renderQuad(DrawObjectMV drawObject, float x1, float y1, float z1, float x2, float y2, float z2, float normalX, float normalY, float normalZ, int r, int g, int b, int alpha, int u, int v, int overlay, int light) { + renderQuad(drawObject.getBuffer(), drawObject.getStack(), drawObject.getMatrix4f(), drawObject.getMatrix3f(), x1, y1, z1, x2, y2, z2, normalX, normalY, normalZ, r, g, b, alpha, u, v, overlay, light); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/WorldRendererUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/WorldRendererUtil.java new file mode 100644 index 000000000..8160f8ba9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/WorldRendererUtil.java @@ -0,0 +1,15 @@ +package net.pitan76.mcpitanlib.api.util.client.render; + +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class WorldRendererUtil { + public static int getLightmapCoordinates(World world, BlockPos pos) { + return WorldRenderer.getLightmapCoordinates(world, pos); + } + + public static int getLightmapCoordinates(net.pitan76.mcpitanlib.midohra.world.World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + return getLightmapCoordinates(world.getRaw(), pos.toMinecraft()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java index ea83adead..129da5856 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java @@ -33,6 +33,10 @@ public net.minecraft.util.math.BlockPos toMinecraft() { return blockPos; } + public net.minecraft.util.math.BlockPos toRaw() { + return toMinecraft(); + } + public BlockPos add(int x, int y, int z) { return new BlockPos(blockPos.add(x, y, z)); } From dede35543a09341fa78323bc97d55c2b667b3c1e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 17:14:48 +0900 Subject: [PATCH 512/622] [cp] remove create method in CompatRenderLayer --- .../mcpitanlib/api/client/render/CompatRenderLayer.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java index 07bab9634..bf2cb9ca8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.client.render; -import com.mojang.blaze3d.pipeline.RenderPipeline; import net.minecraft.client.render.BuiltBuffer; import net.minecraft.client.render.RenderLayer; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; @@ -45,10 +44,6 @@ public static CompatRenderLayer getEntitySolid(CompatIdentifier id) { return new CompatRenderLayer(RenderLayer.getEntitySolid(id.toMinecraft())); } - public static CompatRenderLayer create(String name, int size, boolean hasCrumbling, boolean translucent, RenderPipeline pipeline, RenderLayer.MultiPhaseParameters params) { - return new CompatRenderLayer(RenderLayer.of(name, size, hasCrumbling, translucent, pipeline, params)); - } - public void draw(BuiltBuffer buffer) { layer.draw(buffer); } From 367e7c89016c3b5c9ab1a15a4919eb7d304a5b36 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 17:29:33 +0900 Subject: [PATCH 513/622] [cp] fix-2: remove draw method in CompatRenderLayer --- .../mcpitanlib/api/client/render/CompatRenderLayer.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java index bf2cb9ca8..69c3fc968 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/CompatRenderLayer.java @@ -1,6 +1,5 @@ package net.pitan76.mcpitanlib.api.client.render; -import net.minecraft.client.render.BuiltBuffer; import net.minecraft.client.render.RenderLayer; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; @@ -43,8 +42,4 @@ public static CompatRenderLayer getArmorCutoutNoCull(CompatIdentifier id) { public static CompatRenderLayer getEntitySolid(CompatIdentifier id) { return new CompatRenderLayer(RenderLayer.getEntitySolid(id.toMinecraft())); } - - public void draw(BuiltBuffer buffer) { - layer.draw(buffer); - } } From 00f14e0fb6209af47fc1ef2d167e18eb5e99a5cc Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 14 Jun 2025 19:30:01 +0900 Subject: [PATCH 514/622] [cp] bump version to 3.3.0 in info.properties --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 4f3136664..ba4ef1c6c 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.2.9 +mod_version=3.3.0 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 613e191e4ce4103beafc63657322b6f5cd5f07c4 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 15 Jun 2025 14:07:49 +0900 Subject: [PATCH 515/622] [cp] feat: update DrawObjectMV methods to public and add ScreenUtil for screen management --- .../api/client/render/DrawObjectMV.java | 16 +++++------ .../api/util/client/v2/ScreenUtil.java | 27 +++++++++++++++++++ 2 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java index c27273748..37e2df47d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/DrawObjectMV.java @@ -85,32 +85,32 @@ public Matrix3f getMatrix3f() { return matrix3f; } - DrawObjectMV vertexWithMatrix4f(float x, float y, float z) { + public DrawObjectMV vertexWithMatrix4f(float x, float y, float z) { VertexConsumerUtil.vertex(buffer, getMatrix4f(), x, y, z); return this; } - DrawObjectMV vertexWithMatrix(float x, float y, float z) { + public DrawObjectMV vertexWithMatrix(float x, float y, float z) { VertexConsumerUtil.vertex(buffer, stack, x, y, z); return this; } - DrawObjectMV normalWithMatrix(float x, float y, float z) { + public DrawObjectMV normalWithMatrix(float x, float y, float z) { VertexConsumerUtil.normal(buffer, stack, x, y, z); return this; } - - DrawObjectMV texture(float u, float v) { + + public DrawObjectMV texture(float u, float v) { VertexConsumerUtil.texture(buffer, u, v); return this; } - - DrawObjectMV next() { + + public DrawObjectMV next() { VertexConsumerUtil.next(buffer); return this; } - private void renderQuad(float x1, float y1, float z1, float x2, float y2, float z2, + public void renderQuad(float x1, float y1, float z1, float x2, float y2, float z2, float normalX, float normalY, float normalZ, int r, int g, int b, int alpha, int u, int v, int overlay, int light) { VertexConsumerUtil.renderQuad(buffer, stack, getMatrix4f(), getMatrix3f(), x1, y1, z1, x2, y2, z2, diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java new file mode 100644 index 000000000..9fba30150 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java @@ -0,0 +1,27 @@ +package net.pitan76.mcpitanlib.api.util.client.v2; + +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.screen.Screen; + +public class ScreenUtil extends net.pitan76.mcpitanlib.api.util.client.ScreenUtil { + + public static void setFocus(Screen screen, boolean focus) { + screen.setFocused(focus); + } + + public static void setFocus(Screen screen, Element element) { + screen.setFocused(element); + } + + public static boolean isFocused(Screen screen) { + return screen.isFocused(); + } + + public static void setDragging(Screen screen, boolean dragging) { + screen.setDragging(dragging); + } + + public static boolean isDragging(Screen screen) { + return screen.isDragging(); + } +} From 96d982642b22f6dfed2b90a2d372e7838df055a7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 15 Jun 2025 14:27:11 +0900 Subject: [PATCH 516/622] [cp] feat: add BlockEntityTypeBuilder for flexible block entity type creation --- .../api/tile/v2/BlockEntityTypeBuilder.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java new file mode 100644 index 000000000..af90ff0c0 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java @@ -0,0 +1,69 @@ +package net.pitan76.mcpitanlib.api.tile.v2; + +import com.mojang.datafixers.types.Type; +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.midohra.block.SupplierBlockWrapper; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Supplier; + +public class BlockEntityTypeBuilder extends net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder { + private final Factory factory; + private final Consumer> consumer; + + public BlockEntityTypeBuilder(Factory factory, Consumer> blocks) { + super(null, null); + + this.factory = factory; + this.consumer = blocks; + } + + @Deprecated + public static BlockEntityTypeBuilder create(Factory factory, Block... blocks) { + throw new IllegalStateException("Use create(Factory, Consumer>) instead"); + } + + public static BlockEntityTypeBuilder create(BlockEntityTypeBuilder.Factory factory, Consumer> blocks) { + return new BlockEntityTypeBuilder<>(factory, blocks); + } + + public static BlockEntityTypeBuilder createA(BlockEntityTypeBuilder.Factory factory, Supplier block) { + return new BlockEntityTypeBuilder<>(factory, blocks -> { + blocks.add(block.get()); + }); + } + + public static BlockEntityTypeBuilder create(BlockEntityTypeBuilder.Factory factory, SupplierBlockWrapper wrapper) { + return new BlockEntityTypeBuilder<>(factory, blocks -> { + blocks.add(wrapper.get()); + }); + } + + @Override + @Deprecated + public BlockEntityTypeBuilder addBlock(Block block) { + return this; + } + + @Override + @Deprecated + public BlockEntityTypeBuilder addBlocks(Block... blocks) { + return this; + } + + public BlockEntityType build() { + return build(null); + } + + public BlockEntityType build(Type type) { + List blocks = new ArrayList<>(); + if (consumer != null) + consumer.accept(blocks); + + return build(type, factory, blocks.toArray(new Block[0])); + } +} From 99b9e2f741d10638705c881f41c05c8151a78c26 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 15 Jun 2025 14:28:12 +0900 Subject: [PATCH 517/622] [cp] feat: add getWidth and getHeight methods to ScreenUtil for screen dimension retrieval --- .../pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java index 9fba30150..ac619fbdd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/v2/ScreenUtil.java @@ -24,4 +24,12 @@ public static void setDragging(Screen screen, boolean dragging) { public static boolean isDragging(Screen screen) { return screen.isDragging(); } + + public static int getWidth(Screen screen) { + return screen.width; + } + + public static int getHeight(Screen screen) { + return screen.height; + } } From afd3d99d68f97ad1827ecf8edd2e967b4fb6bd92 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 15 Jun 2025 14:29:01 +0900 Subject: [PATCH 518/622] [cp] bump version to 3.3.1 in info.properties --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index ba4ef1c6c..13530334c 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.0 +mod_version=3.3.1 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 9e0a5e5a5418170ee08662d366df05c19674b3f8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 15 Jun 2025 15:00:01 +0900 Subject: [PATCH 519/622] [cp] fix --- .../pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java index af90ff0c0..b2c0b1a98 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/v2/BlockEntityTypeBuilder.java @@ -64,6 +64,6 @@ public BlockEntityType build(Type type) { if (consumer != null) consumer.accept(blocks); - return build(type, factory, blocks.toArray(new Block[0])); + return BlockEntityType.Builder.create(factory::create, blocks.toArray(new Block[0])).build(type); } } From 7c55d9e665e449ffc7fcbecd55f67e0666d26282 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:33:00 +0900 Subject: [PATCH 520/622] [cp] fix CompatActionResult --- .../api/util/CompatActionResult.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java index ec615e0b9..426389c42 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatActionResult.java @@ -71,11 +71,44 @@ public static CompatActionResult of(EventResult result) { return PASS; } + @Deprecated public static CompatActionResult create(ActionResult result, EventResult eventResult) { return new CompatActionResult(result, eventResult); } + /** + * @deprecated Use {@link #of(ActionResult)} instead. + */ + @Deprecated public static CompatActionResult create(ActionResult result) { + return of(result); + } + + @Deprecated + public static CompatActionResult create2(ActionResult result) { return create(result, EventResult.stop()); } + + @Override + public boolean equals(Object obj) { + if (super.equals(obj)) return true; + if (!(obj instanceof CompatActionResult)) return false; + if (actionResult.equals(((CompatActionResult) obj).actionResult)) { + return eventResult.equals(((CompatActionResult) obj).eventResult); + } + + return false; + } + + public String getName() { + if (this == SUCCESS) return "SUCCESS"; + if (this == PASS) return "PASS"; + if (this == FAIL) return "FAIL"; + if (this == CONSUME) return "CONSUME"; + if (this == PASS_TO_DEFAULT_BLOCK_ACTION) return "PASS_TO_DEFAULT_BLOCK_ACTION"; + if (this == SUCCESS_SERVER) return "SUCCESS_SERVER"; + if (this == STOP) return "STOP"; + + return "UNKNOWN"; + } } From 2139e9bd6fd6282b17a4c0c6866987864ce04898 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:35:34 +0900 Subject: [PATCH 521/622] [cp] add of(List) to ItemStackList --- .../mcpitanlib/api/util/collection/ItemStackList.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java index cf2c0fc8a..4ccf255d1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java @@ -203,4 +203,12 @@ public static ItemStackList of(net.pitan76.mcpitanlib.midohra.item.ItemStack sta public static ItemStackList of(net.pitan76.mcpitanlib.midohra.item.ItemStack stack, int size) { return ItemStackList.ofSize(size, stack.toMinecraft()); } + + public static ItemStackList of(List stacks) { + ItemStackList list = ItemStackList.ofSize(stacks.size()); + for (int i = 0; i < stacks.size(); i++) + list.set(i, stacks.get(i)); + + return list; + } } From 02f5c3147040f256631d29dfda8d35d9c0012354 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:36:14 +0900 Subject: [PATCH 522/622] [cp] bump version to 3.3.2 in info.properties --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 13530334c..5b3cd70da 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.1 +mod_version=3.3.2 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 16689c88d15762867dfd7594d11d33a21f5301d2 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:46:11 +0900 Subject: [PATCH 523/622] [cp] refactor: rename of method to of2 for clarity in ItemStackList --- .../pitan76/mcpitanlib/api/util/collection/ItemStackList.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java index 4ccf255d1..3bf041152 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ItemStackList.java @@ -204,7 +204,7 @@ public static ItemStackList of(net.pitan76.mcpitanlib.midohra.item.ItemStack sta return ItemStackList.ofSize(size, stack.toMinecraft()); } - public static ItemStackList of(List stacks) { + public static ItemStackList of2(List stacks) { ItemStackList list = ItemStackList.ofSize(stacks.size()); for (int i = 0; i < stacks.size(); i++) list.set(i, stacks.get(i)); From 148d4cb638664d0b4c6ddc3cad98923bdecb12da Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 19 Jun 2025 14:41:33 +0900 Subject: [PATCH 524/622] [cp] add copyFrom in NbtUtil --- .../main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java index 392223622..013f1cd04 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/NbtUtil.java @@ -547,4 +547,8 @@ public static NbtByte createByte(byte value) { public static NbtShort createShort(short value) { return NbtShort.of(value); } + + public static void copyFrom(NbtCompound target, NbtCompound source) { + target.copyFrom(source); + } } From e6dc644a70dffb269f55c565aee551e76fea845d Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 19 Jun 2025 22:40:43 +0900 Subject: [PATCH 525/622] [cp] add NbtRWUtil --- .../mcpitanlib/api/util/nbt/NbtRWUtil.java | 137 ++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java new file mode 100644 index 000000000..0cf22dacd --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java @@ -0,0 +1,137 @@ +package net.pitan76.mcpitanlib.api.util.nbt; + +import net.minecraft.nbt.NbtCompound; +import net.pitan76.mcpitanlib.api.event.nbt.NbtRWArgs; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.util.NbtUtil; + +public class NbtRWUtil { + + public static void putBoolean(WriteNbtArgs args, String key, boolean value) { + NbtUtil.putBoolean(args.getNbt(), key, value); + } + + public static boolean getBoolean(ReadNbtArgs args, String key) { + return NbtUtil.getBoolean(args.getNbt(), key); + } + + public static void putByte(WriteNbtArgs args, String key, byte value) { + NbtUtil.putByte(args.getNbt(), key, value); + } + + public static byte getByte(ReadNbtArgs args, String key) { + return NbtUtil.getByte(args.getNbt(), key); + } + + public static void putInt(WriteNbtArgs args, String key, int value) { + NbtUtil.putInt(args.getNbt(), key, value); + } + + public static int getInt(ReadNbtArgs args, String key) { + return NbtUtil.getInt(args.getNbt(), key); + } + + public static void putLong(WriteNbtArgs args, String key, long value) { + NbtUtil.putLong(args.getNbt(), key, value); + } + + public static long getLong(ReadNbtArgs args, String key) { + return NbtUtil.getLong(args.getNbt(), key); + } + + public static void putShort(WriteNbtArgs args, String key, short value) { + NbtUtil.putShort(args.getNbt(), key, value); + } + + public static short getShort(ReadNbtArgs args, String key) { + return NbtUtil.getShort(args.getNbt(), key); + } + + public static void putFloat(WriteNbtArgs args, String key, float value) { + NbtUtil.putFloat(args.getNbt(), key, value); + } + + public static float getFloat(ReadNbtArgs args, String key) { + return NbtUtil.getFloat(args.getNbt(), key); + } + + public static void putDouble(WriteNbtArgs args, String key, double value) { + NbtUtil.putDouble(args.getNbt(), key, value); + } + + public static double getDouble(ReadNbtArgs args, String key) { + return NbtUtil.getDouble(args.getNbt(), key); + } + public static void putString(WriteNbtArgs args, String key, String value) { + NbtUtil.putString(args.getNbt(), key, value); + } + + public static String getString(ReadNbtArgs args, String key) { + return NbtUtil.getString(args.getNbt(), key); + } + + public static void putIntArray(WriteNbtArgs args, String key, int[] value) { + args.getNbt().putIntArray(key, value); + } + + public static int[] getIntArray(ReadNbtArgs args, String key) { + return args.nbt.getIntArray(key).get(); + } + + public static boolean getBooleanOrDefault(ReadNbtArgs args, String key, boolean defaultValue) { + return NbtUtil.getBooleanOrDefault(args.getNbt(), key, defaultValue); + } + + public static byte getByteOrDefault(ReadNbtArgs args, String key, byte defaultValue) { + return NbtUtil.getByteOrDefault(args.getNbt(), key, defaultValue); + } + + public static int getIntOrDefault(ReadNbtArgs args, String key, int defaultValue) { + return NbtUtil.getIntOrDefault(args.getNbt(), key, defaultValue); + } + + public static long getLongOrDefault(ReadNbtArgs args, String key, long defaultValue) { + return NbtUtil.getLongOrDefault(args.getNbt(), key, defaultValue); + } + + public static short getShortOrDefault(ReadNbtArgs args, String key, short defaultValue) { + return NbtUtil.getShortOrDefault(args.getNbt(), key, defaultValue); + } + + public static float getFloatOrDefault(ReadNbtArgs args, String key, float defaultValue) { + return NbtUtil.getFloatOrDefault(args.getNbt(), key, defaultValue); + } + + public static double getDoubleOrDefault(ReadNbtArgs args, String key, double defaultValue) { + return NbtUtil.getDoubleOrDefault(args.getNbt(), key, defaultValue); + } + + public static String getStringOrDefault(ReadNbtArgs args, String key, String defaultValue) { + return NbtUtil.getStringOrDefault(args.getNbt(), key, defaultValue); + } + + public static int[] getIntArrayOrDefault(ReadNbtArgs args, String key, int[] defaultValue) { + return args.nbt.getIntArray(key).orElse(defaultValue); + } + + public static boolean isEmpty(NbtRWArgs args) { + return args.nbt.isEmpty(); + } + + public static void put(WriteNbtArgs args, String key, NbtRWArgs other) { + putCompound(args, key, other.nbt); + } + + public static NbtRWArgs get(ReadNbtArgs args, String key) { + return new NbtRWArgs(getCompound(args, key)); + } + + public static void putCompound(WriteNbtArgs args, String key, NbtCompound other) { + NbtUtil.put(args.nbt, key, other); + } + + public static NbtCompound getCompound(ReadNbtArgs args, String key) { + return NbtUtil.get(args.nbt, key); + } +} From 9b8cb7bbd5cdd2b4a9e2ada586070458f4582040 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 19 Jun 2025 22:51:52 +0900 Subject: [PATCH 526/622] [cp] bump version 3.3.3 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 5b3cd70da..86868d838 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.2 +mod_version=3.3.3 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From aa66e726427bec0d444cc12c6f420c3b93986482 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 02:27:23 +0900 Subject: [PATCH 527/622] [cp] feat: implement NbtRWUtil for enhanced NBT read/write operations --- .../mcpitanlib/api/util/nbt/InvRWUtil.java | 26 +++++ .../mcpitanlib/api/util/nbt/v2/NbtRWUtil.java | 107 ++++++++++++++++++ 2 files changed, 133 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/InvRWUtil.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/InvRWUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/InvRWUtil.java new file mode 100644 index 000000000..65eb6c244 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/InvRWUtil.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.util.nbt; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.util.InventoryUtil; +import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; + +public class InvRWUtil { + public static void putInv(WriteNbtArgs args, DefaultedList stacks) { + InventoryUtil.writeNbt(args.getRegistryLookup(), args.getNbt(), stacks); + } + + public static void getInv(ReadNbtArgs args, DefaultedList stacks) { + InventoryUtil.readNbt(args.getRegistryLookup(), args.getNbt(), stacks); + } + + public static void putInv(WriteNbtArgs args, ItemStackList stacks) { + putInv(args, (DefaultedList) stacks); + } + + public static void getInv(ReadNbtArgs args, ItemStackList stacks) { + getInv(args, (DefaultedList) stacks); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java new file mode 100644 index 000000000..1c2b441ec --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java @@ -0,0 +1,107 @@ +package net.pitan76.mcpitanlib.api.util.nbt.v2; + +import net.minecraft.nbt.NbtCompound; +import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.Vec3i; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; +import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.util.NbtUtil; +import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; +import net.pitan76.mcpitanlib.api.util.math.PosUtil; +import net.pitan76.mcpitanlib.api.util.math.Vec3dUtil; +import net.pitan76.mcpitanlib.api.util.math.Vec3iUtil; +import net.pitan76.mcpitanlib.api.util.nbt.InvRWUtil; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; + +public class NbtRWUtil extends net.pitan76.mcpitanlib.api.util.nbt.NbtRWUtil { + public static void putInv(WriteNbtArgs args, ItemStackList stacks) { + InvRWUtil.putInv(args, stacks); + } + + public static void getInv(ReadNbtArgs args, ItemStackList stacks) { + InvRWUtil.getInv(args, stacks); + } + + public static WriteNbtArgs create(CompatRegistryLookup registryLookup) { + return new WriteNbtArgs(NbtUtil.create(), registryLookup); + } + + public static WriteNbtArgs create() { + return create(null); + } + + public static void put(WriteNbtArgs parent, WriteNbtArgs child, String key) { + NbtUtil.put(parent.nbt, key, child.nbt); + } + + public static WriteNbtArgs putWithCreate(WriteNbtArgs parent, String key) { + NbtCompound nbt = NbtUtil.create(); + NbtUtil.put(parent.nbt, key, nbt); + + return new WriteNbtArgs(nbt, parent.registryLookup); + } + + public static ReadNbtArgs get(ReadNbtArgs parent, String key) { + NbtCompound nbt = NbtUtil.get(parent.nbt, key); + return new ReadNbtArgs(nbt, parent.registryLookup); + } + + public static ReadNbtArgs getOrDefault(ReadNbtArgs parent, String key, ReadNbtArgs defaultValue) { + return NbtUtil.has(parent.nbt, key) ? get(parent, key) : defaultValue; + } + + public static void putPos3i(WriteNbtArgs args, String key, int x, int y, int z) { + WriteNbtArgs args2 = putWithCreate(args, key); + putInt(args2, "x", x); + putInt(args2, "y", y); + putInt(args2, "z", z); + } + + public static void putPos3d(WriteNbtArgs args, String key, double x, double y, double z) { + WriteNbtArgs args2 = putWithCreate(args, key); + putDouble(args2, "x", x); + putDouble(args2, "y", y); + putDouble(args2, "z", z); + } + + public static Vec3i getPos3i(ReadNbtArgs args, String key) { + ReadNbtArgs args2 = get(args, key); + int x = getInt(args2, "x"); + int y = getInt(args2, "y"); + int z = getInt(args2, "z"); + return Vec3iUtil.create(x, y, z); + } + + public static Vec3d getPos3d(ReadNbtArgs args, String key) { + ReadNbtArgs args2 = get(args, key); + double x = getDouble(args2, "x"); + double y = getDouble(args2, "y"); + double z = getDouble(args2, "z"); + return Vec3dUtil.create(x, y, z); + } + + public static void putBlockPos(WriteNbtArgs args, String key, BlockPos pos) { + putPos3i(args, key, pos.getX(), pos.getY(), pos.getZ()); + } + + public static BlockPos getBlockPos(ReadNbtArgs args, String key) { + ReadNbtArgs args2 = get(args, key); + int x = getInt(args2, "x"); + int y = getInt(args2, "y"); + int z = getInt(args2, "z"); + return BlockPos.of(x, y, z); + } + + public static void putBlockPos(WriteNbtArgs args, String key, net.minecraft.util.math.BlockPos pos) { + putPos3i(args, key, PosUtil.x(pos), PosUtil.y(pos), PosUtil.z(pos)); + } + + public static net.minecraft.util.math.BlockPos getBlockPosV(ReadNbtArgs args, String key) { + ReadNbtArgs args2 = get(args, key); + int x = getInt(args2, "x"); + int y = getInt(args2, "y"); + int z = getInt(args2, "z"); + return PosUtil.flooredBlockPos(x, y, z); + } +} From f5620a137015e24a04e13e4f343f8c29cda3ee86 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 10:35:43 +0900 Subject: [PATCH 528/622] [cp] fix: implement BlockStatePropertyHolder in BlockScheduledTickEvent for improved block state handling --- .../api/event/block/BlockScheduledTickEvent.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java index df1f29d34..f80420f5b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/BlockScheduledTickEvent.java @@ -8,8 +8,9 @@ import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; +import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; -public class BlockScheduledTickEvent extends BaseEvent { +public class BlockScheduledTickEvent extends BaseEvent implements BlockStatePropertyHolder { public BlockState state; public ServerWorld world; public BlockPos pos; @@ -41,4 +42,9 @@ public CompatRandom getRandom() { public BlockEntity getBlockEntity() { return WorldUtil.getBlockEntity(getWorld(), getPos()); } + + @Override + public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } } From 0d0d2806a65b6cc737d1e37ddd979423224376f2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 10:40:00 +0900 Subject: [PATCH 529/622] [cp] feat: add methods to register render types for blocks and fluids in CompatRegistryClient --- .../api/client/registry/CompatRegistryClient.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index 00d55af2e..e4beeebf7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -42,6 +42,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.random.Random; import net.pitan76.mcpitanlib.MCPitanLib; +import net.pitan76.mcpitanlib.api.client.render.CompatRenderLayer; import net.pitan76.mcpitanlib.api.client.render.EntityModelLayerContext; import java.util.List; @@ -199,4 +200,12 @@ public static void registerCompatBlockEntityRenderer(Blo ctx.getRenderDispatcher(), ctx.getRenderManager(), ctx.getItemRenderer(), ctx.getEntityRenderDispatcher(), ctx.getLayerRenderDispatcher(), ctx.getTextRenderer() ))); } + + public static void registerRenderTypeBlock(CompatRenderLayer layer, Block block) { + registerRenderTypeBlock(layer.layer, block); + } + + public static void registerRenderTypeFluid(CompatRenderLayer layer, Fluid fluid) { + registerRenderTypeFluid(layer.layer, fluid); + } } From c2100bb034c7343f5d2a9095e0df69d102386d30 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 10:46:44 +0900 Subject: [PATCH 530/622] [cp] fix-1214 --- .../java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java index 0cf22dacd..4cfd30313 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/NbtRWUtil.java @@ -76,7 +76,7 @@ public static void putIntArray(WriteNbtArgs args, String key, int[] value) { } public static int[] getIntArray(ReadNbtArgs args, String key) { - return args.nbt.getIntArray(key).get(); + return args.nbt.getIntArray(key); } public static boolean getBooleanOrDefault(ReadNbtArgs args, String key, boolean defaultValue) { @@ -112,7 +112,8 @@ public static String getStringOrDefault(ReadNbtArgs args, String key, String def } public static int[] getIntArrayOrDefault(ReadNbtArgs args, String key, int[] defaultValue) { - return args.nbt.getIntArray(key).orElse(defaultValue); + if (!NbtUtil.has(args.nbt, key)) return defaultValue; + return args.nbt.getIntArray(key); } public static boolean isEmpty(NbtRWArgs args) { From 5251a6d4b4c0039dc7415b51ce3b4a56c52dfb0e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 11:38:10 +0900 Subject: [PATCH 531/622] [cp] add .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a6596c591..71533e27f 100644 --- a/.gitignore +++ b/.gitignore @@ -118,4 +118,7 @@ run/ php/ # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar \ No newline at end of file +!gradle-wrapper.jar + +publish.bat +pull.bat \ No newline at end of file From e6dea7ff017afd00c4388ed5a3dd3f3b71c08d74 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 11:47:55 +0900 Subject: [PATCH 532/622] [cp] remove bat .gitignore --- .gitignore | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 71533e27f..a6596c591 100644 --- a/.gitignore +++ b/.gitignore @@ -118,7 +118,4 @@ run/ php/ # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -publish.bat -pull.bat \ No newline at end of file +!gradle-wrapper.jar \ No newline at end of file From 2c0cd8ec1583d17b9ad6cf9aff5c11b8b0fd5849 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 11:48:09 +0900 Subject: [PATCH 533/622] [cp] add bat --- publish.bat | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pull.bat | 54 +++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 publish.bat create mode 100644 pull.bat diff --git a/publish.bat b/publish.bat new file mode 100644 index 000000000..c470e0edf --- /dev/null +++ b/publish.bat @@ -0,0 +1,105 @@ +git fetch origin + +git checkout 1.16.5 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :forge:modrinth + +git checkout 1.18.2 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :forge:modrinth + +git checkout 1.19.2 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :forge:modrinth + +git checkout 1.20.1 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :forge:modrinth + +git checkout 1.20.4 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenForgePublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :forge:modrinth +call gradlew.bat :neoforge:modrinth + +git checkout 1.21.1 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :neoforge:modrinth + +git checkout 1.21.3 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :neoforge:modrinth + +git checkout 1.21.4 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :neoforge:modrinth + +git checkout 1.21.5 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :neoforge:modrinth + +git checkout 1.21.6 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :neoforge:modrinth + +pause \ No newline at end of file diff --git a/pull.bat b/pull.bat new file mode 100644 index 000000000..25011ab99 --- /dev/null +++ b/pull.bat @@ -0,0 +1,54 @@ +git fetch origin +git checkout 1.21.6 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.21.5 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.21.4 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.21.3 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.21.1 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.20.4 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.20.1 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.19.2 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.18.2 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.16.5 +timeout /T 1 +git pull + +git fetch origin +git checkout 1.21.6 + +pause \ No newline at end of file From 1456e4472efbe22579a8e6054c1442ba66547bfd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Jun 2025 11:53:52 +0900 Subject: [PATCH 534/622] [cp] fix: update artifactId and add GitHub Packages repository configuration in build.gradle --- common/build.gradle | 12 +++++-- fabric/build.gradle | 26 +++++++++----- neoforge/build.gradle | 12 +++++-- upload_maven.php | 84 ------------------------------------------- 4 files changed, 38 insertions(+), 96 deletions(-) delete mode 100644 upload_maven.php diff --git a/common/build.gradle b/common/build.gradle index 15123e38f..b6e594192 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -17,13 +17,21 @@ loom { publishing { publications { mavenCommon(MavenPublication) { - artifactId = info.archives_base_name + artifactId = info.archives_base_name + "-" + project.name + "-" + rootProject.minecraft_version + version = info.mod_version from components.java } } // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. repositories { - // Add repositories to publish to here. + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/PTOM76/maven") + credentials { + username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") + password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") + } + } } } \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index 5d27b796e..78517ba62 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -81,16 +81,26 @@ components.java { } publishing { - publications { - mavenFabric(MavenPublication) { - artifactId = info.archives_base_name + "-" + project.name - from components.java + publishing { + publications { + mavenFabric(MavenPublication) { + artifactId = info.archives_base_name + "-" + project.name + "-" + rootProject.minecraft_version + version = info.mod_version + from components.java + } } - } - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/PTOM76/maven") + credentials { + username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") + password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") + } + } + } } } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index ae9d63539..c1c5fa30e 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -91,13 +91,21 @@ components.java { publishing { publications { mavenNeoForge(MavenPublication) { - artifactId = info.archives_base_name + "-" + project.name + artifactId = info.archives_base_name + "-" + project.name + "-" + rootProject.minecraft_version + version = info.mod_version from components.java } } // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. repositories { - // Add repositories to publish to here. + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/PTOM76/maven") + credentials { + username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR") + password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") + } + } } } \ No newline at end of file diff --git a/upload_maven.php b/upload_maven.php deleted file mode 100644 index 4d49371b5..000000000 --- a/upload_maven.php +++ /dev/null @@ -1,84 +0,0 @@ - 'common/build/', - 'fabric' => 'fabric/build/', - 'forge' => 'forge/build/', - 'neoforge' => 'neoforge/build/', -)); - -define('GAME_VERSIONS', array( - '1.16.5' => '1.16.5', - '1.18.2' => '1.18.2', - '1.19.2' => '1.19.2', - '1.20.1' => '1.20.1', - '1.20.4' => '1.20.4', -)); - -define('PLATFORM_FILE_MARK', array( - 'common' => '', - 'fabric' => '-fabric', - 'forge' => '-forge', - 'neoforge' => '-neoforge', -)); - -foreach (DIRS as $type => $dir) { - - foreach (GAME_VERSIONS as $file_ver => $ver) { - - $postData = array(); - - $postData['group_id'] = 'net.pitan76'; - $postData['artifact_id'] = 'mcpitanlib-' . $type . '+' . $ver; - $postData['version'] = VERSION; - - $files = array( - $dir . 'libs/mcpitanlib-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '.jar', - $dir . 'libs/mcpitanlib-' . VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '-sources.jar', - $dir . 'publications/maven' . ucfirst($type) . '/mcpitanlib-' . $file_ver . '.pom', - ); - - $pom = '../' . $dir . 'publications/maven' . ucfirst($type) . '/mcpitanlib-' . $file_ver . '.pom'; - - $pom_str = file_get_contents($pom); - $pom_str = preg_replace('/' . preg_quote(VERSION . '-' . $file_ver . PLATFORM_FILE_MARK[$type] . '', '/'). '/', VERSION . '', $pom_str, 1); - $pom_str = preg_replace('/' . preg_quote('mcpitanlib' . PLATFORM_FILE_MARK[$type] . '', '/') . '/', 'mcpitanlib' . ($type == "common" ? '-common' : PLATFORM_FILE_MARK[$type]) . '+' . $file_ver . '', $pom_str, 1); - - file_put_contents($pom, $pom_str); - - $notfound = false; - - foreach ($files as $index => $file) { - - if (!file_exists(realpath("../" . $file))) { - echo "not found" . $file; - $notfound = true; - continue; - } - $postData['upload[' . $index . ']'] = curl_file_create( - realpath("../" . $file), - mime_content_type("../" . $file), - basename("../" . $file) - ); - echo "Uploading '" . $file . "'\n"; - } - - if ($notfound) continue; - - $request = curl_init('http://localhost/maven/maven.php'); - curl_setopt($request, CURLOPT_POST, true); - curl_setopt($request, CURLOPT_POSTFIELDS, $postData); - curl_setopt($request, CURLOPT_RETURNTRANSFER, true); - $result = curl_exec($request); - - if ($result === false) { - error_log(curl_error($request)); - } - curl_close($request); - } -} From 4db22659969feb9938c09fa9fe790819e0aaba81 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Mon, 23 Jun 2025 20:42:44 +0900 Subject: [PATCH 535/622] [cp] docs: update version references to include GitHub Packages for clarity --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d06519293..ca3eaecdb 100644 --- a/README.md +++ b/README.md @@ -41,11 +41,11 @@ dependencies { `gradle.properties`に以下のように記述してください。 ```properties -# Example: mcpitanlib_version=+1.18.2:3.2.4 +# Example: mcpitanlib_version=+1.18.2:3.3.3 mcpitanlib_version=+x.x.x:x.x.x ``` -バージョンは[maven.pitan76.net](https://maven.pitan76.net/net/pitan76/)で確認してください。 +バージョンは[GitHub Packages](https://github.com/PTOM76/maven/packages/?q=net.pitan76.mcpitanlib) (3.3.3以降) or [maven.pitan76.net](https://maven.pitan76.net/net/pitan76/) (3.3.3以前)で確認してください。 MCPitanLibを用いたMOD開発は「common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java」を参考にしてください。 @@ -92,7 +92,7 @@ Write as follows in `gradle.properties`. mcpitanlib_version=+x.x.x:x.x.x ``` -Please check the version at [maven.pitan76.net](https://maven.pitan76.net/net/pitan76/). +Please check the version at [GitHub Packages](https://github.com/PTOM76/maven/packages/?q=net.pitan76.mcpitanlib) (for versions 3.3.3 and later) or [maven.pitan76.net](https://maven.pitan76.net/net/pitan76/) (for versions before 3.3.3). For MOD development using MCPitanLib, refer to "common/src/main/java/net/pitan76/mcpitanlib/test/ExampleMod.java". From 0540591962e6701cbdb10949ca9fbc45e3b86783 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Tue, 24 Jun 2025 10:03:57 +0900 Subject: [PATCH 536/622] [cp] feat: add methods to check emptiness and copy NbtRWArgs in NbtRWArgs, ReadNbtArgs, and WriteNbtArgs --- .../mcpitanlib/api/event/nbt/NbtRWArgs.java | 16 ++++++++++++++++ .../mcpitanlib/api/event/nbt/ReadNbtArgs.java | 10 ++++++++++ .../mcpitanlib/api/event/nbt/WriteNbtArgs.java | 10 ++++++++++ 3 files changed, 36 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java index 138dd9f2a..598e5fa03 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/NbtRWArgs.java @@ -41,4 +41,20 @@ public RegistryWrapper.WrapperLookup getWrapperLookup() { return registryLookup.getRegistryLookup(); } + + public boolean isNbtEmpty() { + return nbt != null && !nbt.isEmpty(); + } + + public boolean isViewEmpty() { + return false; + } + + public boolean isEmpty() { + return isNbtEmpty() || isViewEmpty(); + } + + public NbtRWArgs copy() { + return new NbtRWArgs(nbt.copy(), registryLookup); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java index 54062abab..b4e77f14f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/ReadNbtArgs.java @@ -18,4 +18,14 @@ public ReadNbtArgs(NbtCompound nbt) { public ReadNbtArgs(NbtCompound nbt, CompatRegistryLookup registryLookup) { super(nbt, registryLookup); } + + @Override + public boolean isViewEmpty() { + return false; + } + + @Override + public NbtRWArgs copy() { + return new ReadNbtArgs(nbt.copy(), registryLookup); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java index 9a32af93d..ca7bf3be8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/nbt/WriteNbtArgs.java @@ -18,4 +18,14 @@ public WriteNbtArgs(NbtCompound nbt, CompatRegistryLookup registryLookup) { public WriteNbtArgs(NbtCompound nbt) { super(nbt); } + + @Override + public boolean isViewEmpty() { + return false; + } + + @Override + public NbtRWArgs copy() { + return new WriteNbtArgs(nbt.copy(), registryLookup); + } } From 57e5e9f1276fffd2a608f3d6b7436b3f2461a71a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Tue, 24 Jun 2025 10:34:07 +0900 Subject: [PATCH 537/622] [cp] feat: enhance Nbt read/write methods to include registry lookup in BlockEntityDataUtil --- .../net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java index fa31cb3d5..44d526e73 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java @@ -29,12 +29,12 @@ public static boolean hasBlockEntityNbt(ItemStack stack) { public static void readCompatBlockEntityNbtFromStack(ItemStack stack, CompatBlockEntity blockEntity) { NbtCompound nbt = getBlockEntityNbt(stack); - blockEntity.readNbt(new ReadNbtArgs(nbt)); + blockEntity.readNbt(new ReadNbtArgs(nbt, RegistryLookupUtil.getRegistryLookup(blockEntity))); } public static void writeCompatBlockEntityNbtToStack(ItemStack stack, CompatBlockEntity blockEntity) { NbtCompound nbt = getBlockEntityNbt(stack); - blockEntity.writeNbt(new WriteNbtArgs(nbt)); + blockEntity.writeNbt(new WriteNbtArgs(nbt, RegistryLookupUtil.getRegistryLookup(blockEntity))); NbtUtil.set(nbt, "id", BlockEntityTypeUtil.toID(blockEntity.getType()).toString()); setBlockEntityNbt(stack, nbt); } From f4a1fd349d7c26958f367fdf94e6be958d448b6d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 28 Jun 2025 00:58:41 +0900 Subject: [PATCH 538/622] [cp] feat: add ClippedInventory and ClippedItemStackList for inventory management --- .../util/collection/ClippedItemStackList.java | 100 ++++++++++++++++++ .../api/util/inventory/ClippedInventory.java | 91 ++++++++++++++++ .../api/util/inventory/ICompatInventory.java | 60 +++++++++++ 3 files changed, 251 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ClippedItemStackList.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ClippedInventory.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ICompatInventory.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ClippedItemStackList.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ClippedItemStackList.java new file mode 100644 index 000000000..432caf05f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/collection/ClippedItemStackList.java @@ -0,0 +1,100 @@ +package net.pitan76.mcpitanlib.api.util.collection; + +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.util.inventory.ClippedInventory; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; +import org.jetbrains.annotations.NotNull; + +public class ClippedItemStackList extends ItemStackList { + + public final ItemStackList list; + public final int start; + public final int end; + + public ClippedItemStackList(ItemStackList list, int start, int end) { + super(null, null); + this.list = list; + if (start < 0 || end > list.size() || start >= end) { + throw new IllegalArgumentException("Invalid start or end indices for clipping item stack list."); + } + this.start = start; + this.end = end; + } + + public static ClippedItemStackList of(ItemStackList list, int start, int end) { + return new ClippedItemStackList(list, start, end); + } + + public static ClippedItemStackList of(ItemStackList list) { + return of(list, 0, list.size()); + } + + public static ClippedItemStackList of(ItemStackList list, int start) { + return of(list, start, list.size()); + } + + @Override + public int size() { + return end - start; + } + + @Override + public Inventory toInventory() { + return ClippedInventory.of(list.toInventory(), start, end); + } + + @Override + public DefaultedList defaultedList() { + DefaultedList clippedList = DefaultedList.ofSize(size(), ItemStackUtil.empty()); + for (int i = 0; i < size(); i++) + clippedList.set(i, get(i)); + + return clippedList; + } + + @Override + public @NotNull ItemStack get(int index) { + return list.get(start + index); + } + + @Override + public ItemStack set(int index, ItemStack element) { + return list.set(start + index, element); + } + + @Override + public ItemStack remove(int index) { + return list.remove(start + index); + } + + @Override + public boolean contains(Object o) { + for (int i = start; i < end; i++) { + if (list.get(i).equals(o)) { + return true; + } + } + return false; + } + + @Override + public boolean isEmpty() { + for (int i = start; i < end; i++) { + if (!list.get(i).isEmpty()) { + return false; + } + } + return true; + } + + @Override + public void clear() { + for (int i = start; i < end; i++) { + list.set(i, ItemStackUtil.empty()); + } + } + + +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ClippedInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ClippedInventory.java new file mode 100644 index 000000000..49bcbc196 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ClippedInventory.java @@ -0,0 +1,91 @@ +package net.pitan76.mcpitanlib.api.util.inventory; + +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; + +public class ClippedInventory implements Inventory, ICompatInventory { + + private final Inventory inventory; + private final int start; + private final int end; + + public static ClippedInventory of(Inventory inventory, int start, int end) { + if (start < 0 || end > inventory.size() || start >= end) { + throw new IllegalArgumentException("Invalid start or end indices for clipping inventory."); + } + return new ClippedInventory(inventory, start, end); + } + + public static ClippedInventory of(Inventory inventory) { + return of(inventory, 0, inventory.size()); + } + + public static ClippedInventory of(Inventory inventory, int start) { + return of(inventory, start, inventory.size()); + } + + public ClippedInventory(Inventory inventory, int start, int end) { + this.inventory = inventory; + this.start = start; + this.end = end; + } + + @Override + public int size() { + return end - start; + } + + @Override + public boolean isEmpty() { + for (int i = start; i < end; i++) { + if (!inventory.getStack(i).isEmpty()) { + return false; + } + } + return true; + } + + @Override + public ItemStack getStack(int slot) { + return inventory.getStack(start + slot); + } + + @Override + public ItemStack removeStack(int slot, int amount) { + return inventory.removeStack(start + slot, amount); + } + + @Override + public ItemStack removeStack(int slot) { + return inventory.removeStack(start + slot); + } + + @Override + public void setStack(int slot, ItemStack stack) { + inventory.setStack(start + slot, stack); + } + + @Override + public void markDirty() { + inventory.markDirty(); + } + + @Override + public boolean canPlayerUse(PlayerEntity player) { + return inventory.canPlayerUse(player); + } + + @Override + public void clear() { + for (int i = start; i < end; i++) { + inventory.setStack(i, ItemStackUtil.empty()); + } + } + + @Override + public int getMaxCountPerStack() { + return inventory.getMaxCountPerStack(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ICompatInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ICompatInventory.java new file mode 100644 index 000000000..b33afd6be --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/ICompatInventory.java @@ -0,0 +1,60 @@ +package net.pitan76.mcpitanlib.api.util.inventory; + +import net.minecraft.inventory.Inventory; +import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.entity.Player; + +public interface ICompatInventory extends Inventory { + default void callSetStack(int slot, ItemStack stack) { + setStack(slot, stack); + } + + default ItemStack callGetStack(int slot) { + return getStack(slot); + } + + default int callSize() { + return size(); + } + + default boolean callIsEmpty() { + return isEmpty(); + } + + default ItemStack callRemoveStack(int slot, int amount) { + return removeStack(slot, amount); + } + + default ItemStack callRemoveStack(int slot) { + return removeStack(slot); + } + + default void callClear() { + clear(); + } + + default void callMarkDirty() { + markDirty(); + } + + default boolean callCanPlayerUse(net.minecraft.entity.player.PlayerEntity player) { + return canPlayerUse(player); + } + + default boolean canPlayerUse(Player player) { + return canPlayerUse(player.getEntity()); + } + + + default void callSetStack(int slot, net.pitan76.mcpitanlib.midohra.item.ItemStack stack) { + setStack(slot, stack.toMinecraft()); + } + + default net.pitan76.mcpitanlib.midohra.item.ItemStack callGetStackAsMidohra(int slot) { + return net.pitan76.mcpitanlib.midohra.item.ItemStack.of(getStack(slot)); + } + + default int callGetMaxCountPerStack() { + return getMaxCountPerStack(); + } +} From 118033ed7e14924b2c23b62c9bdd88253bda9f3c Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 28 Jun 2025 23:31:56 +0900 Subject: [PATCH 539/622] [cp] bump version 3.3.4 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 86868d838..841eb2094 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.3 +mod_version=3.3.4 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From ae865f7e5de5e86387cabd7e71532000b4f394cf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 5 Jul 2025 18:53:47 +0900 Subject: [PATCH 540/622] [cp] bump version 3.3.5 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 841eb2094..c97c52827 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.4 +mod_version=3.3.5 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From d4bc9094c0a4cef6caabd589d789374b4ca209f1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 5 Jul 2025 23:12:20 +0900 Subject: [PATCH 541/622] [cp] bump version 3.3.6 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index c97c52827..40ebd3d03 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.5 +mod_version=3.3.6 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From ea452e74e919001a53f4adc0f9b9dae0660c49a8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 5 Jul 2025 23:16:13 +0900 Subject: [PATCH 542/622] [cp] simplify SoundEvent ID retrieval method --- .../java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java index c1e7f69ab..57a0c1364 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java @@ -10,7 +10,7 @@ public class SoundEventUtil { public static Identifier getId(SoundEvent soundEvent) { - return Registries.SOUND_EVENT.getId(soundEvent); + return soundEvent.id(); } public static SoundEvent getSoundEvent(Identifier id) { From 4ecd615a523f5a2ec10c934b7dad9151ed7d827d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 5 Jul 2025 23:24:06 +0900 Subject: [PATCH 543/622] fix: update SoundEvent ID retrieval method to use getId() --- .../java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java index 57a0c1364..a6f367799 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/SoundEventUtil.java @@ -10,7 +10,7 @@ public class SoundEventUtil { public static Identifier getId(SoundEvent soundEvent) { - return soundEvent.id(); + return soundEvent.getId(); } public static SoundEvent getSoundEvent(Identifier id) { From f36f911bb0cb0c874cf704f7ce0b0fbfee41bce6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 10:34:04 +0900 Subject: [PATCH 544/622] [cp] fix readNbt method to use ReadNbtArgs --- .../mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java | 7 ++++++- .../api/transfer/fluid/v1/fabric/FabricFluidStorage.java | 3 ++- .../transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java index be5e27766..f239e8608 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/IFluidStorage.java @@ -3,6 +3,7 @@ import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.nbt.NbtCompound; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; @@ -22,7 +23,11 @@ public interface IFluidStorage { void writeNbt(WriteNbtArgs args); - void readNbt(WriteNbtArgs args); + void readNbt(ReadNbtArgs args); + + default void readNbt(WriteNbtArgs args) { + readNbt(new ReadNbtArgs(args.getNbt(), args.getWrapperLookup())); + } default long insert(IFluidVariant variant, long maxAmount) { return insert(variant, maxAmount, false); diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java index d1db98157..533d1288d 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/fabric/FabricFluidStorage.java @@ -2,6 +2,7 @@ import net.fabricmc.fabric.api.transfer.v1.fluid.base.SingleFluidStorage; import net.fabricmc.fabric.api.transfer.v1.transaction.Transaction; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidStorage; import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; @@ -71,7 +72,7 @@ public void writeNbt(WriteNbtArgs args) { } @Override - public void readNbt(WriteNbtArgs args) { + public void readNbt(ReadNbtArgs args) { storage.readNbt(args.nbt, args.getWrapperLookup()); } diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java index 8d0519c69..990129320 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/transfer/fluid/v1/neoforge/NeoForgeFluidStorage.java @@ -2,6 +2,7 @@ import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; +import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidStorage; import net.pitan76.mcpitanlib.api.transfer.fluid.v1.IFluidVariant; @@ -66,7 +67,7 @@ public void writeNbt(WriteNbtArgs args) { } @Override - public void readNbt(WriteNbtArgs args) { + public void readNbt(ReadNbtArgs args) { storage.readFromNBT(args.getWrapperLookup(), args.nbt); } } From b0dff719b34b4bf9d2dda23db66277f1181a13c8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 10:40:21 +0900 Subject: [PATCH 545/622] [cp] fix: handle null Identifier in fromMinecraft method --- .../java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java index dafd1d855..999fa63cd 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CompatIdentifier.java @@ -142,6 +142,7 @@ public Identifier toMinecraft() { * @return The Identifier. */ public static CompatIdentifier fromMinecraft(Identifier id) { + if (id == null) return EMPTY; return of(id.toString()); } From de225e6a106745c423265715a2774cfa8ff35f1e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 10:42:40 +0900 Subject: [PATCH 546/622] [cp] feat: add toString and getName methods to Direction class --- .../pitan76/mcpitanlib/midohra/util/math/Direction.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java index 2ae99c417..c334c25ef 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java @@ -97,4 +97,12 @@ public Direction rotateYCounterclockwise() { return of(getRaw().rotateYCounterclockwise()); } + @Override + public String toString() { + return getRaw().toString(); + } + + public String getName() { + return getRaw().name(); + } } From 438c1d5360144e06c0de0e0135830282646fa0fd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 10:52:50 +0900 Subject: [PATCH 547/622] [cp] feat: add ChunkManagerUtil for chunk update management --- .../api/util/world/ChunkManagerUtil.java | 26 +++++++++++++++++++ .../api/util/world/ServerWorldUtil.java | 5 ++++ .../world/chunk/ServerChunkManager.java | 6 +++++ 3 files changed, 37 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ChunkManagerUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ChunkManagerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ChunkManagerUtil.java new file mode 100644 index 000000000..436192e5d --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ChunkManagerUtil.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.util.world; + +import net.minecraft.server.world.ServerChunkManager; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; + +public class ChunkManagerUtil { + + public static void markForUpdate(ServerChunkManager manager, BlockPos pos) { + markForUpdate(manager, pos.toRaw()); + } + + public static void markForUpdate(ServerChunkManager manager, net.minecraft.util.math.BlockPos pos) { + manager.markForUpdate(pos); + } + + public static void markForUpdate(ServerWorld world, net.minecraft.util.math.BlockPos pos) { + markForUpdate(ServerWorldUtil.getChunkManager(world), pos); + } + + public static void markForUpdate(World world, net.minecraft.util.math.BlockPos pos) { + if (!(world instanceof ServerWorld)) return; + markForUpdate((ServerWorld) world, pos); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java index 2b1202093..5d1097d1d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/ServerWorldUtil.java @@ -6,6 +6,7 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.particle.ParticleEffect; +import net.minecraft.server.world.ServerChunkManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.api.entity.Player; @@ -36,4 +37,8 @@ public static List getDroppedStacksOnBlock(BlockState state, ServerWo public static List getDroppedStacksOnBlock(BlockState state, ServerWorld world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack stack) { return Block.getDroppedStacks(state, world, pos, blockEntity, entity, stack); } + + public static ServerChunkManager getChunkManager(ServerWorld world) { + return world.getChunkManager(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java index f4d438620..281c72dbb 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ServerChunkManager.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.midohra.world.chunk; +import net.pitan76.mcpitanlib.api.util.world.ChunkManagerUtil; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; import net.pitan76.mcpitanlib.midohra.util.math.ChunkPos; import net.pitan76.mcpitanlib.midohra.world.ServerWorld; import net.pitan76.mcpitanlib.midohra.world.World; @@ -42,4 +44,8 @@ public void addTicket(ChunkTicketType ticketType, ChunkPos pos, int radiu public void removeTicket(ChunkTicketType ticketType, ChunkPos pos, int radius, T argument) { getRaw().removeTicket(ticketType.getRaw(), pos.getRaw(), radius, argument); } + + public void markForUpdate(BlockPos pos) { + ChunkManagerUtil.markForUpdate(getRaw(), pos); + } } From 153e080208f93ab924a4cad5ae189c206c548c46 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 12:24:11 +0900 Subject: [PATCH 548/622] [cp] feat: add BlockColorEvent and related classes for block color management --- .../api/client/color/BlockColorEvent.java | 83 +++++++++++++++++++ .../color/CompatBlockColorProvider.java | 15 ++++ .../client/registry/CompatRegistryClient.java | 11 +++ .../api/tile/RenderDataBlockEntity.java | 14 ++++ .../color/fabric/BlockColorEventImpl.java | 18 ++++ .../fabric/CompatRegistryClientImpl.java | 11 +++ .../api/tile/RenderAttachmentBlockEntity.java | 21 +++++ .../fabric/RenderDataBlockEntityImpl.java | 14 ++++ .../neoforge/CompatRegistryClientImpl.java | 34 ++++++++ .../neoforge/MCPitanLibNeoForge.java | 2 + 10 files changed, 223 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/color/BlockColorEvent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/color/CompatBlockColorProvider.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderDataBlockEntity.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/client/color/fabric/BlockColorEventImpl.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderAttachmentBlockEntity.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/RenderDataBlockEntityImpl.java create mode 100644 neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/color/BlockColorEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/color/BlockColorEvent.java new file mode 100644 index 000000000..7e2873166 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/color/BlockColorEvent.java @@ -0,0 +1,83 @@ +package net.pitan76.mcpitanlib.api.client.color; + +import dev.architectury.injectables.annotations.ExpectPlatform; +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockRenderView; +import net.pitan76.mcpitanlib.midohra.world.BlockView; +import org.jetbrains.annotations.Nullable; + +public class BlockColorEvent { + private final BlockState state; + private final BlockRenderView world; + private final BlockPos pos; + private final int tintIndex; + + public BlockColorEvent(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) { + this.state = state; + this.world = world; + this.pos = pos; + this.tintIndex = tintIndex; + } + + public BlockState getState() { + return state; + } + + public BlockRenderView getWorld() { + return world; + } + + public BlockPos getPos() { + return pos; + } + + public int getTintIndex() { + return tintIndex; + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getPos()); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getState()); + } + + public boolean hasWorld() { + return getWorld() != null; + } + + public boolean hasPos() { + return getPos() != null; + } + + public BlockView getMidohraWorld() { + if (!hasWorld()) return null; + return net.pitan76.mcpitanlib.midohra.world.BlockView.of(getWorld()); + } + + public BlockEntity getBlockEntity() { + if (!hasWorld() || !hasPos()) return null; + return getWorld().getBlockEntity(getPos()); + } + + public int getDefaultColor() { + return 0xFFFFFF; + } + + public Object getRenderData() { + if (!hasWorld() || !hasPos()) return null; + return getRenderDataD(getBlockEntity()); + } + + @ExpectPlatform + protected static Object getRenderDataD(BlockEntity blockEntity) { + if (blockEntity instanceof net.pitan76.mcpitanlib.api.tile.RenderDataBlockEntity) { + return ((net.pitan76.mcpitanlib.api.tile.RenderDataBlockEntity) blockEntity).getCompatRenderData(); + } + + return null; + } +} \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/color/CompatBlockColorProvider.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/color/CompatBlockColorProvider.java new file mode 100644 index 000000000..50ceb12f4 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/color/CompatBlockColorProvider.java @@ -0,0 +1,15 @@ +package net.pitan76.mcpitanlib.api.client.color; + +import net.minecraft.block.BlockState; +import net.minecraft.client.color.block.BlockColorProvider; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.BlockRenderView; +import org.jetbrains.annotations.Nullable; + +public interface CompatBlockColorProvider extends BlockColorProvider { + default int getColor(BlockState state, @Nullable BlockRenderView world, @Nullable BlockPos pos, int tintIndex) { + return getColor(new BlockColorEvent(state, world, pos, tintIndex)); + } + + int getColor(BlockColorEvent e); +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java index e4beeebf7..4925199d1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/CompatRegistryClient.java @@ -12,6 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; @@ -42,6 +43,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.random.Random; import net.pitan76.mcpitanlib.MCPitanLib; +import net.pitan76.mcpitanlib.api.client.color.CompatBlockColorProvider; import net.pitan76.mcpitanlib.api.client.render.CompatRenderLayer; import net.pitan76.mcpitanlib.api.client.render.EntityModelLayerContext; @@ -208,4 +210,13 @@ public static void registerRenderTypeBlock(CompatRenderLayer layer, Block block) public static void registerRenderTypeFluid(CompatRenderLayer layer, Fluid fluid) { registerRenderTypeFluid(layer.layer, fluid); } + + @ExpectPlatform + public static void registerColorProviderBlock(BlockColorProvider provider, Block... blocks) { + throw new AssertionError("This method should be replaced by the platform implementation"); + } + + public static void registerColorProviderBlock(CompatBlockColorProvider provider, Block... blocks) { + registerColorProviderBlock((BlockColorProvider) provider, blocks); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderDataBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderDataBlockEntity.java new file mode 100644 index 000000000..4ce375ada --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderDataBlockEntity.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.tile; + +import org.jetbrains.annotations.Nullable; + +@Deprecated +public interface RenderDataBlockEntity { + + @Nullable + Object getCompatRenderData(); + + default boolean hasCompatRenderData() { + return getCompatRenderData() != null; + } +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/color/fabric/BlockColorEventImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/color/fabric/BlockColorEventImpl.java new file mode 100644 index 000000000..a4eef8c36 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/color/fabric/BlockColorEventImpl.java @@ -0,0 +1,18 @@ +package net.pitan76.mcpitanlib.api.client.color.fabric; + +import net.minecraft.block.entity.BlockEntity; +import net.pitan76.mcpitanlib.api.tile.RenderAttachmentBlockEntity; + +public class BlockColorEventImpl { + public static Object getRenderDataD(BlockEntity blockEntity) { + if (blockEntity instanceof RenderAttachmentBlockEntity) { + return ((RenderAttachmentBlockEntity) blockEntity).getCompatRenderData(); + } + + if (blockEntity instanceof net.pitan76.mcpitanlib.api.tile.RenderDataBlockEntity) { + return ((net.pitan76.mcpitanlib.api.tile.RenderDataBlockEntity) blockEntity).getCompatRenderData(); + } + + return blockEntity.getRenderData(); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java index 0b11d5c38..c4b7f7486 100644 --- a/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/client/registry/fabric/CompatRegistryClientImpl.java @@ -1,6 +1,9 @@ package net.pitan76.mcpitanlib.api.client.registry.fabric; import dev.architectury.registry.menu.MenuRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; +import net.minecraft.block.Block; +import net.minecraft.client.color.block.BlockColorProvider; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider; import net.minecraft.screen.ScreenHandler; @@ -11,4 +14,12 @@ public class CompatRegistryClientImpl { public static > void registerScreen(String modId, ScreenHandlerType type, CompatRegistryClient.ScreenFactory factory) { MenuRegistry.registerScreenFactory(type, factory::create); } + + public static void registerColorProviderBlock(BlockColorProvider provider, Block... blocks) { + if (blocks == null || blocks.length == 0) { + ColorProviderRegistry.BLOCK.register(provider); + } else { + ColorProviderRegistry.BLOCK.register(provider, blocks); + } + } } diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderAttachmentBlockEntity.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderAttachmentBlockEntity.java new file mode 100644 index 000000000..94bf987ba --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/RenderAttachmentBlockEntity.java @@ -0,0 +1,21 @@ +package net.pitan76.mcpitanlib.api.tile; + +import net.fabricmc.fabric.api.blockview.v2.RenderDataBlockEntity; +import org.jetbrains.annotations.Nullable; + +public interface RenderAttachmentBlockEntity extends RenderDataBlockEntity { + + @Override + @Nullable + @Deprecated + default Object getRenderData() { + return getCompatRenderData(); + } + + default boolean hasCompatRenderData() { + return getCompatRenderData() != null; + } + + @Nullable + Object getCompatRenderData(); +} diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/RenderDataBlockEntityImpl.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/RenderDataBlockEntityImpl.java new file mode 100644 index 000000000..45966b733 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/tile/fabric/RenderDataBlockEntityImpl.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.tile.fabric; + +import net.fabricmc.fabric.api.blockview.v2.RenderDataBlockEntity; + +@Deprecated +public interface RenderDataBlockEntityImpl extends RenderDataBlockEntity { + + default Object getRenderData() { + if (this instanceof net.pitan76.mcpitanlib.api.tile.RenderDataBlockEntity) { + return ((net.pitan76.mcpitanlib.api.tile.RenderDataBlockEntity) this).getCompatRenderData(); + } + return null; + } +} diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java new file mode 100644 index 000000000..6f9d6216b --- /dev/null +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java @@ -0,0 +1,34 @@ +package net.pitan76.mcpitanlib.api.client.registry.neoforge; + +import net.minecraft.block.Block; +import net.minecraft.client.color.block.BlockColorProvider; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; + +import java.util.HashMap; +import java.util.Map; + +public class CompatRegistryClientImpl { + + public static Map blockColorProviders = new HashMap<>(); + + public static void registerColorProviderBlock(BlockColorProvider provider, Block... blocks) { + blockColorProviders.put(provider, blocks); + } + + @SubscribeEvent + public static void registerBlockColors(RegisterColorHandlersEvent.Block event){ + if (blockColorProviders.isEmpty()) return; + + for (Map.Entry entry : blockColorProviders.entrySet()) { + BlockColorProvider provider = entry.getKey(); + Block[] blocks = entry.getValue(); + + if (blocks == null || blocks.length == 0) { + event.register(provider); + } else { + event.register(provider, blocks); + } + } + } +} diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index 0d9370d0b..8e6b57b94 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -6,6 +6,7 @@ import net.neoforged.neoforge.common.NeoForge; import net.pitan76.mcpitanlib.MCPitanLib; import net.pitan76.mcpitanlib.api.client.event.neoforge.WorldRenderRegistryImpl; +import net.pitan76.mcpitanlib.api.client.registry.neoforge.CompatRegistryClientImpl; import net.pitan76.mcpitanlib.api.util.PlatformUtil; @Mod(MCPitanLib.MOD_ID) @@ -18,6 +19,7 @@ public MCPitanLibNeoForge(ModContainer modContainer) { nfBus.addListener(WorldRenderRegistryImpl::renderOutlineEventBlock); nfBus.addListener(WorldRenderRegistryImpl::renderOutlineEvent); nfBus.addListener(WorldRenderRegistryImpl::renderLevelStageEvent); + nfBus.addListener(CompatRegistryClientImpl::registerBlockColors); } MCPitanLib.init(); From c208b324655b9c512ea36ec82be7d135910081dc Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 15:03:23 +0900 Subject: [PATCH 549/622] [cp] feat: add methods for item stack serialization in NbtRWUtil --- .../pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java index 1c2b441ec..e57b9b23a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/nbt/v2/NbtRWUtil.java @@ -1,5 +1,6 @@ package net.pitan76.mcpitanlib.api.util.nbt.v2; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; @@ -14,6 +15,8 @@ import net.pitan76.mcpitanlib.api.util.nbt.InvRWUtil; import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import java.util.Optional; + public class NbtRWUtil extends net.pitan76.mcpitanlib.api.util.nbt.NbtRWUtil { public static void putInv(WriteNbtArgs args, ItemStackList stacks) { InvRWUtil.putInv(args, stacks); @@ -104,4 +107,12 @@ public static net.minecraft.util.math.BlockPos getBlockPosV(ReadNbtArgs args, St int z = getInt(args2, "z"); return PosUtil.flooredBlockPos(x, y, z); } + + public static void putItemStack(WriteNbtArgs args, String key, ItemStack stack) { + NbtUtil.putItemStack(args.getNbt(), key, stack, args.getRegistryLookup()); + } + + public static Optional getItemStack(ReadNbtArgs args, String key) { + return NbtUtil.getItemStack(args.getNbt(), key, args.getRegistryLookup()); + } } From f69d0da3785460252a74dec22c2b38f6064e0a73 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 15:18:15 +0900 Subject: [PATCH 550/622] [cp] bump version 3.3.7 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 40ebd3d03..c10e0bc40 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.6 +mod_version=3.3.7 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 62ba0781d7184a941bd66c2e2e695802626fcf0f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 17:24:26 +0900 Subject: [PATCH 551/622] [cp] feat: add Registry of ChunkTicketType --- .../mcpitanlib/api/registry/v2/CompatRegistryV2.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index 525158b80..e42320266 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -13,6 +13,7 @@ import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.enchantment.CompatEnchantment; import net.pitan76.mcpitanlib.api.entity.effect.CompatStatusEffect; @@ -28,6 +29,7 @@ import net.pitan76.mcpitanlib.api.sound.RegistryResultCompatSoundEvent; import net.pitan76.mcpitanlib.api.tile.BlockEntityTypeBuilder; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.world.chunk.ChunkTicketType; import java.util.function.Supplier; @@ -158,6 +160,10 @@ public RegistryResult registerItemGroup(CreativeTabBuilder builder) { return cr1.registerItemGroup(builder.getIdentifier(), builder); } + public RegistryResult> registerChunkTicketType(Identifier id, Supplier> supplier) { + return SupplierResult.of(supplier); + } + public void registerFuel(Supplier itemSupplier, int time) { FuelRegistry.register(itemSupplier::get, time, cr1.getNamespace()); } From 75a0c4e2665e1eba8062373a8418e9aa30ecf50b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 17:26:07 +0900 Subject: [PATCH 552/622] [cp] bump version 3.3.8 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index c10e0bc40..e324cfa10 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.7 +mod_version=3.3.8 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 35a0ae00f93ab89f576d5900dc922544762f6ba8 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 6 Jul 2025 17:19:56 +0900 Subject: [PATCH 553/622] [cp] feat: implement hashCode and equals methods for ChunkTicketType --- .../midohra/world/chunk/ChunkTicketType.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java index 03c543559..8b3a65c63 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/chunk/ChunkTicketType.java @@ -76,4 +76,17 @@ private static net.minecraft.server.world.ChunkTicketType _of(String name net.minecraft.server.world.ChunkTicketType type = net.minecraft.server.world.ChunkTicketType.create(name, Comparator.comparingLong(ChunkPos::toLong), (int) expiryTicks); return (net.minecraft.server.world.ChunkTicketType) type; } + + @Override + public int hashCode() { + return ticketType.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof ChunkTicketType)) return false; + ChunkTicketType that = (ChunkTicketType) obj; + return ticketType.equals(that.ticketType); + } } From 8930507f5fe890ebcbbb2151a4ee5dc28d43d9e4 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 9 Jul 2025 11:35:17 +0900 Subject: [PATCH 554/622] [cp] refactor: remove unused SubscribeEvent annotation from registerBlockColors method --- .../api/client/registry/neoforge/CompatRegistryClientImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java index 6f9d6216b..a639bf61e 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/api/client/registry/neoforge/CompatRegistryClientImpl.java @@ -2,7 +2,6 @@ import net.minecraft.block.Block; import net.minecraft.client.color.block.BlockColorProvider; -import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; import java.util.HashMap; @@ -16,7 +15,6 @@ public static void registerColorProviderBlock(BlockColorProvider provider, Block blockColorProviders.put(provider, blocks); } - @SubscribeEvent public static void registerBlockColors(RegisterColorHandlersEvent.Block event){ if (blockColorProviders.isEmpty()) return; From a19fc686d3331a38289ddcf364d6223914a424f9 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Wed, 9 Jul 2025 11:35:43 +0900 Subject: [PATCH 555/622] [cp] bump version 3.3.9 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index e324cfa10..26aea2976 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.8 +mod_version=3.3.9 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 13179841c9b8383246a3cca34bfd7f3dd8569b6f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 12 Jul 2025 09:34:13 +0900 Subject: [PATCH 556/622] [cp] fix: neoforge CompatRegistryClientImpl --- .../net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java index 8e6b57b94..d36a8bde6 100644 --- a/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java +++ b/neoforge/src/main/java/net/pitan76/mcpitanlib/neoforge/MCPitanLibNeoForge.java @@ -19,7 +19,8 @@ public MCPitanLibNeoForge(ModContainer modContainer) { nfBus.addListener(WorldRenderRegistryImpl::renderOutlineEventBlock); nfBus.addListener(WorldRenderRegistryImpl::renderOutlineEvent); nfBus.addListener(WorldRenderRegistryImpl::renderLevelStageEvent); - nfBus.addListener(CompatRegistryClientImpl::registerBlockColors); + if (bus != null) + bus.addListener(CompatRegistryClientImpl::registerBlockColors); } MCPitanLib.init(); From 6386bf7aa02958f24ca60c712c73734c1df03ac6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 12 Jul 2025 09:40:39 +0900 Subject: [PATCH 557/622] [cp] version neoforge only fix.1 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 26aea2976..c178f5cfa 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.9 +mod_version=3.3.8-fix.1 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From 6715afbd719beb1754fcc07916cf2360beb46822 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 12 Jul 2025 10:42:57 +0900 Subject: [PATCH 558/622] =?UTF-8?q?[cp]=20fix=20register=E3=80=80TICKET=5F?= =?UTF-8?q?TYPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java index fe6cd62be..8576011ef 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java @@ -22,6 +22,7 @@ public MCPLRegistry1_21(MCPLRegistry mcplr, String MOD_ID) { public void register() { DATA_COMPONENT_TYPE.register(); + TICKET_TYPE.register(); } public RegistrySupplier> registryDataComponentType(Identifier id, Supplier> supplier) { From 77696f625b4f2dd83e3148fb4f758f487914d26e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 12 Jul 2025 10:43:44 +0900 Subject: [PATCH 559/622] =?UTF-8?q?[cp]=20add=20register=20for=E3=80=80Com?= =?UTF-8?q?patIdentifier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java index e42320266..b72feed66 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/registry/v2/CompatRegistryV2.java @@ -164,6 +164,10 @@ public RegistryResult> registerChunkTicketType(Identifier id, return SupplierResult.of(supplier); } + public RegistryResult> registerChunkTicketType(CompatIdentifier id, Supplier> supplier) { + return registerChunkTicketType(id.toMinecraft(), supplier); + } + public void registerFuel(Supplier itemSupplier, int time) { FuelRegistry.register(itemSupplier::get, time, cr1.getNamespace()); } From d54d7b745d87112af17576d21d93a543f6766de1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 12 Jul 2025 10:44:07 +0900 Subject: [PATCH 560/622] [cp] bump version 3.3.9 --- info.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.properties b/info.properties index c178f5cfa..eb782cbb0 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.8-fix.1 +mod_version=3.3.9 maven_group=net.pitan76 -changelog=add APIs \ No newline at end of file +changelog=fix APIs \ No newline at end of file From d8fdbaa95f7a06257bd3d7e8dbbabf1299dee3c7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 12 Jul 2025 10:46:50 +0900 Subject: [PATCH 561/622] [cp] remove ticket register --- .../net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java index 8576011ef..fe6cd62be 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/core/registry/MCPLRegistry1_21.java @@ -22,7 +22,6 @@ public MCPLRegistry1_21(MCPLRegistry mcplr, String MOD_ID) { public void register() { DATA_COMPONENT_TYPE.register(); - TICKET_TYPE.register(); } public RegistrySupplier> registryDataComponentType(Identifier id, Supplier> supplier) { From 62e351da178543c6436b625c3e0bef3711d2b9cd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 20 Jul 2025 00:14:10 +0900 Subject: [PATCH 562/622] [cp] changelog --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index eb782cbb0..26aea2976 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib mod_version=3.3.9 maven_group=net.pitan76 -changelog=fix APIs \ No newline at end of file +changelog=add APIs \ No newline at end of file From ab157490681468ff002185608811fdacaebee345 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 10 Aug 2025 20:51:40 +0900 Subject: [PATCH 563/622] [cp] add APIs (Equippable, EntityAttribute, AttributeModifier) --- .../attribute/AttrModifierOperation.java | 54 +++++++++++ .../AttributeModifiersComponentBuilder.java | 26 +++++ .../CompatAttributeModifierSlot.java | 64 +++++++++++++ .../CompatAttributeModifiersComponent.java | 34 +++++++ .../attribute/CompatEntityAttribute.java | 49 ++++++++++ .../CompatEntityAttributeInstance.java | 70 ++++++++++++++ .../CompatEntityAttributeModifier.java | 57 +++++++++++ .../attribute/CompatEntityAttributes.java | 28 ++++++ .../item/equipment/CompatEquipmentAsset.java | 50 ++++++++++ .../equipment/CompatEquippableComponent.java | 36 +++++++ .../equipment/EquippableComponentBuilder.java | 94 +++++++++++++++++++ .../api/item/v2/CompatibleItemSettings.java | 23 +++++ .../api/sound/CompatSoundEvents.java | 8 ++ 13 files changed, 593 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttrModifierOperation.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttributeModifiersComponentBuilder.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifiersComponent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttribute.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeInstance.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeModifier.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttrModifierOperation.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttrModifierOperation.java new file mode 100644 index 000000000..dd71d5eb8 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttrModifierOperation.java @@ -0,0 +1,54 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.minecraft.entity.attribute.EntityAttributeModifier; + +public class AttrModifierOperation { + private final EntityAttributeModifier.Operation raw; + + public static final AttrModifierOperation ADD = new AttrModifierOperation(EntityAttributeModifier.Operation.ADD_VALUE); + public static final AttrModifierOperation MUL_TOTAL = new AttrModifierOperation(EntityAttributeModifier.Operation.ADD_MULTIPLIED_TOTAL); + public static final AttrModifierOperation MUL_BASE = new AttrModifierOperation(EntityAttributeModifier.Operation.ADD_MULTIPLIED_BASE); + + @Deprecated + public AttrModifierOperation(EntityAttributeModifier.Operation raw) { + this.raw = raw; + } + + public static AttrModifierOperation of(EntityAttributeModifier.Operation raw) { + if (raw == EntityAttributeModifier.Operation.ADD_VALUE) { + return ADD; + } else if (raw == EntityAttributeModifier.Operation.ADD_MULTIPLIED_TOTAL) { + return MUL_TOTAL; + } else if (raw == EntityAttributeModifier.Operation.ADD_MULTIPLIED_BASE) { + return MUL_BASE; + } + + return new AttrModifierOperation(raw); + } + + public EntityAttributeModifier.Operation raw() { + return raw; + } + + public String getName() { + return raw().name(); + } + + public int getId() { + return raw().getId(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof AttrModifierOperation)) return false; + AttrModifierOperation that = (AttrModifierOperation) obj; + return raw().equals(that.raw()); + } + + @Override + public int hashCode() { + if (raw() == null) return super.hashCode(); + return raw().hashCode(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttributeModifiersComponentBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttributeModifiersComponentBuilder.java new file mode 100644 index 000000000..120a75040 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/AttributeModifiersComponentBuilder.java @@ -0,0 +1,26 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.minecraft.component.type.AttributeModifiersComponent; + +public class AttributeModifiersComponentBuilder { + + public final AttributeModifiersComponent.Builder builder = AttributeModifiersComponent.builder(); + + public AttributeModifiersComponentBuilder() { + + } + + public AttributeModifiersComponentBuilder add(CompatEntityAttribute attribute, CompatEntityAttributeModifier modifier, CompatAttributeModifierSlot slot) { + builder.add(attribute.raw(), modifier.raw(), slot.raw()); + return this; + } + + @Deprecated + public AttributeModifiersComponent build_raw() { + return builder.build(); + } + + public CompatAttributeModifiersComponent build() { + return CompatAttributeModifiersComponent.of(build_raw()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java new file mode 100644 index 000000000..43595c06b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java @@ -0,0 +1,64 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.minecraft.component.type.AttributeModifierSlot; +import net.pitan76.mcpitanlib.api.util.CompatStringIdentifiable; + +public class CompatAttributeModifierSlot implements CompatStringIdentifiable { + + private final AttributeModifierSlot raw; + + public static final CompatAttributeModifierSlot ANY = new CompatAttributeModifierSlot(AttributeModifierSlot.ANY); + public static final CompatAttributeModifierSlot MAIN_HAND = new CompatAttributeModifierSlot(AttributeModifierSlot.MAINHAND); + public static final CompatAttributeModifierSlot OFF_HAND = new CompatAttributeModifierSlot(AttributeModifierSlot.OFFHAND); + public static final CompatAttributeModifierSlot HEAD = new CompatAttributeModifierSlot(AttributeModifierSlot.HEAD); + public static final CompatAttributeModifierSlot FEET = new CompatAttributeModifierSlot(AttributeModifierSlot.FEET); + public static final CompatAttributeModifierSlot LEGS = new CompatAttributeModifierSlot(AttributeModifierSlot.LEGS); + public static final CompatAttributeModifierSlot CHEST = new CompatAttributeModifierSlot(AttributeModifierSlot.CHEST); + public static final CompatAttributeModifierSlot ARMOR = new CompatAttributeModifierSlot(AttributeModifierSlot.ARMOR); + public static final CompatAttributeModifierSlot BODY = new CompatAttributeModifierSlot(AttributeModifierSlot.BODY); + public static final CompatAttributeModifierSlot SADDLE = new CompatAttributeModifierSlot(AttributeModifierSlot.SADDLE); + + @Deprecated + public CompatAttributeModifierSlot(AttributeModifierSlot raw) { + this.raw = raw; + } + + public static CompatAttributeModifierSlot of(AttributeModifierSlot slot) { + if (slot == AttributeModifierSlot.ANY) return ANY; + if (slot == AttributeModifierSlot.MAINHAND) return MAIN_HAND; + if (slot == AttributeModifierSlot.OFFHAND) return OFF_HAND; + if (slot == AttributeModifierSlot.HEAD) return HEAD; + if (slot == AttributeModifierSlot.FEET) return FEET; + if (slot == AttributeModifierSlot.LEGS) return LEGS; + if (slot == AttributeModifierSlot.CHEST) return CHEST; + if (slot == AttributeModifierSlot.ARMOR) return ARMOR; + if (slot == AttributeModifierSlot.BODY) return BODY; + if (slot == AttributeModifierSlot.SADDLE) return SADDLE; + + return new CompatAttributeModifierSlot(slot); + } + + @Deprecated + public AttributeModifierSlot raw() { + return raw; + } + + @Override + public String asString_compat() { + return raw().asString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof CompatAttributeModifierSlot)) return false; + CompatAttributeModifierSlot that = (CompatAttributeModifierSlot) obj; + return raw().equals(that.raw()); + } + + @Override + public int hashCode() { + if (raw() == null) return super.hashCode(); + return raw().hashCode(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifiersComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifiersComponent.java new file mode 100644 index 000000000..ec9b8318c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifiersComponent.java @@ -0,0 +1,34 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.minecraft.component.type.AttributeModifiersComponent; + +public class CompatAttributeModifiersComponent { + private final AttributeModifiersComponent raw; + + @Deprecated + public CompatAttributeModifiersComponent(AttributeModifiersComponent component) { + this.raw = component; + } + + @Deprecated + public AttributeModifiersComponent raw() { + return raw; + } + + public static CompatAttributeModifiersComponent of(AttributeModifiersComponent component) { + return new CompatAttributeModifiersComponent(component); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + CompatAttributeModifiersComponent that = (CompatAttributeModifiersComponent) obj; + return raw.equals(that.raw); + } + + @Override + public int hashCode() { + return raw.hashCode(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttribute.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttribute.java new file mode 100644 index 000000000..0b116dc14 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttribute.java @@ -0,0 +1,49 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.registry.entry.RegistryEntry; + +public class CompatEntityAttribute { + public final RegistryEntry raw; + + @Deprecated + public CompatEntityAttribute(RegistryEntry attribute) { + this.raw = attribute; + } + + @Deprecated + public RegistryEntry raw() { + return raw; + } + + public String getId() { + return raw.getIdAsString(); + } + + public EntityAttribute getValue() { + return raw.value(); + } + + public boolean isNull() { + return raw == null; + } + + @Deprecated + public static CompatEntityAttribute of(RegistryEntry attribute) { + return new CompatEntityAttribute(attribute); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof CompatEntityAttribute)) return false; + CompatEntityAttribute that = (CompatEntityAttribute) obj; + return raw.equals(that.raw); + } + + @Override + public int hashCode() { + if (raw == null) return super.hashCode(); + return raw.hashCode(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeInstance.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeInstance.java new file mode 100644 index 000000000..e170013ca --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeInstance.java @@ -0,0 +1,70 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.attribute.EntityAttributeInstance; +import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.function.Consumer; + +public class CompatEntityAttributeInstance { + private final net.minecraft.entity.attribute.EntityAttributeInstance raw; + + @Deprecated + public CompatEntityAttributeInstance(net.minecraft.entity.attribute.EntityAttributeInstance instance) { + this.raw = instance; + } + + @Deprecated + public net.minecraft.entity.attribute.EntityAttributeInstance raw() { + return raw; + } + + @Deprecated + public static CompatEntityAttributeInstance of(net.minecraft.entity.attribute.EntityAttributeInstance instance) { + return new CompatEntityAttributeInstance(instance); + } + + public static CompatEntityAttributeInstance create(CompatEntityAttribute type, Consumer updateCallback) { + return of(new EntityAttributeInstance(type.raw(), modifier -> { + if (updateCallback != null) + updateCallback.accept(of(modifier)); + })); + } + + public static CompatEntityAttributeInstance get(LivingEntity entity, CompatEntityAttribute attribute) { + return new CompatEntityAttributeInstance(entity.getAttributeInstance(attribute.raw())); + } + + public static CompatEntityAttributeInstance get(Player player, CompatEntityAttribute attribute) { + return get(player.getEntity(), attribute); + } + + public boolean hasModifier(CompatIdentifier id) { + return raw().hasModifier(id.toMinecraft()); + } + + public double getValue() { + return raw().getValue(); + } + + public void setBaseValue(double value) { + raw().setBaseValue(value); + } + + public void addPersistentModifier(CompatEntityAttributeModifier modifier) { + raw().addPersistentModifier(modifier.raw()); + } + + public void removeModifier(CompatIdentifier id) { + raw().removeModifier(id.toMinecraft()); + } + + public CompatEntityAttribute getAttribute() { + return CompatEntityAttribute.of(raw().getAttribute()); + } + + public boolean isNull() { + return raw() == null; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeModifier.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeModifier.java new file mode 100644 index 000000000..59b4f2b74 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributeModifier.java @@ -0,0 +1,57 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class CompatEntityAttributeModifier { + private final net.minecraft.entity.attribute.EntityAttributeModifier raw; + + @Deprecated + public CompatEntityAttributeModifier(net.minecraft.entity.attribute.EntityAttributeModifier raw) { + this.raw = raw; + } + + @Deprecated + public static CompatEntityAttributeModifier of(net.minecraft.entity.attribute.EntityAttributeModifier raw) { + return new CompatEntityAttributeModifier(raw); + } + + public static CompatEntityAttributeModifier of(CompatIdentifier id, double value, AttrModifierOperation operation) { + return new CompatEntityAttributeModifier(new net.minecraft.entity.attribute.EntityAttributeModifier(id.toMinecraft(), value, operation.raw())); + } + + @Deprecated + public net.minecraft.entity.attribute.EntityAttributeModifier raw() { + return raw; + } + + public AttrModifierOperation getOperation() { + return AttrModifierOperation.of(raw().operation()); + } + + public double getValue() { + return raw().value(); + } + + public CompatIdentifier getId() { + return CompatIdentifier.fromMinecraft(raw().id()); + } + + @Override + public String toString() { + return raw().toString(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof CompatEntityAttributeModifier)) return false; + CompatEntityAttributeModifier that = (CompatEntityAttributeModifier) obj; + return raw().equals(that.raw()); + } + + @Override + public int hashCode() { + if (raw() == null) return super.hashCode(); + return raw().hashCode(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java new file mode 100644 index 000000000..d0c1f595f --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.api.entity.attribute; + +import net.minecraft.entity.attribute.EntityAttribute; +import net.minecraft.entity.attribute.EntityAttributes; +import net.minecraft.registry.entry.RegistryEntry; + +public class CompatEntityAttributes { + + public static final CompatEntityAttribute ARMOR = of(EntityAttributes.ARMOR); + public static final CompatEntityAttribute ARMOR_TOUGHNESS = of(EntityAttributes.ARMOR_TOUGHNESS); + public static final CompatEntityAttribute ATTACK_DAMAGE = of(EntityAttributes.ATTACK_DAMAGE); + public static final CompatEntityAttribute ATTACK_KNOCKBACK = of(EntityAttributes.ATTACK_KNOCKBACK); + public static final CompatEntityAttribute ATTACK_SPEED = of(EntityAttributes.ATTACK_SPEED); + public static final CompatEntityAttribute FOLLOW_RANGE = of(EntityAttributes.FOLLOW_RANGE); + public static final CompatEntityAttribute KNOCKBACK_RESISTANCE = of(EntityAttributes.KNOCKBACK_RESISTANCE); + public static final CompatEntityAttribute LUCK = of(EntityAttributes.LUCK); + public static final CompatEntityAttribute MOVEMENT_SPEED = of(EntityAttributes.MOVEMENT_SPEED); + public static final CompatEntityAttribute MAX_HEALTH = of(EntityAttributes.MAX_HEALTH); + public static final CompatEntityAttribute JUMP_STRENGTH = of(EntityAttributes.JUMP_STRENGTH); + public static final CompatEntityAttribute GRAVITY = of(EntityAttributes.GRAVITY); + public static final CompatEntityAttribute FLYING_SPEED = of(EntityAttributes.FLYING_SPEED); + public static final CompatEntityAttribute BLOCK_BREAK_SPEED = of(EntityAttributes.BLOCK_BREAK_SPEED); + public static final CompatEntityAttribute BLOCK_INTERACTION_RANGE = of(EntityAttributes.BLOCK_INTERACTION_RANGE); + + public static CompatEntityAttribute of(RegistryEntry attribute) { + return CompatEntityAttribute.of(attribute); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java new file mode 100644 index 000000000..3a979fc7e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java @@ -0,0 +1,50 @@ +package net.pitan76.mcpitanlib.api.item.equipment; + +import net.minecraft.item.equipment.EquipmentAssetKeys; +import net.minecraft.registry.RegistryKey; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class CompatEquipmentAsset { + private final RegistryKey raw; + + @Deprecated + public CompatEquipmentAsset(RegistryKey key) { + this.raw = key; + } + + @Deprecated + public RegistryKey raw() { + return raw; + } + + public CompatIdentifier getId() { + return CompatIdentifier.fromMinecraft(raw.getValue()); + } + + @Deprecated + public static CompatEquipmentAsset of(RegistryKey key) { + return new CompatEquipmentAsset(key); + } + + public static CompatEquipmentAsset of(CompatIdentifier id) { + return of(RegistryKey.of(EquipmentAssetKeys.REGISTRY_KEY, id.toMinecraft())); + } + + public static CompatEquipmentAsset of(String id) { + return of(CompatIdentifier.of(id)); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof CompatEquipmentAsset)) return false; + CompatEquipmentAsset that = (CompatEquipmentAsset) obj; + return raw.equals(that.raw); + } + + @Override + public int hashCode() { + if (raw == null) return super.hashCode(); + return raw.hashCode(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java new file mode 100644 index 000000000..e66cde67e --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java @@ -0,0 +1,36 @@ +package net.pitan76.mcpitanlib.api.item.equipment; + +import net.minecraft.component.type.EquippableComponent; + +public class CompatEquippableComponent { + private final EquippableComponent raw; + + @Deprecated + public CompatEquippableComponent(EquippableComponent component) { + this.raw = component; + } + + @Deprecated + public EquippableComponent raw() { + return raw; + } + + @Deprecated + public static CompatEquippableComponent of(EquippableComponent component) { + return new CompatEquippableComponent(component); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (!(obj instanceof CompatEquippableComponent)) return false; + CompatEquippableComponent that = (CompatEquippableComponent) obj; + return raw().equals(that.raw()); + } + + @Override + public int hashCode() { + if (raw() == null) return super.hashCode(); + return raw().hashCode(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java new file mode 100644 index 000000000..5ced28a55 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java @@ -0,0 +1,94 @@ +package net.pitan76.mcpitanlib.api.item.equipment; + +import net.minecraft.component.type.EquippableComponent; +import net.minecraft.entity.EntityType; +import net.minecraft.registry.Registries; +import net.minecraft.registry.RegistryEntryLookup; +import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; +import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.api.tag.TagKey; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class EquippableComponentBuilder { + + public ArmorEquipmentType equipmentType; + public CompatSoundEvent equipSound; + public CompatSoundEvent shearingSound; + public boolean equipOnInteract = false; + public boolean canBeSheared = false; + public CompatEquipmentAsset model; + public TagKey allowedEntities = null; + + public EquippableComponentBuilder() { + + } + + public EquippableComponentBuilder(ArmorEquipmentType equipmentType) { + this.equipmentType = equipmentType; + } + + public EquippableComponentBuilder equipmentType(ArmorEquipmentType equipmentType) { + this.equipmentType = equipmentType; + return this; + } + + public EquippableComponentBuilder equipSound(CompatSoundEvent equipSound) { + this.equipSound = equipSound; + return this; + } + + public EquippableComponentBuilder shearingSound(CompatSoundEvent shearingSound) { + this.shearingSound = shearingSound; + return this; + } + + public EquippableComponentBuilder equipOnInteract(boolean equipOnInteract) { + this.equipOnInteract = equipOnInteract; + return this; + } + + public EquippableComponentBuilder canBeSheared(boolean canBeSheared) { + this.canBeSheared = canBeSheared; + return this; + } + + public EquippableComponentBuilder model(CompatEquipmentAsset model) { + this.model = model; + return this; + } + + public EquippableComponentBuilder model(CompatIdentifier id) { + return model(CompatEquipmentAsset.of(id)); + } + + public EquippableComponentBuilder allowedEntities(TagKey allowedEntities) { + this.allowedEntities = allowedEntities; + return this; + } + + public EquippableComponentBuilder allowedEntities(CompatIdentifier tagId) { + return allowedEntities(TagKey.create(TagKey.Type.ENTITY_TYPE, tagId)); + } + + public EquippableComponentBuilder allowedEntities(String tagId) { + return allowedEntities(CompatIdentifier.of(tagId)); + } + + public CompatEquippableComponent build() { + EquippableComponent.Builder component = EquippableComponent.builder(equipmentType.getSlot()); + if (equipSound != null) + component.equipSound(equipSound.getEntry() != null ? equipSound.getEntry() : equipSound.getReference()); + if (shearingSound != null) + component.shearingSound(shearingSound.getEntry() != null ? shearingSound.getEntry() : shearingSound.getReference()); + + component.equipOnInteract(equipOnInteract); + component.canBeSheared(canBeSheared); + if (model != null) component.model(model.raw()); + if (allowedEntities != null) { + RegistryEntryLookup> registryEntryLookup = Registries.createEntryLookup(Registries.ENTITY_TYPE); + component.allowedEntities(registryEntryLookup.getOrThrow((net.minecraft.registry.tag.TagKey>) allowedEntities.getTagKey())); + } + + return CompatEquippableComponent.of(component.build()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java index 1f4ef9c75..9373e5635 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java @@ -1,14 +1,19 @@ package net.pitan76.mcpitanlib.api.item.v2; +import net.minecraft.component.DataComponentTypes; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; +import net.pitan76.mcpitanlib.api.entity.attribute.AttributeModifiersComponentBuilder; +import net.pitan76.mcpitanlib.api.entity.attribute.CompatAttributeModifiersComponent; import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; import net.pitan76.mcpitanlib.api.item.CreativeTabBuilder; import net.pitan76.mcpitanlib.api.item.ExtendSettings; +import net.pitan76.mcpitanlib.api.item.equipment.CompatEquippableComponent; +import net.pitan76.mcpitanlib.api.item.equipment.EquippableComponentBuilder; import net.pitan76.mcpitanlib.api.tag.item.RepairIngredientTag; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.CompatRarity; @@ -138,6 +143,24 @@ public CompatibleItemSettings repairable(RepairIngredientTag tag) { return this; } + public CompatibleItemSettings equipable(CompatEquippableComponent component) { + settings.component(DataComponentTypes.EQUIPPABLE, component.raw()); + return this; + } + + public CompatibleItemSettings equipable(EquippableComponentBuilder builder) { + return equipable(builder.build()); + } + + public CompatibleItemSettings attributeModifiers(CompatAttributeModifiersComponent component) { + settings.component(DataComponentTypes.ATTRIBUTE_MODIFIERS, component.raw()); + return this; + } + + public CompatibleItemSettings attributeModifiers(AttributeModifiersComponentBuilder builder) { + return attributeModifiers(builder.build()); + } + @Override public ExtendSettings build() { super.build(); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java index f0d48b13a..7db858e24 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java @@ -1609,6 +1609,14 @@ public class CompatSoundEvents { public static final CompatSoundEvent EVENT_MOB_EFFECT_BAD_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_BAD_OMEN); public static final CompatSoundEvent EVENT_MOB_EFFECT_TRIAL_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_TRIAL_OMEN); public static final CompatSoundEvent EVENT_MOB_EFFECT_RAID_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_RAID_OMEN); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_EQUIP = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_EQUIP); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_AMBIENT); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_DEATH); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HURT = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_HURT); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_RIDING = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_RIDING); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_UNEQUIP = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_UNEQUIP); static { GOAT_HORN_SOUNDS = SoundEvents.GOAT_HORN_SOUNDS.stream().map(CompatSoundEvent::new).collect(ImmutableList.toImmutableList()); From c9c9f72d0b48a6e24679f1836d36261e095344f9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 10 Aug 2025 20:53:09 +0900 Subject: [PATCH 564/622] [cp] version 3.4.0 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 26aea2976..930c84144 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.3.9 +mod_version=3.4.0 maven_group=net.pitan76 changelog=add APIs \ No newline at end of file From a8a53891ac43ad7edd118af8aa307eed5acaadaa Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 10 Aug 2025 20:57:48 +0900 Subject: [PATCH 565/622] [cp] happy ghast is not found, fix1215 --- .../equipment/EquippableComponentBuilder.java | 3 --- .../mcpitanlib/api/sound/CompatSoundEvents.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java index 5ced28a55..7c9acccd1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java @@ -78,11 +78,8 @@ public CompatEquippableComponent build() { EquippableComponent.Builder component = EquippableComponent.builder(equipmentType.getSlot()); if (equipSound != null) component.equipSound(equipSound.getEntry() != null ? equipSound.getEntry() : equipSound.getReference()); - if (shearingSound != null) - component.shearingSound(shearingSound.getEntry() != null ? shearingSound.getEntry() : shearingSound.getReference()); component.equipOnInteract(equipOnInteract); - component.canBeSheared(canBeSheared); if (model != null) component.model(model.raw()); if (allowedEntities != null) { RegistryEntryLookup> registryEntryLookup = Registries.createEntryLookup(Registries.ENTITY_TYPE); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java index 7db858e24..1cd5fd036 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/sound/CompatSoundEvents.java @@ -1609,14 +1609,14 @@ public class CompatSoundEvents { public static final CompatSoundEvent EVENT_MOB_EFFECT_BAD_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_BAD_OMEN); public static final CompatSoundEvent EVENT_MOB_EFFECT_TRIAL_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_TRIAL_OMEN); public static final CompatSoundEvent EVENT_MOB_EFFECT_RAID_OMEN = new CompatSoundEvent(SoundEvents.EVENT_MOB_EFFECT_RAID_OMEN); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_EQUIP = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_EQUIP); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_AMBIENT); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_DEATH); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HURT = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_HURT); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_RIDING = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_RIDING); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP); - public static final CompatSoundEvent ENTITY_HAPPY_GHAST_UNEQUIP = new CompatSoundEvent(SoundEvents.ENTITY_HAPPY_GHAST_UNEQUIP); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_EQUIP = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_EQUIP_WOLF); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_AMBIENT = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_AMBIENT); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_DEATH = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_DEATH); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HURT = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_HURT); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_RIDING = new CompatSoundEvent(SoundEvents.ENTITY_MINECART_RIDING); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_DOWN = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_AMBIENT); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_HARNESS_GOGGLES_UP = new CompatSoundEvent(SoundEvents.ENTITY_GHAST_AMBIENT); + public static final CompatSoundEvent ENTITY_HAPPY_GHAST_UNEQUIP = new CompatSoundEvent(SoundEvents.ITEM_ARMOR_UNEQUIP_WOLF); static { GOAT_HORN_SOUNDS = SoundEvents.GOAT_HORN_SOUNDS.stream().map(CompatSoundEvent::new).collect(ImmutableList.toImmutableList()); From ec7a377ebca5091ca2fc30aae015b90e2ebe7838 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 10 Aug 2025 21:18:05 +0900 Subject: [PATCH 566/622] [cp] fix-1211 --- .../CompatAttributeModifierSlot.java | 3 +- .../attribute/CompatEntityAttributes.java | 30 ++++++++--------- .../item/equipment/CompatEquipmentAsset.java | 32 +++---------------- .../equipment/CompatEquippableComponent.java | 29 +---------------- .../equipment/EquippableComponentBuilder.java | 17 +--------- .../api/item/v2/CompatibleItemSettings.java | 1 - 6 files changed, 23 insertions(+), 89 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java index 43595c06b..5bbf3de43 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatAttributeModifierSlot.java @@ -16,7 +16,7 @@ public class CompatAttributeModifierSlot implements CompatStringIdentifiable { public static final CompatAttributeModifierSlot CHEST = new CompatAttributeModifierSlot(AttributeModifierSlot.CHEST); public static final CompatAttributeModifierSlot ARMOR = new CompatAttributeModifierSlot(AttributeModifierSlot.ARMOR); public static final CompatAttributeModifierSlot BODY = new CompatAttributeModifierSlot(AttributeModifierSlot.BODY); - public static final CompatAttributeModifierSlot SADDLE = new CompatAttributeModifierSlot(AttributeModifierSlot.SADDLE); + public static final CompatAttributeModifierSlot SADDLE = new CompatAttributeModifierSlot(AttributeModifierSlot.BODY); @Deprecated public CompatAttributeModifierSlot(AttributeModifierSlot raw) { @@ -33,7 +33,6 @@ public static CompatAttributeModifierSlot of(AttributeModifierSlot slot) { if (slot == AttributeModifierSlot.CHEST) return CHEST; if (slot == AttributeModifierSlot.ARMOR) return ARMOR; if (slot == AttributeModifierSlot.BODY) return BODY; - if (slot == AttributeModifierSlot.SADDLE) return SADDLE; return new CompatAttributeModifierSlot(slot); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java index d0c1f595f..34f6d6641 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/attribute/CompatEntityAttributes.java @@ -6,21 +6,21 @@ public class CompatEntityAttributes { - public static final CompatEntityAttribute ARMOR = of(EntityAttributes.ARMOR); - public static final CompatEntityAttribute ARMOR_TOUGHNESS = of(EntityAttributes.ARMOR_TOUGHNESS); - public static final CompatEntityAttribute ATTACK_DAMAGE = of(EntityAttributes.ATTACK_DAMAGE); - public static final CompatEntityAttribute ATTACK_KNOCKBACK = of(EntityAttributes.ATTACK_KNOCKBACK); - public static final CompatEntityAttribute ATTACK_SPEED = of(EntityAttributes.ATTACK_SPEED); - public static final CompatEntityAttribute FOLLOW_RANGE = of(EntityAttributes.FOLLOW_RANGE); - public static final CompatEntityAttribute KNOCKBACK_RESISTANCE = of(EntityAttributes.KNOCKBACK_RESISTANCE); - public static final CompatEntityAttribute LUCK = of(EntityAttributes.LUCK); - public static final CompatEntityAttribute MOVEMENT_SPEED = of(EntityAttributes.MOVEMENT_SPEED); - public static final CompatEntityAttribute MAX_HEALTH = of(EntityAttributes.MAX_HEALTH); - public static final CompatEntityAttribute JUMP_STRENGTH = of(EntityAttributes.JUMP_STRENGTH); - public static final CompatEntityAttribute GRAVITY = of(EntityAttributes.GRAVITY); - public static final CompatEntityAttribute FLYING_SPEED = of(EntityAttributes.FLYING_SPEED); - public static final CompatEntityAttribute BLOCK_BREAK_SPEED = of(EntityAttributes.BLOCK_BREAK_SPEED); - public static final CompatEntityAttribute BLOCK_INTERACTION_RANGE = of(EntityAttributes.BLOCK_INTERACTION_RANGE); + public static final CompatEntityAttribute ARMOR = of(EntityAttributes.GENERIC_ARMOR); + public static final CompatEntityAttribute ARMOR_TOUGHNESS = of(EntityAttributes.GENERIC_ARMOR_TOUGHNESS); + public static final CompatEntityAttribute ATTACK_DAMAGE = of(EntityAttributes.GENERIC_ATTACK_DAMAGE); + public static final CompatEntityAttribute ATTACK_KNOCKBACK = of(EntityAttributes.GENERIC_ATTACK_KNOCKBACK); + public static final CompatEntityAttribute ATTACK_SPEED = of(EntityAttributes.GENERIC_ATTACK_SPEED); + public static final CompatEntityAttribute FOLLOW_RANGE = of(EntityAttributes.GENERIC_FOLLOW_RANGE); + public static final CompatEntityAttribute KNOCKBACK_RESISTANCE = of(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE); + public static final CompatEntityAttribute LUCK = of(EntityAttributes.GENERIC_LUCK); + public static final CompatEntityAttribute MOVEMENT_SPEED = of(EntityAttributes.GENERIC_MOVEMENT_SPEED); + public static final CompatEntityAttribute MAX_HEALTH = of(EntityAttributes.GENERIC_MAX_HEALTH); + public static final CompatEntityAttribute JUMP_STRENGTH = of(EntityAttributes.GENERIC_JUMP_STRENGTH); + public static final CompatEntityAttribute GRAVITY = of(EntityAttributes.GENERIC_GRAVITY); + public static final CompatEntityAttribute FLYING_SPEED = of(EntityAttributes.GENERIC_FLYING_SPEED); + public static final CompatEntityAttribute BLOCK_BREAK_SPEED = of(EntityAttributes.PLAYER_BLOCK_BREAK_SPEED); + public static final CompatEntityAttribute BLOCK_INTERACTION_RANGE = of(EntityAttributes.PLAYER_BLOCK_INTERACTION_RANGE); public static CompatEntityAttribute of(RegistryEntry attribute) { return CompatEntityAttribute.of(attribute); diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java index 3a979fc7e..a61c24184 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquipmentAsset.java @@ -1,50 +1,28 @@ package net.pitan76.mcpitanlib.api.item.equipment; -import net.minecraft.item.equipment.EquipmentAssetKeys; -import net.minecraft.registry.RegistryKey; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; public class CompatEquipmentAsset { - private final RegistryKey raw; @Deprecated - public CompatEquipmentAsset(RegistryKey key) { - this.raw = key; - } + public CompatEquipmentAsset() { - @Deprecated - public RegistryKey raw() { - return raw; } public CompatIdentifier getId() { - return CompatIdentifier.fromMinecraft(raw.getValue()); + return CompatIdentifier.empty(); } @Deprecated - public static CompatEquipmentAsset of(RegistryKey key) { - return new CompatEquipmentAsset(key); + public static CompatEquipmentAsset of() { + return new CompatEquipmentAsset(); } public static CompatEquipmentAsset of(CompatIdentifier id) { - return of(RegistryKey.of(EquipmentAssetKeys.REGISTRY_KEY, id.toMinecraft())); + return of(); } public static CompatEquipmentAsset of(String id) { return of(CompatIdentifier.of(id)); } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (!(obj instanceof CompatEquipmentAsset)) return false; - CompatEquipmentAsset that = (CompatEquipmentAsset) obj; - return raw.equals(that.raw); - } - - @Override - public int hashCode() { - if (raw == null) return super.hashCode(); - return raw.hashCode(); - } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java index e66cde67e..c5cae0c54 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/CompatEquippableComponent.java @@ -1,36 +1,9 @@ package net.pitan76.mcpitanlib.api.item.equipment; -import net.minecraft.component.type.EquippableComponent; - public class CompatEquippableComponent { - private final EquippableComponent raw; - - @Deprecated - public CompatEquippableComponent(EquippableComponent component) { - this.raw = component; - } - - @Deprecated - public EquippableComponent raw() { - return raw; - } @Deprecated - public static CompatEquippableComponent of(EquippableComponent component) { - return new CompatEquippableComponent(component); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - if (!(obj instanceof CompatEquippableComponent)) return false; - CompatEquippableComponent that = (CompatEquippableComponent) obj; - return raw().equals(that.raw()); - } + public CompatEquippableComponent() { - @Override - public int hashCode() { - if (raw() == null) return super.hashCode(); - return raw().hashCode(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java index 7c9acccd1..7f7f82771 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/equipment/EquippableComponentBuilder.java @@ -1,9 +1,5 @@ package net.pitan76.mcpitanlib.api.item.equipment; -import net.minecraft.component.type.EquippableComponent; -import net.minecraft.entity.EntityType; -import net.minecraft.registry.Registries; -import net.minecraft.registry.RegistryEntryLookup; import net.pitan76.mcpitanlib.api.item.ArmorEquipmentType; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.tag.TagKey; @@ -75,17 +71,6 @@ public EquippableComponentBuilder allowedEntities(String tagId) { } public CompatEquippableComponent build() { - EquippableComponent.Builder component = EquippableComponent.builder(equipmentType.getSlot()); - if (equipSound != null) - component.equipSound(equipSound.getEntry() != null ? equipSound.getEntry() : equipSound.getReference()); - - component.equipOnInteract(equipOnInteract); - if (model != null) component.model(model.raw()); - if (allowedEntities != null) { - RegistryEntryLookup> registryEntryLookup = Registries.createEntryLookup(Registries.ENTITY_TYPE); - component.allowedEntities(registryEntryLookup.getOrThrow((net.minecraft.registry.tag.TagKey>) allowedEntities.getTagKey())); - } - - return CompatEquippableComponent.of(component.build()); + return new CompatEquippableComponent(); } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java index 9373e5635..f85e55fb5 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/item/v2/CompatibleItemSettings.java @@ -144,7 +144,6 @@ public CompatibleItemSettings repairable(RepairIngredientTag tag) { } public CompatibleItemSettings equipable(CompatEquippableComponent component) { - settings.component(DataComponentTypes.EQUIPPABLE, component.raw()); return this; } From 7195d8edb53d0e7675abdf0278be2d9d470c9c0d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 12:50:01 +0900 Subject: [PATCH 567/622] [cp] feat: add methods to retrieve block and block wrapper in TileTickEvent --- .../mcpitanlib/api/event/tile/TileTickEvent.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java index 8a0797af5..4dea5f138 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/tile/TileTickEvent.java @@ -1,9 +1,11 @@ package net.pitan76.mcpitanlib.api.event.tile; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; import net.pitan76.mcpitanlib.midohra.holder.BlockStatePropertyHolder; import net.pitan76.mcpitanlib.midohra.world.IWorldView; @@ -79,4 +81,12 @@ public IWorldView getWorldView() { public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState() { return getMidohraState(); } + + public Block getBlock() { + return getState().getBlock(); + } + + public BlockWrapper getBlockWrapper() { + return BlockWrapper.of(getBlock()); + } } From 8d60e010e734db6879080090a068fa488abc4700 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 14:27:14 +0900 Subject: [PATCH 568/622] [cp] HitResult API --- .../api/block/args/v2/PlacementStateArgs.java | 9 ++ .../listener/BeforeBlockOutlineEvent.java | 17 +++ .../api/event/entity/CollisionEvent.java | 9 ++ .../midohra/util/hit/BlockHitResult.java | 59 ++++++++++ .../midohra/util/hit/HitResult.java | 106 ++++++++++++++++++ .../midohra/util/hit/HitResultType.java | 36 ++++++ 6 files changed, 236 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResult.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResultType.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java index 88bc840f6..ebc3d207b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/PlacementStateArgs.java @@ -16,6 +16,7 @@ import net.pitan76.mcpitanlib.midohra.block.BlockState; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.util.hit.HitResultType; import net.pitan76.mcpitanlib.midohra.util.math.Direction; import net.pitan76.mcpitanlib.midohra.world.IWorldView; import net.pitan76.mcpitanlib.midohra.world.World; @@ -163,4 +164,12 @@ public BlockState getBlockState() { public BlockEntityWrapper getBlockEntity() { return getWorld().getBlockEntity(getPos()); } + + public net.pitan76.mcpitanlib.midohra.util.hit.BlockHitResult getHitResultM() { + return net.pitan76.mcpitanlib.midohra.util.hit.BlockHitResult.of(getHitResult()); + } + + public HitResultType getHitResultTypeM() { + return HitResultType.from(getHitResult().getType()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java index 27656b1ed..43ed577ad 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java @@ -11,6 +11,7 @@ import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.midohra.util.hit.HitResultType; import java.util.Optional; @@ -90,4 +91,20 @@ public void drawBox(float red, float green, float blue, float alpha) { public void drawBox(Box box, float red, float green, float blue, float alpha) { context.drawBox(box, red, green, blue, alpha); } + + public net.pitan76.mcpitanlib.midohra.util.hit.HitResult getHitResultM() { + return net.pitan76.mcpitanlib.midohra.util.hit.HitResult.of(hitResult); + } + + public HitResultType getHitResultTypeM() { + return HitResultType.from(hitResult.getType()); + } + + public BlockState getBlockState2() { + return getWorld().getBlockState(getHitResultM().asBlockHitResult().get().getBlockPos()); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getBlockStateM() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getBlockState2()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java index 2bc5aa0d8..0ea55b691 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/entity/CollisionEvent.java @@ -2,6 +2,7 @@ import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.Vec3d; +import net.pitan76.mcpitanlib.midohra.util.hit.HitResultType; public class CollisionEvent { @@ -22,4 +23,12 @@ public HitResult.Type getType() { public Vec3d getPos() { return hitResult.getPos(); } + + public net.pitan76.mcpitanlib.midohra.util.hit.HitResult getHitResultM() { + return net.pitan76.mcpitanlib.midohra.util.hit.HitResult.of(getHitResult()); + } + + public HitResultType getHitResultTypeM() { + return HitResultType.from(getType()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java new file mode 100644 index 000000000..2492fca64 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java @@ -0,0 +1,59 @@ +package net.pitan76.mcpitanlib.midohra.util.hit; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; + +public class BlockHitResult extends HitResult { + public BlockHitResult(net.minecraft.util.hit.BlockHitResult raw) { + super(raw); + } + + public static BlockHitResult of(net.minecraft.util.hit.BlockHitResult raw) { + return new BlockHitResult(raw); + } + + @Deprecated + public net.minecraft.util.hit.BlockHitResult getRaw() { + return (net.minecraft.util.hit.BlockHitResult) super.getRaw(); + } + + public net.minecraft.util.hit.BlockHitResult withSide(Direction side) { + return getRaw().withSide(side); + } + + public net.minecraft.util.hit.BlockHitResult withBlockPos(BlockPos blockPos) { + return getRaw().withBlockPos(blockPos); + } + + public net.minecraft.util.hit.BlockHitResult againstWorldBorder() { + return getRaw().againstWorldBorder(); + } + + public BlockPos getBlockPos() { + return getRaw().getBlockPos(); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getBlockPosM() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getBlockPos()); + } + + public Direction getSide() { + return getRaw().getSide(); + } + + public net.pitan76.mcpitanlib.midohra.util.math.Direction getSideM() { + return net.pitan76.mcpitanlib.midohra.util.math.Direction.of(getSide()); + } + + public boolean isInsideBlock() { + return getRaw().isInsideBlock(); + } + + public boolean isAgainstWorldBorder() { + return getRaw().isAgainstWorldBorder(); + } + + public HitResultType getType() { + return HitResultType.from(getRaw().getType()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResult.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResult.java new file mode 100644 index 000000000..97e521de9 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResult.java @@ -0,0 +1,106 @@ +package net.pitan76.mcpitanlib.midohra.util.hit; + +import net.minecraft.entity.Entity; +import net.minecraft.util.math.Vec3d; + +import java.util.Optional; + +public class HitResult { + protected final net.minecraft.util.hit.HitResult raw; + + public HitResult(net.minecraft.util.hit.HitResult raw) { + this.raw = raw; + } + + public static HitResult of(net.minecraft.util.hit.HitResult raw) { + return new HitResult(raw); + } + + @Deprecated + public net.minecraft.util.hit.HitResult getRaw() { + return raw; + } + + @Deprecated + public net.minecraft.util.hit.HitResult.Type getRawType() { + return getRaw().getType(); + } + + public Vec3d getPos() { + return getRaw().getPos(); + } + + public double getX() { + return pos().x; + } + + public double getY() { + return pos().y; + } + + public double getZ() { + return pos().z; + } + + public HitResultType getType() { + return HitResultType.of(this); + } + + public double squaredDistanceTo(Vec3d point) { + Vec3d hitPos = getPos(); + double dx = hitPos.x - point.x; + double dy = hitPos.y - point.y; + double dz = hitPos.z - point.z; + return dx * dx + dy * dy + dz * dz; + } + + public double squaredDistanceTo(Entity entity) { + return getRaw().squaredDistanceTo(entity); + } + + public Vec3d pos() { + return getPos(); + } + + public double x() { + return getX(); + } + + public double y() { + return getY(); + } + + public double z() { + return getZ(); + } + + public Optional asBlockHitResult() { + if (this instanceof BlockHitResult) { + return Optional.of((BlockHitResult) this); + } + + if (raw instanceof net.minecraft.util.hit.BlockHitResult) { + return Optional.of(BlockHitResult.of((net.minecraft.util.hit.BlockHitResult) raw)); + } + + return Optional.empty(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + HitResult other = (HitResult) obj; + return getRaw().equals(other.getRaw()); + } + + @Override + public int hashCode() { + return getRaw().hashCode(); + } + + @Override + public String toString() { + return getRaw().toString(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResultType.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResultType.java new file mode 100644 index 000000000..6002f2195 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/HitResultType.java @@ -0,0 +1,36 @@ +package net.pitan76.mcpitanlib.midohra.util.hit; + +import net.minecraft.util.hit.HitResult; + +public enum HitResultType { + MISS(HitResult.Type.MISS), + BLOCK(HitResult.Type.BLOCK), + ENTITY(HitResult.Type.ENTITY); + + private final HitResult.Type raw; + + HitResultType(HitResult.Type raw) { + this.raw = raw; + } + + @Deprecated + public HitResult.Type getRaw() { + return raw; + } + + public static HitResultType from(HitResult.Type raw) { + switch (raw) { + case MISS: + return MISS; + case BLOCK: + return BLOCK; + case ENTITY: + return ENTITY; + } + throw new IllegalArgumentException("Unknown HitResult.Type: " + raw); + } + + public static HitResultType of(net.pitan76.mcpitanlib.midohra.util.hit.HitResult result) { + return from(result.getRawType()); + } +} From b8e5f708f71c1ad1737619b53edf6ee37047859b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 15:34:02 +0900 Subject: [PATCH 569/622] [cp] bump version to 3.4.1 and update changelog --- info.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.properties b/info.properties index 930c84144..9f70f6c4a 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.0 +mod_version=3.4.1 maven_group=net.pitan76 -changelog=add APIs \ No newline at end of file +changelog=Add APIs \ No newline at end of file From d0da737940a13ba1f8fa574f29b8d1bc49de7224 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 16:55:31 +0900 Subject: [PATCH 570/622] [cp] add ContainerUser --- .../api/entity/CompatContainerUser.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java new file mode 100644 index 000000000..120091928 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java @@ -0,0 +1,17 @@ +package net.pitan76.mcpitanlib.api.entity; + +import net.minecraft.entity.ContainerUser; +import net.minecraft.entity.LivingEntity; + +public class CompatContainerUser { + protected ContainerUser containerUser; + + public double getContainerInteractionRange() { + // Player = 4.5d + return containerUser.getContainerInteractionRange(); + } + + public LivingEntity asLivingEntity() { + return containerUser.asLivingEntity(); + } +} From a24f0215cb439c3396188ec634d6710a4d1206cf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 16:57:57 +0900 Subject: [PATCH 571/622] [cp] fix ContainerUser --- .../api/entity/CompatContainerUser.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java index 120091928..f17eab319 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java @@ -1,17 +1,28 @@ package net.pitan76.mcpitanlib.api.entity; -import net.minecraft.entity.ContainerUser; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; public class CompatContainerUser { - protected ContainerUser containerUser; + protected PlayerEntity containerUser; + + public CompatContainerUser(PlayerEntity containerUser) { + this.containerUser = containerUser; + } public double getContainerInteractionRange() { - // Player = 4.5d - return containerUser.getContainerInteractionRange(); + return 4.5d; } public LivingEntity asLivingEntity() { - return containerUser.asLivingEntity(); + return containerUser; + } + + public boolean isPlayer() { + return true; + } + + public Player asPlayer() { + return new Player(containerUser); } } From 91ec7329a4e69298ae53b05a1eb8cad2661f63c2 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 17:15:44 +0900 Subject: [PATCH 572/622] [cp] use CompatContainerUser --- .../mcpitanlib/api/entity/CompatContainerUser.java | 5 +++++ .../api/util/inventory/CompatInventory.java | 13 +++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java index f17eab319..ca2ab6026 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatContainerUser.java @@ -25,4 +25,9 @@ public boolean isPlayer() { public Player asPlayer() { return new Player(containerUser); } + + @Deprecated + public PlayerEntity getRaw() { + return containerUser; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java index bda546630..1f8fc9524 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/inventory/CompatInventory.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.entity.CompatContainerUser; import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; import net.pitan76.mcpitanlib.api.util.collection.ItemStackList; @@ -95,11 +96,19 @@ public boolean canInsert(ItemStack stack) { } public void onOpen(Player player) { - super.onOpen(player.getEntity()); + this.onOpen(new CompatContainerUser(player.getEntity())); } public void onClose(Player player) { - super.onClose(player.getEntity()); + this.onClose(new CompatContainerUser(player.getEntity())); + } + + public void onOpen(CompatContainerUser user) { + super.onOpen(user.getRaw()); + } + + public void onClose(CompatContainerUser user) { + super.onClose(user.getRaw()); } public NbtList toNbtList(CompatRegistryLookup registries) { From 5355fece1b774291a57f171c468d73439fd782cf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 17:17:15 +0900 Subject: [PATCH 573/622] [cp] CompatKeyBinding --- .../api/client/option/CompatKeyBinding.java | 57 +++++++++++++++++++ .../registry/v3/KeybindingRegistry.java | 37 ++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/option/CompatKeyBinding.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v3/KeybindingRegistry.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/CompatKeyBinding.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/CompatKeyBinding.java new file mode 100644 index 000000000..ab95ef05b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/option/CompatKeyBinding.java @@ -0,0 +1,57 @@ +package net.pitan76.mcpitanlib.api.client.option; + +import net.minecraft.client.option.KeyBinding; +import net.minecraft.text.Text; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +import java.util.Objects; + +public class CompatKeyBinding { + private final KeyBinding keyBinding; + + public CompatKeyBinding(KeyBinding keyBinding) { + this.keyBinding = keyBinding; + } + + public CompatKeyBinding(String translationKey, int defaultKeyCode, CompatIdentifier category) { + this.keyBinding = new KeyBinding(translationKey, defaultKeyCode, "key.category." + category.getNamespace() + "." + category.getPath()); + } + + public CompatKeyBinding(String translationKey, int defaultKeyCode) { + String[] parts = translationKey.split("\\."); + if (Objects.equals(parts[0], "key") && parts.length == 3) { + CompatIdentifier category = CompatIdentifier.of(parts[1], "main"); + this.keyBinding = new KeyBinding(translationKey, defaultKeyCode, "key.category." + category.getNamespace() + "." + category.getPath()); + } else { + throw new IllegalArgumentException("Cannot infer category from translation key: " + translationKey); + } + } + + public String getTranslationKey() { + return keyBinding.getBoundKeyTranslationKey(); + } + + public Text getBoundKeyLocalizedText() { + return keyBinding.getBoundKeyLocalizedText(); + } + + public int getDefaultKeyCode() { + return keyBinding.getDefaultKey().getCode(); + } + + public static CompatKeyBinding of(String translationKey, int defaultKeyCode, CompatIdentifier category) { + return new CompatKeyBinding(translationKey, defaultKeyCode, category); + } + + public static CompatKeyBinding of(String translationKey, int defaultKeyCode) { + return new CompatKeyBinding(translationKey, defaultKeyCode); + } + + public KeyBinding toMinecraft() { + return keyBinding; + } + + public KeyBinding getRaw() { + return keyBinding; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v3/KeybindingRegistry.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v3/KeybindingRegistry.java new file mode 100644 index 000000000..91f382b28 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/registry/v3/KeybindingRegistry.java @@ -0,0 +1,37 @@ +package net.pitan76.mcpitanlib.api.client.registry.v3; + +import net.pitan76.mcpitanlib.api.client.option.CompatKeyBinding; +import net.pitan76.mcpitanlib.api.event.v0.ClientTickEventRegistry; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class KeybindingRegistry { + public static void registerWithNetwork(CompatKeyBinding keyBinding, CompatIdentifier networkId) { + net.pitan76.mcpitanlib.api.client.registry.v2.KeybindingRegistry.registerWithNetwork(keyBinding.toMinecraft(), networkId.toMinecraft()); + } + + public static void registerOnLevelWithNetwork(CompatKeyBinding keyBinding, CompatIdentifier networkId) { + net.pitan76.mcpitanlib.api.client.registry.v2.KeybindingRegistry.registerOnLevelWithNetwork(keyBinding.toMinecraft(), networkId.toMinecraft()); + } + + public static void registerWithNetwork(String translationKey, int code, CompatIdentifier category, CompatIdentifier networkId) { + registerWithNetwork(CompatKeyBinding.of(translationKey, code, category), networkId); + } + + public static void registerOnLevelWithNetwork(String translationKey, int code, CompatIdentifier category, CompatIdentifier networkId) { + registerOnLevelWithNetwork(CompatKeyBinding.of(translationKey, code, category), networkId); + } + + public static void register(CompatKeyBinding keyBinding) { + net.pitan76.mcpitanlib.api.client.registry.KeybindingRegistry.register(keyBinding.toMinecraft()); + } + + public static void register(CompatKeyBinding keyBinding, ClientTickEventRegistry.Client client) { + register(keyBinding); + ClientTickEventRegistry.registerPost(client); + } + + public static void registerOnLevel(CompatKeyBinding keyBinding, ClientTickEventRegistry.ClientLevel level) { + register(keyBinding); + ClientTickEventRegistry.registerLevelPost(level); + } +} From cb8eb623e93e14275150c43e49604f9eb64474f6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 17:21:33 +0900 Subject: [PATCH 574/622] [cp] enable parallel builds and increase worker limit --- gradle.properties | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b69c6a94c..863db69d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,4 +28,7 @@ compatdatapacks76_version=1.0.13.210 fabricEnabled=true forgeEnabled=false quiltEnabled=false -neoforgeEnabled=true \ No newline at end of file +neoforgeEnabled=true + +org.gradle.parallel=true +org.gradle.workers.max=4 \ No newline at end of file From febe366f86dcf29b836c1ea2927a858316f14c77 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 17:33:58 +0900 Subject: [PATCH 575/622] [cp] update publish and pull scripts for version 1.21.9 checkout and build process --- publish.bat | 11 +++++++++++ pull.bat | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/publish.bat b/publish.bat index c470e0edf..ddeb7041f 100644 --- a/publish.bat +++ b/publish.bat @@ -102,4 +102,15 @@ call gradlew.bat curseforge call gradlew.bat :fabric:modrinth call gradlew.bat :neoforge:modrinth + +git checkout 1.21.9 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :neoforge:modrinth + pause \ No newline at end of file diff --git a/pull.bat b/pull.bat index 25011ab99..10af3f5e9 100644 --- a/pull.bat +++ b/pull.bat @@ -1,4 +1,8 @@ git fetch origin +git checkout 1.21.9 +timeout /T 1 +git pull + git checkout 1.21.6 timeout /T 1 git pull From ffcf1945924d01788f9801e42b1b9af62d9b1320 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 19 Oct 2025 18:09:23 +0900 Subject: [PATCH 576/622] againstWorldBorder --- .../pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java index 2492fca64..5e9fac97e 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/hit/BlockHitResult.java @@ -26,7 +26,7 @@ public net.minecraft.util.hit.BlockHitResult withBlockPos(BlockPos blockPos) { } public net.minecraft.util.hit.BlockHitResult againstWorldBorder() { - return getRaw().againstWorldBorder(); + return null; } public BlockPos getBlockPos() { @@ -50,7 +50,7 @@ public boolean isInsideBlock() { } public boolean isAgainstWorldBorder() { - return getRaw().isAgainstWorldBorder(); + return false; } public HitResultType getType() { From b1e48d786529645cea00aef9394ec039d05b131a Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+ptom76@users.noreply.github.com> Date: Thu, 23 Oct 2025 22:16:24 +0900 Subject: [PATCH 577/622] [cp] Add APIs, Fix APIs --- .../mcpitanlib/api/util/CustomDataUtil.java | 2 +- .../api/util/entity/ProjectileEntityUtil.java | 14 ++++++++++++++ .../api/util/entity/ThrownItemEntityUtil.java | 18 ++++++++++++++++++ info.properties | 4 ++-- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ProjectileEntityUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java index b5ff1ab9a..a35fe58ab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/CustomDataUtil.java @@ -39,7 +39,7 @@ public static void setNbt(ItemStack stack, NbtCompound nbt) { * @return NBTが存在するかどうか */ public static boolean hasNbt(ItemStack stack) { - return stack.contains(DataComponentTypes.CUSTOM_DATA); + return stack.get(DataComponentTypes.CUSTOM_DATA) != null; } /** diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ProjectileEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ProjectileEntityUtil.java new file mode 100644 index 000000000..806215177 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ProjectileEntityUtil.java @@ -0,0 +1,14 @@ +package net.pitan76.mcpitanlib.api.util.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.projectile.ProjectileEntity; + +public class ProjectileEntityUtil { + public static void setVelocity(ProjectileEntity projectileEntity, Entity shooter, float pitch, float yaw, float roll, float speed, float divergence) { + projectileEntity.setVelocity(shooter, pitch, yaw, roll, speed, divergence); + } + + public static void setVelocity(ProjectileEntity projectileEntity, double x, double y, double z, float power, float uncertainty) { + projectileEntity.setVelocity(x, y, z, power, uncertainty); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java index a5416441a..73dfb6cc4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/entity/ThrownItemEntityUtil.java @@ -1,7 +1,9 @@ package net.pitan76.mcpitanlib.api.util.entity; +import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.thrown.ThrownItemEntity; import net.minecraft.item.ItemStack; +import net.pitan76.mcpitanlib.api.entity.CompatThrownItemEntity; public class ThrownItemEntityUtil { public static ItemStack getItem(ThrownItemEntity entity) { @@ -15,4 +17,20 @@ public static void setItem(ThrownItemEntity entity, ItemStack stack) { public static ItemStack getStack(ThrownItemEntity entity) { return entity.getStack(); } + + public static void setVelocity(ThrownItemEntity entity, Entity shooter, float pitch, float yaw, float roll, float speed, float divergence) { + ProjectileEntityUtil.setVelocity(entity, shooter, pitch, yaw, roll, speed, divergence); + } + + public static void setVelocity(CompatThrownItemEntity entity, Entity shooter, float pitch, float yaw, float roll, float speed, float divergence) { + ProjectileEntityUtil.setVelocity(entity, shooter, pitch, yaw, roll, speed, divergence); + } + + public static void setVelocity(ThrownItemEntity entity, double x, double y, double z, float power, float uncertainty) { + ProjectileEntityUtil.setVelocity(entity, x, y, z, power, uncertainty); + } + + public static void setVelocity(CompatThrownItemEntity entity, double x, double y, double z, float power, float uncertainty) { + ProjectileEntityUtil.setVelocity(entity, x, y, z, power, uncertainty); + } } diff --git a/info.properties b/info.properties index 9f70f6c4a..3edae8601 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.1 +mod_version=3.4.2 maven_group=net.pitan76 -changelog=Add APIs \ No newline at end of file +changelog=Add APIs, Fix APIs \ No newline at end of file From 7ab79c5b1553c134d6a8e6e28b79f0128e0228cc Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 23 Oct 2025 22:33:06 +0900 Subject: [PATCH 578/622] [cp] add method that able to get world id to worldutil --- .../net/pitan76/mcpitanlib/api/util/WorldUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index ad7a350d4..1f09806b9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -407,4 +407,16 @@ public static List getEntitiesByType(World world, EntityTy public static List getEntitiesByType(World world, EntityTypeWrapper filter, Box box) { return getEntitiesByType(world, filter.get(), box); } + + public static CompatIdentifier getOverworldId() { + return CompatIdentifier.fromMinecraft(World.OVERWORLD.getValue()); + } + + public static CompatIdentifier getNetherId() { + return CompatIdentifier.fromMinecraft(World.NETHER.getValue()); + } + + public static CompatIdentifier getEndId() { + return CompatIdentifier.fromMinecraft(World.END.getValue()); + } } From d85bca2e1abcc554b02a12dc9674ef5e7c40c9dd Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Thu, 23 Oct 2025 22:37:11 +0900 Subject: [PATCH 579/622] [cp] fix hasBlockEntityNbt --- .../net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java index 44d526e73..85e260414 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityDataUtil.java @@ -24,7 +24,7 @@ public static void setBlockEntityNbt(ItemStack stack, NbtCompound nbt) { } public static boolean hasBlockEntityNbt(ItemStack stack) { - return stack.contains(DataComponentTypes.BLOCK_ENTITY_DATA); + return stack.get(DataComponentTypes.BLOCK_ENTITY_DATA) != null; } public static void readCompatBlockEntityNbtFromStack(ItemStack stack, CompatBlockEntity blockEntity) { From b57abe29f5e4ee09052c7d396f416042f0480f52 Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 25 Oct 2025 11:24:36 +0900 Subject: [PATCH 580/622] [cp] add writeToStack method to BlockEntityUtil --- .../pitan76/mcpitanlib/api/util/BlockEntityUtil.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index c96de933c..2c820e9ab 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -4,6 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.component.Component; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.world.ServerWorld; @@ -90,4 +91,14 @@ public static void setStackNbt(BlockEntity blockEntity, ItemStack stack, CompatR public static ServerWorld getServerWorld(BlockEntity blockEntity) { return (ServerWorld) getWorld(blockEntity); } + + public static void writeToStack(ItemStack stack, BlockEntity blockEntity, CompatRegistryLookup registryLookup) { + NbtCompound nbt = blockEntity.createComponentlessNbt(registryLookup.getRegistryLookup()); + if (!NbtUtil.has(nbt, "id")) + NbtUtil.putString(nbt, "id", BlockEntityTypeUtil.toID(BlockEntityUtil.getType(blockEntity)).toString()); + + BlockEntityDataUtil.setBlockEntityNbt(stack, nbt); + + blockEntity.createComponentMap().forEach(stack::set); + } } From b96c05e4e33f491748449280e49529398b445d2c Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 25 Oct 2025 11:26:52 +0900 Subject: [PATCH 581/622] [cp] rm compnent import --- .../java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index 2c820e9ab..51bb51f61 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -4,7 +4,6 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.component.Component; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.server.world.ServerWorld; From 51ac3bfcf21800eb8cf25fde903e7eb1136441ac Mon Sep 17 00:00:00 2001 From: PTOM76 <58260965+PTOM76@users.noreply.github.com> Date: Sat, 25 Oct 2025 11:42:31 +0900 Subject: [PATCH 582/622] [cp] fix writeToStack --- .../java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index 51bb51f61..f86662c5c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -98,6 +98,6 @@ public static void writeToStack(ItemStack stack, BlockEntity blockEntity, Compat BlockEntityDataUtil.setBlockEntityNbt(stack, nbt); - blockEntity.createComponentMap().forEach(stack::set); + stack.applyComponentsFrom(blockEntity.createComponentMap()); } } From 03a084b4a8474d77fa917a04de94013679463deb Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 25 Oct 2025 22:49:21 +0900 Subject: [PATCH 583/622] [cp] add APIs, Vector, Entity getPos --- .../mcpitanlib/api/util/EntityUtil.java | 14 ++ .../midohra/util/math/Vector3d.java | 183 +++++++++++++++++ .../midohra/util/math/Vector3f.java | 172 ++++++++++++++++ .../midohra/util/math/Vector3i.java | 191 ++++++++++++++++++ info.properties | 2 +- 5 files changed, 561 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 446d8db17..0242f098d 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -9,6 +9,8 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.util.math.Vector3d; import java.util.UUID; @@ -276,4 +278,16 @@ public static void setCustomName(Entity entity, String customName) { public static Vec3d getRotationVector(Entity entity) { return entity.getRotationVector(); } + + public static Vec3d getPos(Entity entity) { + return entity.getPos(); + } + + public static Vector3d getPosM(Entity entity) { + return Vector3d.of(getPos(entity)); + } + + public static void setPos(Entity entity, double x, double y, double z) { + entity.setPos(x, y, z); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java new file mode 100644 index 000000000..c83fdb8da --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java @@ -0,0 +1,183 @@ +package net.pitan76.mcpitanlib.midohra.util.math; + +import net.minecraft.util.math.Position; +import net.minecraft.util.math.Vec3d; + +public class Vector3d { + public final double x; + public final double y; + public final double z; + + public Vector3d(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } + + public static Vector3d of(double x, double y, double z) { + return new Vector3d(x, y, z); + } + + public static Vector3d of(Vector3i vec) { + return new Vector3d(vec.x, vec.y, vec.z); + } + + public static Vector3d of(Vector3f vec) { + return new Vector3d(vec.x, vec.y, vec.z); + } + + public static Vector3d of(org.joml.Vector3d vec) { + return new Vector3d(vec.x, vec.y, vec.z); + } + + public static Vector3d of(Vec3d vec) { + return new Vector3d(vec.x, vec.y, vec.z); + } + + public static Vector3d of(Position vec) { + return new Vector3d(vec.getX(), vec.getY(), vec.getZ()); + } + + public Vector3i toInt() { + return new Vector3i((int) x, (int) y, (int) z); + } + + public Vector3f toFloat() { + return new Vector3f((float) x, (float) y, (float) z); + } + + public org.joml.Vector3d toJoml() { + return new org.joml.Vector3d(x, y, z); + } + + public Vector3d add(Vector3d other) { + return new Vector3d(this.x + other.x, this.y + other.y, this.z + other.z); + } + + public Vector3d sub(Vector3d other) { + return new Vector3d(this.x - other.x, this.y - other.y, this.z - other.z); + } + + public Vector3d mul(double scalar) { + return new Vector3d(this.x * scalar, this.y * scalar, this.z * scalar); + } + + public Vector3d div(double scalar) { + return new Vector3d(this.x / scalar, this.y / scalar, this.z / scalar); + } + + public double dot(Vector3d other) { + return this.x * other.x + this.y * other.y + this.z * other.z; + } + + public Vector3d cross(Vector3d other) { + return new Vector3d( + this.y * other.z - this.z * other.y, + this.z * other.x - this.x * other.z, + this.x * other.y - this.y * other.x + ); + } + + public double length() { + return Math.sqrt(x * x + y * y + z * z); + } + + public Vector3d normalize() { + double len = length(); + if (len == 0) return new Vector3d(0, 0, 0); + return div(len); + } + + public Vector3d add(double x, double y, double z) { + return new Vector3d(this.x + x, this.y + y, this.z + z); + } + + public Vector3d sub(double x, double y, double z) { + return new Vector3d(this.x - x, this.y - y, this.z - z); + } + + public Vector3d lerp(Vector3d to, double delta) { + return this.mul(1 - delta).add(to.mul(delta)); + } + + public Vector3d rotateX(double angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + double cos = Math.cos(angleRadians); + double sin = Math.sin(angleRadians); + double newY = y * cos - z * sin; + double newZ = y * sin + z * cos; + return new Vector3d(x, newY, newZ); + } + + public Vector3d rotateY(double angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + double cos = Math.cos(angleRadians); + double sin = Math.sin(angleRadians); + double newX = x * cos - z * sin; + double newZ = x * sin + z * cos; + return new Vector3d(newX, y, newZ); + } + + public Vector3d rotateZ(double angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + double cos = Math.cos(angleRadians); + double sin = Math.sin(angleRadians); + double newX = x * cos - y * sin; + double newY = x * sin + y * cos; + return new Vector3d(newX, newY, z); + } + + public Vector3d negate() { + return new Vector3d(-x, -y, -z); + } + + public Vector3d abs() { + return new Vector3d(Math.abs(x), Math.abs(y), Math.abs(z)); + } + + public Vector3d distanceTo(Vector3d other) { + return this.sub(other); + } + + public double getX() { + return x; + } + + public double getY() { + return y; + } + + public double getZ() { + return z; + } + + public static Vector3d zero() { + return new Vector3d(0, 0, 0); + } + + public static Vector3d distance(Vector3d a, Vector3d b) { + return a.sub(b); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + Vector3d vec = (Vector3d) obj; + return x == vec.x && y == vec.y && z == vec.z; + } + + @Override + public String toString() { + return "(" + x + ", " + y + ", " + z + ")"; + } + + @Override + public int hashCode() { + int h; + h = Double.hashCode(x); + h = 31 * h + Double.hashCode(y); + h = 31 * h + Double.hashCode(z); + return h; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java new file mode 100644 index 000000000..b0e459541 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java @@ -0,0 +1,172 @@ +package net.pitan76.mcpitanlib.midohra.util.math; + +public class Vector3f { + public final float x; + public final float y; + public final float z; + + public Vector3f(float x, float y, float z) { + this.x = x; + this.y = y; + this.z = z; + } + + public static Vector3f of(float x, float y, float z) { + return new Vector3f(x, y, z); + } + + public static Vector3f of(Vector3i vec) { + return new Vector3f(vec.x, vec.y, vec.z); + } + + public static Vector3f of(Vector3d vec) { + return new Vector3f((float) vec.x, (float) vec.y, (float) vec.z); + } + + public static Vector3f of(org.joml.Vector3f vec) { + return new Vector3f(vec.x, vec.y, vec.z); + } + + public Vector3i toInt() { + return new Vector3i((int) x, (int) y, (int) z); + } + + public Vector3d toDouble() { + return new Vector3d((double) x, (double) y, (double) z); + } + + public org.joml.Vector3f toJoml() { + return new org.joml.Vector3f(x, y, z); + } + + public Vector3f add(Vector3f other) { + return new Vector3f(this.x + other.x, this.y + other.y, this.z + other.z); + } + + public Vector3f sub(Vector3f other) { + return new Vector3f(this.x - other.x, this.y - other.y, this.z - other.z); + } + + public Vector3f mul(float scalar) { + return new Vector3f(this.x * scalar, this.y * scalar, this.z * scalar); + } + + public Vector3f div(float scalar) { + return new Vector3f(this.x / scalar, this.y / scalar, this.z / scalar); + } + + public float dot(Vector3f other) { + return this.x * other.x + this.y * other.y + this.z * other.z; + } + + public Vector3f cross(Vector3f other) { + return new Vector3f( + this.y * other.z - this.z * other.y, + this.z * other.x - this.x * other.z, + this.x * other.y - this.y * other.x + ); + } + + public float length() { + return (float) Math.sqrt(x * x + y * y + z * z); + } + + public Vector3f normalize() { + float len = length(); + if (len == 0) return new Vector3f(0, 0, 0); + return div(len); + } + + public Vector3f add(float x, float y, float z) { + return new Vector3f(this.x + x, this.y + y, this.z + z); + } + + public Vector3f sub(float x, float y, float z) { + return new Vector3f(this.x - x, this.y - y, this.z - z); + } + + public Vector3f lerp(Vector3f to, float delta) { + return this.mul(1 - delta).add(to.mul(delta)); + } + + public Vector3f rotateX(float angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + float cos = (float) Math.cos(angleRadians); + float sin = (float) Math.sin(angleRadians); + float newY = y * cos - z * sin; + float newZ = y * sin + z * cos; + return new Vector3f(x, newY, newZ); + } + + public Vector3f rotateY(float angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + float cos = (float) Math.cos(angleRadians); + float sin = (float) Math.sin(angleRadians); + float newX = z * sin + x * cos; + float newZ = z * cos - x * sin; + return new Vector3f(newX, y, newZ); + } + + public Vector3f rotateZ(float angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + float cos = (float) Math.cos(angleRadians); + float sin = (float) Math.sin(angleRadians); + float newX = x * cos - y * sin; + float newY = x * sin + y * cos; + return new Vector3f(newX, newY, z); + } + + public Vector3f negate() { + return new Vector3f(-x, -y, -z); + } + + public Vector3f abs() { + return new Vector3f(Math.abs(x), Math.abs(y), Math.abs(z)); + } + + public Vector3f distanceTo(Vector3f other) { + return this.sub(other); + } + + public float getX() { + return x; + } + + public float getY() { + return y; + } + + public float getZ() { + return z; + } + + public static Vector3f zero() { + return new Vector3f(0, 0, 0); + } + + public static Vector3f distance(Vector3f a, Vector3f b) { + return a.sub(b); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + Vector3f vec = (Vector3f) obj; + return x == vec.x && y == vec.y && z == vec.z; + } + + @Override + public String toString() { + return "(" + x + ", " + y + ", " + z + ")"; + } + + @Override + public int hashCode() { + int h; + h = Float.hashCode(x); + h = 31 * h + Float.hashCode(y); + h = 31 * h + Float.hashCode(z); + return h; + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java new file mode 100644 index 000000000..71c0bd5d5 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java @@ -0,0 +1,191 @@ +package net.pitan76.mcpitanlib.midohra.util.math; + +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3i; + +public class Vector3i { + public final int x; + public final int y; + public final int z; + + public Vector3i(int x, int y, int z) { + this.x = x; + this.y = y; + this.z = z; + } + + public static Vector3i of(int x, int y, int z) { + return new Vector3i(x, y, z); + } + + public static Vector3i of(Vector3d vec) { + return new Vector3i((int) vec.x, (int) vec.y, (int) vec.z); + } + + public static Vector3i of(Vector3f vec) { + return new Vector3i((int) vec.x, (int) vec.y, (int) vec.z); + } + + public static Vector3i of(org.joml.Vector3i vec) { + return new Vector3i(vec.x, vec.y, vec.z); + } + + public static Vector3i of(Vec3i vec) { + return new Vector3i(vec.getX(), vec.getY(), vec.getZ()); + } + + public static Vector3i of(BlockPos vec) { + return new Vector3i(vec.getX(), vec.getY(), vec.getZ()); + } + + public static Vector3i of(net.pitan76.mcpitanlib.midohra.util.math.BlockPos vec) { + return new Vector3i(vec.getX(), vec.getY(), vec.getZ()); + } + + public static Vector3i of(net.pitan76.mcpitanlib.midohra.util.math.v0.BlockPos vec) { + return new Vector3i(vec.getX(), vec.getY(), vec.getZ()); + } + + public Vector3d toDouble() { + return new Vector3d(x, y, z); + } + + public Vector3f toFloat() { + return new Vector3f((float) x, (float) y, (float) z); + } + + public org.joml.Vector3i toJoml() { + return new org.joml.Vector3i(x, y, z); + } + + public Vector3i add(Vector3i other) { + return new Vector3i(this.x + other.x, this.y + other.y, this.z + other.z); + } + + public Vector3i sub(Vector3i other) { + return new Vector3i(this.x - other.x, this.y - other.y, this.z - other.z); + } + + public Vector3i mul(int scalar) { + return new Vector3i(this.x * scalar, this.y * scalar, this.z * scalar); + } + + public Vector3i div(int scalar) { + return new Vector3i(this.x / scalar, this.y / scalar, this.z / scalar); + } + + public int dot(Vector3i other) { + return this.x * other.x + this.y * other.y + this.z * other.z; + } + + public Vector3i cross(Vector3i other) { + return new Vector3i( + this.y * other.z - this.z * other.y, + this.z * other.x - this.x * other.z, + this.x * other.y - this.y * other.x + ); + } + + public int length() { + return (int) Math.sqrt(x * x + y * y + z * z); + } + + public Vector3i normalize() { + int len = length(); + if (len == 0) return new Vector3i(0, 0, 0); + return div(len); + } + + public Vector3i add(int x, int y, int z) { + return new Vector3i(this.x + x, this.y + y, this.z + z); + } + + public Vector3i sub(int x, int y, int z) { + return new Vector3i(this.x - x, this.y - y, this.z - z); + } + + public Vector3i lerp(Vector3i to, int delta) { + return this.mul(1 - delta).add(to.mul(delta)); + } + + public Vector3i rotateX(double angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + int cos = (int) Math.cos(angleRadians); + int sin = (int) Math.sin(angleRadians); + int newY = this.y * cos - this.z * sin; + int newZ = this.y * sin + this.z * cos; + return new Vector3i(this.x, newY, newZ); + } + + public Vector3i rotateY(double angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + int cos = (int) Math.cos(angleRadians); + int sin = (int) Math.sin(angleRadians); + int newX = this.z * sin + this.x * cos; + int newZ = this.z * cos - this.x * sin; + return new Vector3i(newX, this.y, newZ); + } + + public Vector3i rotateZ(double angleDegrees) { + double angleRadians = Math.toRadians(angleDegrees); + int cos = (int) Math.cos(angleRadians); + int sin = (int) Math.sin(angleRadians); + int newX = this.x * cos - this.y * sin; + int newY = this.x * sin + this.y * cos; + return new Vector3i(newX, newY, this.z); + } + + public Vector3i negate() { + return new Vector3i(-this.x, -this.y, -this.z); + } + + public Vector3i abs() { + return new Vector3i(Math.abs(this.x), Math.abs(this.y), Math.abs(this.z)); + } + + public Vector3i distanceTo(Vector3i other) { + return this.sub(other); + } + + public int getX() { + return x; + } + + public int getY() { + return y; + } + + public int getZ() { + return z; + } + + public static Vector3i zero() { + return new Vector3i(0, 0, 0); + } + + public static Vector3i distance(Vector3i a, Vector3i b) { + return a.sub(b); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + Vector3i vec = (Vector3i) obj; + return x == vec.x && y == vec.y && z == vec.z; + } + + @Override + public String toString() { + return "(" + x + ", " + y + ", " + z + ")"; + } + + @Override + public int hashCode() { + int h; + h = Integer.hashCode(x); + h = 31 * h + Integer.hashCode(y); + h = 31 * h + Integer.hashCode(z); + return h; + } +} diff --git a/info.properties b/info.properties index 3edae8601..8074fa460 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.2 +mod_version=3.4.3 maven_group=net.pitan76 changelog=Add APIs, Fix APIs \ No newline at end of file From 65b7c92d524bc95669159afea9c08d5b76d9e093 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 7 Feb 2026 15:43:53 +0900 Subject: [PATCH 584/622] [cp] bump version 3.4.4 --- info.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.properties b/info.properties index 8074fa460..ced424b8a 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.3 +mod_version=3.4.4 maven_group=net.pitan76 -changelog=Add APIs, Fix APIs \ No newline at end of file +changelog=Add APIs \ No newline at end of file From b32876830270dd32fabac3b32a40169ff2136792 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 7 Feb 2026 15:54:05 +0900 Subject: [PATCH 585/622] [cp] add CameraWrapper --- .../listener/BeforeBlockOutlineEvent.java | 6 ++ .../event/listener/WorldRenderContext.java | 5 ++ .../midohra/client/render/CameraWrapper.java | 64 +++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java index 43ed577ad..2f740d104 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/BeforeBlockOutlineEvent.java @@ -11,6 +11,7 @@ import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.World; +import net.pitan76.mcpitanlib.midohra.client.render.CameraWrapper; import net.pitan76.mcpitanlib.midohra.util.hit.HitResultType; import java.util.Optional; @@ -56,10 +57,15 @@ public HitResult.Type getHitResultType() { return hitResult.getType(); } + @Deprecated public Camera getCamera() { return context.getCamera(); } + public CameraWrapper getCameraWrapper() { + return CameraWrapper.of(getCamera()); + } + public Optional getOutlineShape() { return context.getOutlineShape(); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java index b82802399..8a65518d4 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/event/listener/WorldRenderContext.java @@ -14,6 +14,7 @@ import net.minecraft.util.math.Box; import net.minecraft.util.shape.VoxelShape; import net.pitan76.mcpitanlib.api.util.VoxelShapeUtil; +import net.pitan76.mcpitanlib.midohra.client.render.CameraWrapper; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; @@ -122,4 +123,8 @@ default void drawBox(Box box, float red, float green, float blue, float alpha) { WorldRenderer.drawBox(getMatrixStack(), vertexConsumer.get(), box, red, green, blue, alpha); } + + default CameraWrapper getCameraWrapper() { + return CameraWrapper.of(getCamera()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java new file mode 100644 index 000000000..25a8c0969 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java @@ -0,0 +1,64 @@ +package net.pitan76.mcpitanlib.midohra.client.render; + +import net.minecraft.client.render.Camera; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.util.math.Vector3d; + +public class CameraWrapper { + private final Camera camera; + + protected CameraWrapper(Camera camera) { + this.camera = camera; + } + + protected CameraWrapper() { + this.camera = null; + } + + public static CameraWrapper of(Camera camera) { + return new CameraWrapper(camera); + } + + public static CameraWrapper of() { + return new CameraWrapper(); + } + + public Camera get() { + return camera; + } + + public boolean isPresent() { + return !isEmpty(); + } + + public boolean isEmpty() { + return camera == null; + } + + public Vector3d getCameraPos() { + if (isEmpty()) return Vector3d.zero(); + return Vector3d.of(camera.getCameraPos()); + } + + public BlockPos getBlockPos() { + if (isEmpty()) return BlockPos.of(0, 0, 0); + return BlockPos.of(camera.getBlockPos()); + } + + public float getYaw() { + if (isEmpty()) return 0f; + return camera.getYaw(); + } + + public float getPitch() { + if (isEmpty()) return 0f; + return camera.getPitch(); + } + + + + + + + +} From d8119e30ba49144b0a74d80153f2b1a4b53f8524 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 7 Feb 2026 17:49:03 +0900 Subject: [PATCH 586/622] [cp] fix for 1.21.5 less --- .../pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java index 25a8c0969..e605609e1 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java @@ -37,7 +37,7 @@ public boolean isEmpty() { public Vector3d getCameraPos() { if (isEmpty()) return Vector3d.zero(); - return Vector3d.of(camera.getCameraPos()); + return Vector3d.of(camera.getPos()); } public BlockPos getBlockPos() { From 34947f18b75e0afb7c1af0647a82eaab520e00f7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 7 Feb 2026 21:40:04 +0900 Subject: [PATCH 587/622] [cp] fix publish.bat --- publish.bat | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/publish.bat b/publish.bat index ddeb7041f..e7b7155b9 100644 --- a/publish.bat +++ b/publish.bat @@ -113,4 +113,15 @@ call gradlew.bat curseforge call gradlew.bat :fabric:modrinth call gradlew.bat :neoforge:modrinth + +git checkout 1.21.11 +timeout /T 1 +call gradlew.bat build +call gradlew.bat publish publishMavenCommonPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenFabricPublicationToGitHubPackagesRepository +call gradlew.bat publish publishMavenNeoForgePublicationToGitHubPackagesRepository +call gradlew.bat curseforge +call gradlew.bat :fabric:modrinth +call gradlew.bat :neoforge:modrinth + pause \ No newline at end of file From 25fdd2e226afbc47b762b1c8e807af0b8edfaffd Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 7 Feb 2026 23:20:05 +0900 Subject: [PATCH 588/622] [cp] fix publish.bat --- pull.bat | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pull.bat b/pull.bat index 10af3f5e9..cb05fbf86 100644 --- a/pull.bat +++ b/pull.bat @@ -1,3 +1,8 @@ +git fetch origin +git checkout 1.21.11 +timeout /T 1 +git pull + git fetch origin git checkout 1.21.9 timeout /T 1 @@ -53,6 +58,6 @@ timeout /T 1 git pull git fetch origin -git checkout 1.21.6 +git checkout 1.21.11 pause \ No newline at end of file From d860ae42f8477b981da45d8aeabaaa29bd8d84d1 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 8 Feb 2026 00:26:20 +0900 Subject: [PATCH 589/622] [cp] bump version 3.4.5 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index ced424b8a..25ad9102d 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.4 +mod_version=3.4.5 maven_group=net.pitan76 changelog=Add APIs \ No newline at end of file From beeb456ce68296cfc4cb8ba30108f07e202b498f Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 8 Feb 2026 00:25:34 +0900 Subject: [PATCH 590/622] add getRecipeRemainder injector for FixedRecipeRemainderItem --- .../net/pitan76/mcpitanlib/mixin/ItemMixin.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index 5f9ce7f86..d9110b752 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -21,10 +21,12 @@ import net.pitan76.mcpitanlib.api.event.v2.listener.InventoryTickTask; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider; import net.pitan76.mcpitanlib.api.item.ExtendItemProvider.Options; +import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import net.pitan76.mcpitanlib.api.item.args.UseActionArgs; import net.pitan76.mcpitanlib.api.item.consume.CompatUseAction; import net.pitan76.mcpitanlib.api.item.v2.CompatItemProvider; import net.pitan76.mcpitanlib.api.util.CompatActionResult; +import net.pitan76.mcpitanlib.api.util.ItemStackUtil; import net.pitan76.mcpitanlib.api.util.StackActionResult; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -234,4 +236,15 @@ public class ItemMixin { ci.cancel(); } } + + @Inject(method = "getRecipeRemainder", at = @At("HEAD"), cancellable = true) + private void mcpitanlib$getRecipeRemainder(CallbackInfoReturnable cir) { + if (this instanceof FixedRecipeRemainderItem) { + FixedRecipeRemainderItem provider = (FixedRecipeRemainderItem) this; + Options options = new Options(); + ItemStack returnValue = provider.getFixedRecipeRemainder(provider.getFixedRecipeRemainder(ItemStackUtil.create((Item) (Object) this))); + if (options.cancel) + cir.setReturnValue(returnValue); + } + } } From 113a58ac7a310606bb4b65a62c7f7a9c0d3bf9ae Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 8 Feb 2026 17:36:26 +0900 Subject: [PATCH 591/622] [cp] bump version 3.4.6 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 25ad9102d..970f022fc 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.5 +mod_version=3.4.6 maven_group=net.pitan76 changelog=Add APIs \ No newline at end of file From 9ffe6b7ab60d407467594e064691b6641c802594 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 8 Feb 2026 17:52:11 +0900 Subject: [PATCH 592/622] fix getRecipeRemainder mixin --- .../main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java index d9110b752..81aff5888 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/ItemMixin.java @@ -240,11 +240,9 @@ public class ItemMixin { @Inject(method = "getRecipeRemainder", at = @At("HEAD"), cancellable = true) private void mcpitanlib$getRecipeRemainder(CallbackInfoReturnable cir) { if (this instanceof FixedRecipeRemainderItem) { - FixedRecipeRemainderItem provider = (FixedRecipeRemainderItem) this; - Options options = new Options(); - ItemStack returnValue = provider.getFixedRecipeRemainder(provider.getFixedRecipeRemainder(ItemStackUtil.create((Item) (Object) this))); - if (options.cancel) - cir.setReturnValue(returnValue); + ItemStack returnValue = ((FixedRecipeRemainderItem) this) + .getFixedRecipeRemainder(ItemStackUtil.create((Item) (Object) this)); + cir.setReturnValue(returnValue); } } } From e02b5eae11274edbc769a386205980901166cf55 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 8 Feb 2026 17:57:39 +0900 Subject: [PATCH 593/622] fix: add CraftingRecipeMixin --- .../mcpitanlib/mixin/CraftingRecipeMixin.java | 28 +++++++++++++++++++ .../resources/mcpitanlib-common.mixins.json | 1 + 2 files changed, 29 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/mixin/CraftingRecipeMixin.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/CraftingRecipeMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/CraftingRecipeMixin.java new file mode 100644 index 000000000..c8e709d41 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/CraftingRecipeMixin.java @@ -0,0 +1,28 @@ +package net.pitan76.mcpitanlib.mixin; + +import net.minecraft.item.ItemStack; +import net.minecraft.recipe.CraftingRecipe; +import net.minecraft.recipe.input.CraftingRecipeInput; +import net.minecraft.util.collection.DefaultedList; +import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(CraftingRecipe.class) +public interface CraftingRecipeMixin { + @Inject(method = "collectRecipeRemainders", at = @At("RETURN")) + private static void mcpitanlib$collectRecipeRemainders(CraftingRecipeInput input, CallbackInfoReturnable> cir) { + DefaultedList defaultedList = cir.getReturnValue(); + + int i = 0; + for (ItemStack stack : defaultedList) { + if (stack.getItem() instanceof FixedRecipeRemainderItem) { + FixedRecipeRemainderItem remainder = (FixedRecipeRemainderItem) stack.getItem(); + defaultedList.set(i, remainder.getFixedRecipeRemainder(stack.copy())); + } + i++; + } + } +} diff --git a/common/src/main/resources/mcpitanlib-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json index eb6ff1af0..c8b9bffd6 100644 --- a/common/src/main/resources/mcpitanlib-common.mixins.json +++ b/common/src/main/resources/mcpitanlib-common.mixins.json @@ -9,6 +9,7 @@ "Block4CompatProviderMixin", "BlockInvoker", "BlockMixin", + "CraftingRecipeMixin", "ItemMixin", "ItemStackComponentizationFixMixin", "ItemStackMixin", From aeeaf4f719916b8cfb0278d6b4fc5ba24c73038b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 8 Feb 2026 18:08:00 +0900 Subject: [PATCH 594/622] fix: change CraftingRecipeMixin to RecipeMixin --- .../{CraftingRecipeMixin.java => RecipeMixin.java} | 12 ++++++------ .../src/main/resources/mcpitanlib-common.mixins.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) rename common/src/main/java/net/pitan76/mcpitanlib/mixin/{CraftingRecipeMixin.java => RecipeMixin.java} (69%) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/mixin/CraftingRecipeMixin.java b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java similarity index 69% rename from common/src/main/java/net/pitan76/mcpitanlib/mixin/CraftingRecipeMixin.java rename to common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java index c8e709d41..8d58cb4ed 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/mixin/CraftingRecipeMixin.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/mixin/RecipeMixin.java @@ -1,8 +1,8 @@ package net.pitan76.mcpitanlib.mixin; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.CraftingRecipe; -import net.minecraft.recipe.input.CraftingRecipeInput; +import net.minecraft.recipe.Recipe; +import net.minecraft.recipe.input.RecipeInput; import net.minecraft.util.collection.DefaultedList; import net.pitan76.mcpitanlib.api.item.FixedRecipeRemainderItem; import org.spongepowered.asm.mixin.Mixin; @@ -10,10 +10,10 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -@Mixin(CraftingRecipe.class) -public interface CraftingRecipeMixin { - @Inject(method = "collectRecipeRemainders", at = @At("RETURN")) - private static void mcpitanlib$collectRecipeRemainders(CraftingRecipeInput input, CallbackInfoReturnable> cir) { +@Mixin(Recipe.class) +public interface RecipeMixin { + @Inject(method = "getRemainder", at = @At("RETURN")) + private void mcpitanlib$getRemainder(T input, CallbackInfoReturnable> cir) { DefaultedList defaultedList = cir.getReturnValue(); int i = 0; diff --git a/common/src/main/resources/mcpitanlib-common.mixins.json b/common/src/main/resources/mcpitanlib-common.mixins.json index c8b9bffd6..076c45dea 100644 --- a/common/src/main/resources/mcpitanlib-common.mixins.json +++ b/common/src/main/resources/mcpitanlib-common.mixins.json @@ -9,7 +9,7 @@ "Block4CompatProviderMixin", "BlockInvoker", "BlockMixin", - "CraftingRecipeMixin", + "RecipeMixin", "ItemMixin", "ItemStackComponentizationFixMixin", "ItemStackMixin", From 71d4f4234739706fba48b87eeffe9fade4f7d06e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 8 Feb 2026 18:10:36 +0900 Subject: [PATCH 595/622] [cp] changelog --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 970f022fc..6c2b4670e 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib mod_version=3.4.6 maven_group=net.pitan76 -changelog=Add APIs \ No newline at end of file +changelog=Fix recipe remainder of MCPitanLib Item API \ No newline at end of file From 69ae21dd723e8b1ba4f548dd814faa0c3d82a00e Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 18 Mar 2026 16:16:41 +0900 Subject: [PATCH 596/622] [cp] feat: add Box, Vector Utils, improve WorldUtils --- .../mcpitanlib/api/util/EntityUtil.java | 13 ++ .../mcpitanlib/api/util/WorldUtil.java | 55 ++++++++- .../mcpitanlib/api/util/math/BoxUtil.java | 12 ++ .../mcpitanlib/api/util/math/Vec3dUtil.java | 6 +- .../mcpitanlib/midohra/util/math/Box.java | 115 ++++++++++++++++++ .../midohra/util/math/Vector3d.java | 8 ++ .../midohra/util/math/Vector3f.java | 10 ++ .../midohra/util/math/Vector3i.java | 5 + 8 files changed, 217 insertions(+), 7 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java index 0242f098d..291a4a252 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/EntityUtil.java @@ -290,4 +290,17 @@ public static Vector3d getPosM(Entity entity) { public static void setPos(Entity entity, double x, double y, double z) { entity.setPos(x, y, z); } + + public static void addVelocity(Entity entity, double x, double y, double z) { + entity.addVelocity(x, y, z); + } + + public static void addVelocity(Entity entity, Vec3d velocity) { + entity.addVelocity(velocity); + } + + public static void addVelocity(Entity entity, Vector3d velocity) { + addVelocity(entity, velocity.toMinecraft()); + } + } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index 1f09806b9..bb903e3d2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -5,10 +5,8 @@ import net.minecraft.block.Blocks; import net.minecraft.block.ShapeContext; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.ExperienceOrbEntity; -import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.*; +import net.minecraft.entity.mob.Monster; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; @@ -30,9 +28,11 @@ import net.pitan76.mcpitanlib.api.entity.Player; import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.api.util.math.BoxUtil; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.entity.EntityTypeWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.Vector3d; import net.pitan76.mcpitanlib.midohra.world.chunk.ChunkTicketType; import org.jetbrains.annotations.Nullable; @@ -419,4 +419,51 @@ public static CompatIdentifier getNetherId() { public static CompatIdentifier getEndId() { return CompatIdentifier.fromMinecraft(World.END.getValue()); } + + public static long getTimeOfDay(World world) { + return world.getTimeOfDay(); + } + + public static List getEntitiesByClass(World world, Class entityClass, net.pitan76.mcpitanlib.midohra.util.math.Box box) { + return getEntitiesByClass(world, entityClass, box, EntityPredicates.VALID_ENTITY); + } + + public static List getEntitiesByClass(World world, Class entityClass, Box box) { + return getEntitiesByClass(world, entityClass, box, EntityPredicates.VALID_ENTITY); + } + + public static List getEntitiesByClass(World world, Class entityClass, net.pitan76.mcpitanlib.midohra.util.math.Box box, Predicate predicate) { + return getEntitiesByClass(world, entityClass, box.toMinecraft(), predicate); + } + + public static List getEntitiesByClass(World world, Class entityClass, Vector3d center, double radius, Predicate predicate) { + Box box = BoxUtil.createBox(center.x - radius, center.y - radius, center.z - radius, center.x + radius, center.y + radius, center.z + radius); + return getEntitiesByClass(world, entityClass, box, predicate); + } + + public static List getEntitiesByClass(World world, Class entityClass, Vector3d center, double radius) { + return getEntitiesByClass(world, entityClass, center, radius, EntityPredicates.VALID_ENTITY); + } + + public static List getMonsters(World world, Box box) { + return world.getEntitiesByClass(LivingEntity.class, box, entity -> entity instanceof Monster); + } + + public static List getMonsters(World world, net.pitan76.mcpitanlib.midohra.util.math.Box box) { + return getMonsters(world, box.toMinecraft()); + } + + public static List getMonsters(World world, Vector3d center, double radius) { + Box box = BoxUtil.createBox(center.x - radius, center.y - radius, center.z - radius, center.x + radius, center.y + radius, center.z + radius); + return getMonsters(world, box); + } + + public static List getEntitiesByType(World world, EntityTypeWrapper filter, net.pitan76.mcpitanlib.midohra.util.math.Box box) { + return getEntitiesByType(world, filter, box.toMinecraft()); + } + + public static List getEntitiesByType(World world, EntityTypeWrapper filter, net.pitan76.mcpitanlib.midohra.util.math.Box box, Predicate predicate) { + return getEntitiesByType(world, filter, box.toMinecraft(), predicate); + } + } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java index aec3d4fbc..8bf031508 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/BoxUtil.java @@ -39,4 +39,16 @@ public static Box createBox(BlockPos pos, int sizeX, int sizeY, int sizeZ) { public static Box createBoxCenter(BlockPos pos, int size) { return createBox(pos.add(-size, -size, -size), pos.add(size, size, size)); } + + public static Box expand(Box box, double x, double y, double z) { + return new Box(box.minX - x, box.minY - y, box.minZ - z, box.maxX + x, box.maxY + y, box.maxZ + z); + } + + public static Box expand(Box box, double size) { + return expand(box, size, size, size); + } + + public static Box union(Box box1, Box box2) { + return box1.union(box2); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java index c93066c33..f239b0a40 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/Vec3dUtil.java @@ -63,7 +63,7 @@ public static double distanceTo(Vec3d a, Vec3d b) { return a.distanceTo(b); } - - - + public static Vec3d ofCenter(double x, double y, double z) { + return new Vec3d(x + 0.5, y + 0.5, z + 0.5); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java new file mode 100644 index 000000000..65fc3555c --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java @@ -0,0 +1,115 @@ +package net.pitan76.mcpitanlib.midohra.util.math; + +import net.minecraft.util.math.Vec3d; +import net.pitan76.mcpitanlib.api.util.math.BoxUtil; + +public class Box { + protected final net.minecraft.util.math.Box box; + + @Deprecated + public Box(net.minecraft.util.math.Box box) { + this.box = box; + } + + @Deprecated + public net.minecraft.util.math.Box toMinecraft() { + return box; + } + + public Box(double x1, double y1, double z1, double x2, double y2, double z2) { + this(BoxUtil.createBox(x1, y1, z1, x2, y2, z2)); + } + + public Box(double x, double y, double z, double size) { + this(x, y, z, x + size, y + size, z + size); + } + + public Box(double size) { + this(0, 0, 0, size, size, size); + } + + public Box(BlockPos pos) { + this(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); + } + + public Box(net.pitan76.mcpitanlib.midohra.util.math.v0.BlockPos pos) { + this(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); + } + + public Box(BlockPos pos1, BlockPos pos2) { + this(pos1.getX(), pos1.getY(), pos1.getZ(), pos2.getX(), pos2.getY(), pos2.getZ()); + } + + public Box(net.pitan76.mcpitanlib.midohra.util.math.v0.BlockPos pos1, net.pitan76.mcpitanlib.midohra.util.math.v0.BlockPos pos2) { + this(pos1.getX(), pos1.getY(), pos1.getZ(), pos2.getX(), pos2.getY(), pos2.getZ()); + } + + public Box(Vector3i pos) { + this(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); + } + + public Box(Vector3i pos1, Vector3i pos2) { + this(pos1.getX(), pos1.getY(), pos1.getZ(), pos2.getX(), pos2.getY(), pos2.getZ()); + } + + public Box(Vector3d pos) { + this(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1); + } + + public Box(Vector3d pos1, Vector3d pos2) { + this(pos1.getX(), pos1.getY(), pos1.getZ(), pos2.getX(), pos2.getY(), pos2.getZ()); + } + + public Box expand(double x, double y, double z) { + return new Box(BoxUtil.expand(box, x, y, z)); + } + + public Box expand(double size) { + return expand(size, size, size); + } + + public Box union(Box other) { + return new Box(BoxUtil.union(box, other.box)); + } + + public double getMinX() { + return box.minX; + } + + public double getMinY() { + return box.minY; + } + + public double getMinZ() { + return box.minZ; + } + + public double getMaxX() { + return box.maxX; + } + + public double getMaxY() { + return box.maxY; + } + + public double getMaxZ() { + return box.maxZ; + } + + public Vector3d getCenter() { + Vec3d center = box.getCenter(); + return new Vector3d(center.x, center.y, center.z); + } + + public double getLengthX() { + return box.getLengthX(); + } + + public double getLengthY() { + return box.getLengthY(); + } + + public double getLengthZ() { + return box.getLengthZ(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java index c83fdb8da..3da170a7b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3d.java @@ -180,4 +180,12 @@ public int hashCode() { h = 31 * h + Double.hashCode(z); return h; } + + public Vector3d ofCenter() { + return new Vector3d(x + 0.5, y + 0.5, z + 0.5); + } + + public Vec3d toMinecraft() { + return new Vec3d(x, y, z); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java index b0e459541..c04deb552 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3f.java @@ -1,5 +1,7 @@ package net.pitan76.mcpitanlib.midohra.util.math; +import net.minecraft.util.math.Vec3d; + public class Vector3f { public final float x; public final float y; @@ -169,4 +171,12 @@ public int hashCode() { h = 31 * h + Float.hashCode(z); return h; } + + public Vector3f ofCenter() { + return this.add(0.5f, 0.5f, 0.5f); + } + + public org.joml.Vector3f toMinecraft() { + return new org.joml.Vector3f(x, y, z); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java index 71c0bd5d5..0606d7997 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Vector3i.java @@ -1,6 +1,7 @@ package net.pitan76.mcpitanlib.midohra.util.math; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; public class Vector3i { @@ -188,4 +189,8 @@ public int hashCode() { h = 31 * h + Integer.hashCode(z); return h; } + + public Vec3i toMinecraft() { + return new Vec3i(x, y, z); + } } From 7f996acff2b869527905636b12440edf3db42bce Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Wed, 18 Mar 2026 16:57:54 +0900 Subject: [PATCH 597/622] [cp] Bump version 3.4.7 --- info.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/info.properties b/info.properties index 6c2b4670e..9d49d0af2 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.6 +mod_version=3.4.7 maven_group=net.pitan76 -changelog=Fix recipe remainder of MCPitanLib Item API \ No newline at end of file +changelog=Add Compat APIs From ce3d36050a1dd806e54a205829e90f0a5034a612 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 19 Mar 2026 22:00:40 +0900 Subject: [PATCH 598/622] [cp] feat: add values, horizontal, vertical, hashCode, equals to Direction.java --- .../midohra/util/math/Direction.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java index c334c25ef..eebc3da6f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Direction.java @@ -105,4 +105,29 @@ public String toString() { public String getName() { return getRaw().name(); } + + public static Direction[] values() { + return new Direction[]{UP, DOWN, NORTH, SOUTH, EAST, WEST}; + } + + public Direction[] horizontal() { + return new Direction[]{NORTH, SOUTH, EAST, WEST}; + } + + public Direction[] vertical() { + return new Direction[]{UP, DOWN}; + } + + @Override + public int hashCode() { + return getRaw().hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + Direction dir = (Direction) obj; + return getRaw() == dir.getRaw(); + } } From 7e1f66a4f006aa4b3d7c4d039cf558ab226fd47d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Thu, 19 Mar 2026 22:01:14 +0900 Subject: [PATCH 599/622] [cp] feat: impl hashCode, equals methods in Box, BlockPos --- .../mcpitanlib/midohra/util/math/BlockPos.java | 13 +++++++++++++ .../pitan76/mcpitanlib/midohra/util/math/Box.java | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java index 129da5856..73d9bf7d2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java @@ -88,4 +88,17 @@ public BlockPos offset(Direction direction) { public ChunkPos toChunkPos() { return ChunkPos.of(this); } + + @Override + public int hashCode() { + return blockPos.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + BlockPos pos = (BlockPos) obj; + return blockPos.equals(pos.blockPos); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java index 65fc3555c..393cec15c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/Box.java @@ -112,4 +112,17 @@ public double getLengthY() { public double getLengthZ() { return box.getLengthZ(); } + + @Override + public int hashCode() { + return box.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + Box other = (Box) obj; + return box.equals(other.box); + } } From 83d4d1bbfc0f1d386e37449d39947b2d68e3f5d7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 20 Mar 2026 13:39:48 +0900 Subject: [PATCH 600/622] [cp] feat: add message sending methods to Player class --- .../net/pitan76/mcpitanlib/api/entity/Player.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index e6169bed6..7cbe8d84c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -38,6 +38,7 @@ import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; +import net.pitan76.mcpitanlib.api.util.TextUtil; import net.pitan76.mcpitanlib.core.player.ItemCooldown; import java.util.*; @@ -508,4 +509,16 @@ public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { public void eatFood(ItemStack stack, CompatFoodComponent foodComponent) { getEntity().getHungerManager().eat(foodComponent.build()); } + + public void sendMessage(String message) { + sendMessage(TextUtil.of(message)); + } + + public void sendActionBar(String message) { + sendActionBar(TextUtil.of(message)); + } + + public void sendMessagef(String format, Object... args) { + sendMessage(TextUtil.of(String.format(format, args))); + } } \ No newline at end of file From c3ef3e1e2e78f842d0df8e5cf2eda805edc188bc Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 20 Mar 2026 13:40:35 +0900 Subject: [PATCH 601/622] [cp] feat: add FluidWrapper methods and enhance FluidStateUtil for fluid retrieval --- .../mcpitanlib/api/util/FluidStateUtil.java | 19 +++++++++++++++++++ .../midohra/fluid/FluidWrapper.java | 13 +++++++++++++ .../mcpitanlib/midohra/world/IWorldView.java | 5 +++++ 3 files changed, 37 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java index 18355350a..848547d07 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/FluidStateUtil.java @@ -4,6 +4,9 @@ import net.minecraft.fluid.Fluid; import net.minecraft.fluid.FluidState; import net.minecraft.registry.tag.FluidTags; +import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.World; public class FluidStateUtil { public static boolean isWater(FluidState state) { @@ -26,4 +29,20 @@ public static FluidState getDefaultState(Fluid state) { public static Fluid getFluid(FluidState state) { return state.getFluid(); } + + public static FluidWrapper getFluidWrapper(FluidState state) { + return FluidWrapper.of(getFluid(state)); + } + + public static FluidWrapper getFluidWrapper(BlockState state) { + return getFluidWrapper(getFluidState(state)); + } + + public static FluidWrapper getFluidWrapper(net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return getFluidWrapper(state.toMinecraft()); + } + + public static FluidWrapper getFluidWrapper(World world, BlockPos pos) { + return getFluidWrapper(world.getBlockState(pos)); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java index 387ecd2f5..720de5698 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/fluid/FluidWrapper.java @@ -84,4 +84,17 @@ public ItemWrapper getBucketItem() { public boolean rawEquals(FluidWrapper fluid) { return get() == fluid.get(); } + + @Override + public int hashCode() { + return isEmpty() ? 0 : get().hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + FluidWrapper other = (FluidWrapper) obj; + return rawEquals(other); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java index d520e0e3a..95d95ab78 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/IWorldView.java @@ -5,6 +5,7 @@ import net.minecraft.fluid.FluidState; import net.minecraft.util.math.BlockPos; import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.fluid.FluidWrapper; public interface IWorldView { BlockEntity getBlockEntity(BlockPos pos); @@ -20,4 +21,8 @@ default BlockEntityWrapper getBlockEntity(net.pitan76.mcpitanlib.midohra.util.ma default net.pitan76.mcpitanlib.midohra.block.BlockState getBlockState(net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { return net.pitan76.mcpitanlib.midohra.block.BlockState.of(getBlockState(pos.toMinecraft())); } + + default FluidWrapper getFluid(net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { + return FluidWrapper.of(getFluidState(pos.toMinecraft()).getFluid()); + } } From 9f54da3308fe0564231cf24434d14f556ee5d9f9 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 20 Mar 2026 13:40:47 +0900 Subject: [PATCH 602/622] [cp] feat: implement BlockApiLookupWrapper and BlockApiLookupWithDirection for enhanced block entity lookup --- .../block/BlockApiLookupWithDirection.java | 56 ++++++++++++++++++ .../lookup/block/BlockApiLookupWrapper.java | 57 +++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWithDirection.java create mode 100644 fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWrapper.java diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWithDirection.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWithDirection.java new file mode 100644 index 000000000..9f5e6d946 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWithDirection.java @@ -0,0 +1,56 @@ +package net.pitan76.mcpitanlib.api.lookup.block; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityTypeWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; +import net.pitan76.mcpitanlib.midohra.world.World; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.function.BiFunction; + +public class BlockApiLookupWithDirection extends BlockApiLookupWrapper { + + public BlockApiLookupWithDirection(BlockApiLookup<@NotNull A, net.minecraft.util.math.Direction> lookup) { + super(lookup); + } + + @Deprecated + public static BlockApiLookupWrapper of(BlockApiLookup<@NotNull A, C> lookup) { + return new BlockApiLookupWrapper<>(lookup); + } + + public static BlockApiLookupWithDirection ofDir(BlockApiLookup<@NotNull A, net.minecraft.util.math.Direction> lookup) { + return new BlockApiLookupWithDirection<>(lookup); + } + + public @Nullable A find(World world, BlockPos pos, Direction direction) { + return super.find(world, pos, direction.toMinecraft()); + } + + public @Nullable A find(World world, BlockPos pos, BlockState state, BlockEntity blockEntity, Direction direction) { + return super.find(world, pos, state, blockEntity, direction.toMinecraft()); + } + + public @Nullable A find(World world, BlockPos pos, BlockState state, BlockEntityWrapper blockEntity, Direction direction) { + return super.find(world, pos, state, blockEntity, direction.toMinecraft()); + } + + public void registerForBlockEntityM(BiFunction provider, BlockEntityType blockEntityType) { + super.registerForBlockEntity((blockEntity, direction) -> provider.apply(blockEntity, Direction.of(direction)), blockEntityType); + } + + @Deprecated + public void registerForBlockEntity(BiFunction provider, BlockEntityType blockEntityType) { + super.registerForBlockEntity(provider, blockEntityType); + } + + public void registerForBlockEntityWrapperM(BiFunction provider, BlockEntityTypeWrapper blockEntityType) { + super.registerForBlockEntityWrapper((blockEntity, direction) -> provider.apply(blockEntity, Direction.of(direction)), blockEntityType); + } +} \ No newline at end of file diff --git a/fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWrapper.java b/fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWrapper.java new file mode 100644 index 000000000..0651be594 --- /dev/null +++ b/fabric/src/main/java/net/pitan76/mcpitanlib/api/lookup/block/BlockApiLookupWrapper.java @@ -0,0 +1,57 @@ +package net.pitan76.mcpitanlib.api.lookup.block; + +import net.fabricmc.fabric.api.lookup.v1.block.BlockApiLookup; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityType; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityTypeWrapper; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.World; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.function.BiFunction; + +public class BlockApiLookupWrapper { + + private final BlockApiLookup<@NotNull A, C> lookup; + + public BlockApiLookupWrapper(BlockApiLookup<@NotNull A, C> lookup) { + this.lookup = lookup; + } + + public BlockApiLookup<@NotNull A, C> getRaw() { + return lookup; + } + + public static BlockApiLookupWrapper of(BlockApiLookup<@NotNull A, C> lookup) { + return new BlockApiLookupWrapper<>(lookup); + } + + public @Nullable A find(World world, BlockPos pos, C context) { + return lookup.find(world.getRaw(), pos.toMinecraft(), context); + } + + public @Nullable A find(World world, BlockPos pos, BlockState state, BlockEntity blockEntity, C context) { + return lookup.find(world.getRaw(), pos.toMinecraft(), state.toMinecraft(), blockEntity, context); + } + + public @Nullable A find(World world, BlockPos pos, BlockState state, BlockEntityWrapper blockEntity, C context) { + return lookup.find(world.getRaw(), pos.toMinecraft(), state.toMinecraft(), blockEntity.get(), context); + } + + public void registerForBlockEntity(BiFunction provider, BlockEntityType blockEntityType) { + lookup.registerForBlockEntity(provider, blockEntityType); + } + + public void registerForBlockEntityWrapper(BiFunction provider, BlockEntityTypeWrapper blockEntityWrapperType) { + lookup.registerForBlockEntity((blockEntity, context) -> + provider.apply(BlockEntityWrapper.of(blockEntity), context), blockEntityWrapperType.get()); + } + + public CompatIdentifier getId() { + return CompatIdentifier.fromMinecraft(lookup.getId()); + } +} \ No newline at end of file From 0b70d6e7b4b8fa69a8d5f1db3351daa688718b8d Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 20 Mar 2026 13:40:14 +0900 Subject: [PATCH 603/622] [cp] feat: add methods to retrieve Midohra world, position, state, and block entity wrapper in NeighborUpdateEvent --- .../api/event/block/NeighborUpdateEvent.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java index fb10fd86c..6d55e70f8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/NeighborUpdateEvent.java @@ -7,6 +7,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.util.WorldUtil; +import net.pitan76.mcpitanlib.midohra.block.entity.BlockEntityWrapper; import org.jetbrains.annotations.Nullable; public class NeighborUpdateEvent extends BaseEvent { @@ -68,4 +69,20 @@ public BlockEntity getBlockEntity() { public boolean hasBlockEntity() { return WorldUtil.hasBlockEntity(world, pos); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(world); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(pos); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } + + public BlockEntityWrapper getBlockEntityWrapper() { + return BlockEntityWrapper.of(getBlockEntity()); + } } From 066695b4076bd35e23006270a4db2b511b3f5a28 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 20 Mar 2026 16:40:41 +0900 Subject: [PATCH 604/622] [cp] feat: add DirectionBoolPropertyUtil for managing directional boolean properties in block states --- .../api/event/block/AppendPropertiesArgs.java | 5 ++ .../api/util/DirectionBoolPropertyUtil.java | 58 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java index 9bd8fa2a1..087efa37b 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/AppendPropertiesArgs.java @@ -6,6 +6,7 @@ import net.minecraft.state.property.Property; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.state.property.IProperty; +import net.pitan76.mcpitanlib.api.util.DirectionBoolPropertyUtil; public class AppendPropertiesArgs extends BaseEvent { public StateManager.Builder builder; @@ -27,4 +28,8 @@ public void addProperty(IProperty... properties) { builder.add(property.getProperty()); } } + + public void addAllDirectionBoolProperties() { + DirectionBoolPropertyUtil.addProperties(this); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java new file mode 100644 index 000000000..efad0af51 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java @@ -0,0 +1,58 @@ +package net.pitan76.mcpitanlib.api.util; + +import net.pitan76.mcpitanlib.api.event.block.AppendPropertiesArgs; +import net.pitan76.mcpitanlib.api.state.property.CompatProperties; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.util.math.Direction; +import net.pitan76.mcpitanlib.midohra.world.World; + +public class DirectionBoolPropertyUtil { + /** + * 指定位置のブロック状態に対して、方向に対応する Boolean プロパティを設定してワールドに反映する。 + * 例: Direction.UP => CompatProperties.UP + * @return プロパティが存在して設定に成功した場合は true、プロパティが存在しない場合やブロック状態が null の場合は false + */ + public static boolean setProperty(World world, BlockPos pos, Direction dir, boolean value) { + BlockState state = world.getBlockState(pos); + + if (dir == Direction.UP && state.contains(CompatProperties.UP)) { + state = state.with(CompatProperties.UP, value); + } else if (dir == Direction.DOWN && state.contains(CompatProperties.DOWN)) { + state = state.with(CompatProperties.DOWN, value); + } else if (dir == Direction.NORTH && state.contains(CompatProperties.NORTH)) { + state = state.with(CompatProperties.NORTH, value); + } else if (dir == Direction.SOUTH && state.contains(CompatProperties.SOUTH)) { + state = state.with(CompatProperties.SOUTH, value); + } else if (dir == Direction.WEST && state.contains(CompatProperties.WEST)) { + state = state.with(CompatProperties.WEST, value); + } else if (dir == Direction.EAST && state.contains(CompatProperties.EAST)) { + state = state.with(CompatProperties.EAST, value); + } else { + return false; + } + + world.setBlockState(pos, state); + return true; + } + + public static boolean hasAll(BlockState state) { + return state.contains(CompatProperties.UP) && state.contains(CompatProperties.DOWN) && state.contains(CompatProperties.NORTH) && + state.contains(CompatProperties.SOUTH) && state.contains(CompatProperties.WEST) && state.contains(CompatProperties.EAST); + } + + public static BlockState clearAll(BlockState state) { + return state + .with(CompatProperties.UP, false) + .with(CompatProperties.DOWN, false) + .with(CompatProperties.NORTH, false) + .with(CompatProperties.EAST, false) + .with(CompatProperties.SOUTH, false) + .with(CompatProperties.WEST, false); + } + + public static void addProperties(AppendPropertiesArgs args) { + args.addProperty(CompatProperties.UP, CompatProperties.DOWN, CompatProperties.NORTH, + CompatProperties.EAST, CompatProperties.SOUTH, CompatProperties.WEST); + } +} From b020e37537c56d9509d91d8e4db66a5764c26bb7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Fri, 20 Mar 2026 16:41:44 +0900 Subject: [PATCH 605/622] [cp] bump version 3.4.8 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index 9d49d0af2..e3bbd3ddc 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.7 +mod_version=3.4.8 maven_group=net.pitan76 changelog=Add Compat APIs From f23245d4b02c0cc7252938874eb942ff7e403491 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 21 Mar 2026 22:55:28 +0900 Subject: [PATCH 606/622] [cp] feat: enhance block entity rendering with new CompatItemRenderUtil and CompatItemDisplayContext # Conflicts: # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java # Conflicts: # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java --- .../entity/CompatBlockEntityRenderer.java | 2 +- .../entity/event/BlockEntityRenderEvent.java | 20 ++++++++++ .../entity/v2/CompatBlockEntityRenderer.java | 6 ++- .../api/event/block/StateReplacedEvent.java | 14 ++++++- .../render/CompatItemDisplayContext.java | 39 +++++++++++++++++++ .../client/render/CompatItemRenderUtil.java | 36 +++++++++++++++++ 6 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java index 22589bd1c..0db5cb14c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java @@ -12,7 +12,7 @@ public interface CompatBlockEntityRenderer extends @Override default void render(T entity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { - render(new BlockEntityRenderEvent<>(entity, tickDelta, matrices, vertexConsumers, light, overlay)); + render(new BlockEntityRenderEvent<>(this, entity, tickDelta, matrices, vertexConsumers, light, overlay)); } default boolean rendersOutsideBoundingBoxOverride(T blockEntity) { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java index 7b0a172e0..2d655398c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/event/BlockEntityRenderEvent.java @@ -5,13 +5,17 @@ import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import net.pitan76.mcpitanlib.api.client.registry.CompatRegistryClient; import net.pitan76.mcpitanlib.api.client.render.CompatRenderLayer; import net.pitan76.mcpitanlib.api.client.render.DrawObjectMV; +import net.pitan76.mcpitanlib.api.client.render.block.entity.CompatBlockEntityRenderer; import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; import net.pitan76.mcpitanlib.api.util.MathUtil; import net.pitan76.mcpitanlib.api.util.client.ClientUtil; import net.pitan76.mcpitanlib.api.util.client.MatrixStackUtil; +import net.pitan76.mcpitanlib.api.util.client.render.CompatItemRenderUtil; import org.joml.Matrix3f; import org.joml.Matrix4f; @@ -120,4 +124,20 @@ public BlockPos getPos() { public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(getPos()); } + + //---- + + @Deprecated + public CompatRegistryClient.BlockEntityRendererFactory.Context ctx; + + public BlockEntityRenderEvent(CompatBlockEntityRenderer renderer, T blockEntity, float tickDelta, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay) { + this(blockEntity, tickDelta, matrices, vertexConsumers, light, overlay); + if (renderer instanceof net.pitan76.mcpitanlib.api.client.render.block.entity.v2.CompatBlockEntityRenderer) { + this.ctx = ((net.pitan76.mcpitanlib.api.client.render.block.entity.v2.CompatBlockEntityRenderer) renderer).ctx; + } + } + + public void renderItemFixed(ItemStack stack) { + CompatItemRenderUtil.renderItemFixed(stack, this, blockEntity.callGetWorld()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java index cec057a47..2d3b4f911 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java @@ -5,11 +5,15 @@ import net.pitan76.mcpitanlib.api.tile.CompatBlockEntity; public abstract class CompatBlockEntityRenderer implements net.pitan76.mcpitanlib.api.client.render.block.entity.CompatBlockEntityRenderer { + + @Deprecated + public CompatRegistryClient.BlockEntityRendererFactory.Context ctx; + public CompatBlockEntityRenderer(CompatBlockEntityRendererConstructArgs args) { } public CompatBlockEntityRenderer(CompatRegistryClient.BlockEntityRendererFactory.Context ctx) { - + this.ctx = ctx; } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java index a3e2d0e08..4be061fb6 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/StateReplacedEvent.java @@ -19,12 +19,17 @@ public class StateReplacedEvent extends BaseEvent { public BlockState newState; public boolean moved; + // Captured at construction time so getBlockEntity() works even after the world (1.21.x) + private final BlockEntity cachedBlockEntity; + public StateReplacedEvent(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) { this.state = state; this.world = world; this.pos = pos; this.newState = newState; this.moved = moved; + + this.cachedBlockEntity = WorldUtil.hasBlockEntity(world, pos) ? WorldUtil.getBlockEntity(world, pos) : null; } public BlockState getState() { @@ -61,17 +66,22 @@ public boolean isSameState() { /** * check if the block has a block entity - * @return BlockEntity + * @return boolean */ public boolean hasBlockEntity() { - return WorldUtil.hasBlockEntity(world, pos); + return getBlockEntity() != null; } /** * get the block entity + *

+ * The block entity is captured at event creation time, so this returns a valid + * reference even in MC 1.21.x where the world removes the BE before + * onStateReplaced is invoked. * @return BlockEntity */ public BlockEntity getBlockEntity() { + if (cachedBlockEntity != null) return cachedBlockEntity; return WorldUtil.getBlockEntity(world, pos); } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java new file mode 100644 index 000000000..f9950b35b --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java @@ -0,0 +1,39 @@ +package net.pitan76.mcpitanlib.api.util.client.render; + +import net.minecraft.item.ModelTransformationMode; +import net.pitan76.mcpitanlib.api.util.CompatStringIdentifiable; + +public class CompatItemDisplayContext implements CompatStringIdentifiable { + private final ModelTransformationMode context; + + public static final CompatItemDisplayContext NONE = of(ModelTransformationMode.NONE); + public static final CompatItemDisplayContext THIRD_PERSON_LEFT_HAND = of(ModelTransformationMode.THIRD_PERSON_LEFT_HAND); + public static final CompatItemDisplayContext THIRD_PERSON_RIGHT_HAND = of(ModelTransformationMode.THIRD_PERSON_RIGHT_HAND); + public static final CompatItemDisplayContext FIRST_PERSON_LEFT_HAND = of(ModelTransformationMode.FIRST_PERSON_LEFT_HAND); + public static final CompatItemDisplayContext FIRST_PERSON_RIGHT_HAND = of(ModelTransformationMode.FIRST_PERSON_RIGHT_HAND); + public static final CompatItemDisplayContext HEAD = of(ModelTransformationMode.HEAD); + public static final CompatItemDisplayContext GUI = of(ModelTransformationMode.GUI); + public static final CompatItemDisplayContext GROUND = of(ModelTransformationMode.GROUND); + public static final CompatItemDisplayContext FIXED = of(ModelTransformationMode.FIXED); + + public CompatItemDisplayContext(ModelTransformationMode context) { + this.context = context; + } + + public static CompatItemDisplayContext of(ModelTransformationMode context) { + return new CompatItemDisplayContext(context); + } + + public ModelTransformationMode getContext() { + return context; + } + + public String getName() { + return context.name(); + } + + @Override + public String asString_compat() { + return getName(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java new file mode 100644 index 000000000..fbab82941 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java @@ -0,0 +1,36 @@ +package net.pitan76.mcpitanlib.api.util.client.render; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.item.ItemModelManager; +import net.minecraft.client.render.item.ItemRenderState; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.pitan76.mcpitanlib.api.client.render.block.entity.event.BlockEntityRenderEvent; + +/** + * Cross-version utility for rendering items in block entity renderers. + */ +public class CompatItemRenderUtil { + /** + * Renders an ItemStack in FIXED transform mode. + */ + public static void renderItemFixed(ItemStack stack, BlockEntityRenderEvent e, World world) { + renderItem(stack, CompatItemDisplayContext.FIXED, e, world); + } + + /** + * Renders an ItemStack + */ + public static void renderItem(ItemStack stack, CompatItemDisplayContext displayContext, BlockEntityRenderEvent e, World world) { + ItemModelManager manager = e.ctx != null ? e.ctx.getItemModelManager() : MinecraftClient.getInstance().getItemModelManager(); + + ItemRenderState state = new ItemRenderState(); + manager.update(state, stack, displayContext.getContext(), world, null, 0); + + int light = e.getLight(); + if (light == 0) light = 0xF000F0; // full-bright fallback if not populated by MCPitanLib + int overlay = e.getOverlay(); + + state.render(e.matrices, e.vertexConsumers, light, overlay); + } +} From 7be54b76aacbbd42b8ab24f691103fc1e1519719 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 21 Mar 2026 23:18:22 +0900 Subject: [PATCH 607/622] [cp] feat: enhance block entity rendering with new CompatItemRenderUtil and CompatItemDisplayContext # Conflicts: # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/CompatBlockEntityRenderer.java # common/src/main/java/net/pitan76/mcpitanlib/api/client/render/block/entity/v2/CompatBlockEntityRenderer.java --- .../client/render/CompatItemDisplayContext.java | 2 +- .../util/client/render/CompatItemRenderUtil.java | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java index f9950b35b..ea6d92e62 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemDisplayContext.java @@ -1,6 +1,6 @@ package net.pitan76.mcpitanlib.api.util.client.render; -import net.minecraft.item.ModelTransformationMode; +import net.minecraft.client.render.model.json.ModelTransformationMode; import net.pitan76.mcpitanlib.api.util.CompatStringIdentifiable; public class CompatItemDisplayContext implements CompatStringIdentifiable { diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java index fbab82941..a1bd8dae9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/client/render/CompatItemRenderUtil.java @@ -1,8 +1,7 @@ package net.pitan76.mcpitanlib.api.util.client.render; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.item.ItemModelManager; -import net.minecraft.client.render.item.ItemRenderState; +import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.client.render.block.entity.event.BlockEntityRenderEvent; @@ -22,15 +21,7 @@ public static void renderItemFixed(ItemStack stack, BlockEntityRenderEvent e, * Renders an ItemStack */ public static void renderItem(ItemStack stack, CompatItemDisplayContext displayContext, BlockEntityRenderEvent e, World world) { - ItemModelManager manager = e.ctx != null ? e.ctx.getItemModelManager() : MinecraftClient.getInstance().getItemModelManager(); - - ItemRenderState state = new ItemRenderState(); - manager.update(state, stack, displayContext.getContext(), world, null, 0); - - int light = e.getLight(); - if (light == 0) light = 0xF000F0; // full-bright fallback if not populated by MCPitanLib - int overlay = e.getOverlay(); - - state.render(e.matrices, e.vertexConsumers, light, overlay); + ItemRenderer renderer = e.getItemRenderer() != null ? e.getItemRenderer() : MinecraftClient.getInstance().getItemRenderer(); + renderer.renderItem(stack, displayContext.getContext(), e.getLight(), e.getOverlay(), e.matrices, e.vertexConsumers, world, 0); } } From 90566a90735c7e4885a0bdb67911213c4705ed13 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sat, 21 Mar 2026 23:57:55 +0900 Subject: [PATCH 608/622] [cp] feat: introduce CompatFormatting, CompatStyle, and CompatTextColor for enhanced text styling --- .../pitan76/mcpitanlib/api/entity/Player.java | 9 ++ .../api/event/ServerCommandEvent.java | 13 +++ .../event/item/ItemAppendTooltipEvent.java | 5 + .../mcpitanlib/api/text/CompatFormatting.java | 86 ++++++++++++++ .../mcpitanlib/api/text/CompatStyle.java | 105 ++++++++++++++++++ .../mcpitanlib/api/text/CompatTextColor.java | 79 +++++++++++++ .../mcpitanlib/api/text/TextComponent.java | 20 ++++ .../pitan76/mcpitanlib/api/util/TextUtil.java | 4 + 8 files changed, 321 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatFormatting.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatStyle.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatTextColor.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java index 7cbe8d84c..297b3be05 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/Player.java @@ -36,6 +36,7 @@ import net.pitan76.mcpitanlib.api.item.CompatFoodComponent; import net.pitan76.mcpitanlib.api.sound.CompatSoundCategory; import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; +import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.CompatIdentifier; import net.pitan76.mcpitanlib.api.util.ScreenHandlerUtil; import net.pitan76.mcpitanlib.api.util.TextUtil; @@ -521,4 +522,12 @@ public void sendActionBar(String message) { public void sendMessagef(String format, Object... args) { sendMessage(TextUtil.of(String.format(format, args))); } + + public void sendMessage(TextComponent textComponent) { + sendMessage(textComponent.getText()); + } + + public void sendActionBar(TextComponent textComponent) { + sendActionBar(textComponent.getText()); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java index 66ea40f4b..8cf6a1860 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/ServerCommandEvent.java @@ -10,6 +10,7 @@ import net.minecraft.text.Text; import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.entity.Player; +import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.TextUtil; import net.pitan76.mcpitanlib.api.util.WorldUtil; @@ -118,4 +119,16 @@ public void sendFailureRaw(String message) { public boolean isClient() { return WorldUtil.isClient(getWorld()); } + + public void sendSuccess(TextComponent message, boolean broadcastToOps) { + sendSuccess(message.getText(), broadcastToOps); + } + + public void sendSuccess(TextComponent message) { + sendSuccess(message.getText()); + } + + public void sendFailure(TextComponent message) { + sendFailure(message.getText()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java index d2ce8bd6d..e004a31ff 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/item/ItemAppendTooltipEvent.java @@ -7,6 +7,7 @@ import net.minecraft.world.World; import net.pitan76.mcpitanlib.api.event.BaseEvent; import net.pitan76.mcpitanlib.api.registry.CompatRegistryLookup; +import net.pitan76.mcpitanlib.api.text.TextComponent; import net.pitan76.mcpitanlib.api.util.RegistryLookupUtil; import org.jetbrains.annotations.Nullable; @@ -67,4 +68,8 @@ public boolean isAdvanced() { public CompatRegistryLookup getRegistryLookup() { return RegistryLookupUtil.getRegistryLookup(this); } + + public void addTooltip(TextComponent textComponent) { + addTooltip(textComponent.getText()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatFormatting.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatFormatting.java new file mode 100644 index 000000000..1de5acf72 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatFormatting.java @@ -0,0 +1,86 @@ +package net.pitan76.mcpitanlib.api.text; + +import net.minecraft.util.Formatting; +import net.pitan76.mcpitanlib.api.util.CompatStringIdentifiable; + +public class CompatFormatting implements CompatStringIdentifiable { + private final Formatting formatting; + + public static final CompatFormatting BLACK = of(Formatting.BLACK); + public static final CompatFormatting DARK_BLUE = of(Formatting.DARK_BLUE); + public static final CompatFormatting DARK_GREEN = of(Formatting.DARK_GREEN); + public static final CompatFormatting DARK_AQUA = of(Formatting.DARK_AQUA); + public static final CompatFormatting DARK_RED = of(Formatting.DARK_RED); + public static final CompatFormatting DARK_PURPLE = of(Formatting.DARK_PURPLE); + public static final CompatFormatting GOLD = of(Formatting.GOLD); + public static final CompatFormatting GRAY = of(Formatting.GRAY); + public static final CompatFormatting DARK_GRAY = of(Formatting.DARK_GRAY); + public static final CompatFormatting BLUE = of(Formatting.BLUE); + public static final CompatFormatting GREEN = of(Formatting.GREEN); + public static final CompatFormatting AQUA = of(Formatting.AQUA); + public static final CompatFormatting RED = of(Formatting.RED); + public static final CompatFormatting LIGHT_PURPLE = of(Formatting.LIGHT_PURPLE); + public static final CompatFormatting YELLOW = of(Formatting.YELLOW); + public static final CompatFormatting WHITE = of(Formatting.WHITE); + public static final CompatFormatting OBFUSCATED = of(Formatting.OBFUSCATED); + public static final CompatFormatting BOLD = of(Formatting.BOLD); + public static final CompatFormatting STRIKETHROUGH = of(Formatting.STRIKETHROUGH); + public static final CompatFormatting UNDERLINE = of(Formatting.UNDERLINE); + public static final CompatFormatting ITALIC = of(Formatting.ITALIC); + public static final CompatFormatting RESET = of(Formatting.RESET); + + public CompatFormatting(Formatting formatting) { + this.formatting = formatting; + } + + public static CompatFormatting of(Formatting formatting) { + return new CompatFormatting(formatting); + } + + public Formatting getRaw() { + return formatting; + } + + @Override + public String asString_compat() { + return formatting.asString(); + } + + public boolean isColor() { + return formatting.isColor(); + } + + public boolean isModifier() { + return formatting.isModifier(); + } + + public char getCode() { + return formatting.getCode(); + } + + public Integer getColorValue() { + return formatting.getColorValue(); + } + + public int getColorIndex() { + return formatting.getColorIndex(); + } + + @Override + public String toString() { + return formatting.toString(); + } + + @Override + public int hashCode() { + return formatting.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + CompatFormatting other = (CompatFormatting) obj; + return formatting.equals(other.formatting); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatStyle.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatStyle.java new file mode 100644 index 000000000..43b9aee73 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatStyle.java @@ -0,0 +1,105 @@ +package net.pitan76.mcpitanlib.api.text; + +import net.minecraft.text.Style; + +public class CompatStyle { + private final Style style; + + public CompatStyle(Style style) { + this.style = style; + } + + public CompatStyle() { + this(Style.EMPTY); + } + + public static CompatStyle of(Style style) { + return new CompatStyle(style); + } + + public static CompatStyle of() { + return new CompatStyle(); + } + + public CompatStyle withColor(CompatTextColor color) { + return new CompatStyle(style.withColor(color.getRaw())); + } + + public CompatStyle withColor(CompatFormatting formatting) { + return new CompatStyle(style.withColor(formatting.getRaw())); + } + + public CompatStyle withColor(int rgbColor) { + return new CompatStyle(style.withColor(rgbColor)); + } + + public CompatStyle withBold(boolean bold) { + return new CompatStyle(style.withBold(bold)); + } + + public CompatStyle withItalic(boolean italic) { + return new CompatStyle(style.withItalic(italic)); + } + + public CompatStyle withUnderline(boolean underline) { + return new CompatStyle(style.withUnderline(underline)); + } + + public CompatStyle withStrikethrough(boolean strikethrough) { + return new CompatStyle(style.withStrikethrough(strikethrough)); + } + + public CompatStyle withObfuscated(boolean obfuscated) { + return new CompatStyle(style.withObfuscated(obfuscated)); + } + + public CompatTextColor getColor() { + if (style.getColor() == null) return null; + return new CompatTextColor(style.getColor()); + } + + public boolean isBold() { + return style.isBold(); + } + + public boolean isItalic() { + return style.isItalic(); + } + + public boolean isUnderlined() { + return style.isUnderlined(); + } + + public boolean isStrikethrough() { + return style.isStrikethrough(); + } + + public boolean isObfuscated() { + return style.isObfuscated(); + } + + public boolean isEmpty() { + return style.isEmpty(); + } + + public CompatStyle withFormatting(CompatFormatting formatting) { + return withColor(formatting); + } + + public Style getRaw() { + return style; + } + + @Override + public int hashCode() { + return style.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + CompatStyle that = (CompatStyle) obj; + return style.equals(that.style); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatTextColor.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatTextColor.java new file mode 100644 index 000000000..306034382 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/CompatTextColor.java @@ -0,0 +1,79 @@ +package net.pitan76.mcpitanlib.api.text; + +import net.minecraft.text.TextColor; +import net.minecraft.util.Formatting; + +public class CompatTextColor { + private final TextColor textColor; + + public static final CompatTextColor BLACK = of(TextColor.fromFormatting(Formatting.BLACK)); + public static final CompatTextColor DARK_BLUE = of(TextColor.fromFormatting(Formatting.DARK_BLUE)); + public static final CompatTextColor DARK_GREEN = of(TextColor.fromFormatting(Formatting.DARK_GREEN)); + public static final CompatTextColor DARK_AQUA = of(TextColor.fromFormatting(Formatting.DARK_AQUA)); + public static final CompatTextColor DARK_RED = of(TextColor.fromFormatting(Formatting.DARK_RED)); + public static final CompatTextColor DARK_PURPLE = of(TextColor.fromFormatting(Formatting.DARK_PURPLE)); + public static final CompatTextColor GOLD = of(TextColor.fromFormatting(Formatting.GOLD)); + public static final CompatTextColor GRAY = of(TextColor.fromFormatting(Formatting.GRAY)); + public static final CompatTextColor DARK_GRAY = of(TextColor.fromFormatting(Formatting.DARK_GRAY)); + public static final CompatTextColor BLUE = of(TextColor.fromFormatting(Formatting.BLUE)); + public static final CompatTextColor GREEN = of(TextColor.fromFormatting(Formatting.GREEN)); + public static final CompatTextColor AQUA = of(TextColor.fromFormatting(Formatting.AQUA)); + public static final CompatTextColor RED = of(TextColor.fromFormatting(Formatting.RED)); + public static final CompatTextColor LIGHT_PURPLE = of(TextColor.fromFormatting(Formatting.LIGHT_PURPLE)); + public static final CompatTextColor YELLOW = of(TextColor.fromFormatting(Formatting.YELLOW)); + public static final CompatTextColor WHITE = of(TextColor.fromFormatting(Formatting.WHITE)); + + public CompatTextColor(TextColor textColor) { + this.textColor = textColor; + } + + public TextColor getRaw() { + return textColor; + } + + public static CompatTextColor of(TextColor textColor) { + return new CompatTextColor(textColor); + } + + public static CompatTextColor fromFormatting(Formatting formatting) { + return new CompatTextColor(TextColor.fromFormatting(formatting)); + } + + public static CompatTextColor fromFormatting(CompatFormatting formatting) { + return fromFormatting(formatting.getRaw()); + } + + public static CompatTextColor fromRgb(int rgb) { + return new CompatTextColor(TextColor.fromRgb(rgb)); + } + + public static CompatTextColor fromRgb(int r, int g, int b) { + int rgb = (r << 16) | (g << 8) | b; + return fromRgb(rgb); + } + + public static CompatTextColor parse(String string) { + try { + return parseOrThrow(string); + } catch (Exception e) { + return null; + } + } + + public static CompatTextColor parseOrThrow(String string) { + return new CompatTextColor(TextColor.parse(string).getOrThrow()); + } + + @Override + public int hashCode() { + return textColor.hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + CompatTextColor other = (CompatTextColor) obj; + return textColor.equals(other.textColor); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java index 758c55653..08ee2e869 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/text/TextComponent.java @@ -62,6 +62,14 @@ public static TextComponent translatable(String key, Object... args) { return new TextComponent(TextUtil.translatable(key, args)); } + public static TextComponent empty() { + return new TextComponent(TextUtil.empty()); + } + + public static TextComponent format(String format, Object... args) { + return literal(String.format(format, args)); + } + @Override public String toString() { return getString(); @@ -90,6 +98,18 @@ public TextComponent setStyle(Style style) { return this; } + public TextComponent setStyle(CompatStyle style) { + return setStyle(style.getRaw()); + } + + public CompatStyle getCompatStyle() { + return CompatStyle.of(getStyle()); + } + + public boolean contains(TextComponent other) { + return TextUtil.contains(getText(), other.getText()); + } + /** * Convert string to TextComponent with formatting * @param text String diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java index ee960c580..388da58de 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/TextUtil.java @@ -65,4 +65,8 @@ public static MutableText convert(String text) { public static MutableText convertWithTranslatable(String text) { return TextConverter.convert(text, true); } + + public static boolean contains(Text text, Text text1) { + return text.contains(text1); + } } \ No newline at end of file From 2e19507cfc4648fd87e8e16ae3e63696f801b9cf Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Mar 2026 00:22:52 +0900 Subject: [PATCH 609/622] [cp] docs: update README to include cross-version and cross-platform support details --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/README.md b/README.md index ca3eaecdb..98a622d0e 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,19 @@ MCPitanLibはライブラリです。 1つのjarで複数のMCバージョンを 開発中であるため、予告なく仕様が変更されることがあったり、不具合があるかもしれません。
私専用につくっているため、他の方が使うことをあまり想定していません。
+クロスバージョンかつクロスプラットフォームを目指しています。 + +### 対応状況 +- アイテムの追加 +- ブロックの追加 +- エンティティの追加 +- ブロックエンティティの追加 +- クリエイティブタブの追加 +- GUIの追加 +- サウンドの追加 + +となります。 + ### 前提MOD - MODローダー - [FabricMC](https://fabricmc.net/) @@ -54,6 +67,17 @@ MCPitanLib is a library. It is for supporting multiple MC versions with one jar. It is under development, so the specification may change without notice, and there may be bugs.
I am creating it for my own use, so I don't expect others to use it much.
+It aims to be cross-version and cross-platform. + +### Supported features +- Adding items +- Adding blocks +- Adding entities +- Adding block entities +- Adding creative tabs +- Adding GUIs +- Adding sounds + ### Required MOD - MOD Loader - [FabricMC](https://fabricmc.net/) From 496ba6ed76bbcb5ead08f382ae18012450c03327 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Sun, 22 Mar 2026 00:24:22 +0900 Subject: [PATCH 610/622] [cp] chore: bump version 3.4.9 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index e3bbd3ddc..e5b2bf5ff 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.8 +mod_version=3.4.9 maven_group=net.pitan76 changelog=Add Compat APIs From 6878b484aa66e83db61d7a54513ec1c08c61783b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 01:36:10 +0900 Subject: [PATCH 611/622] [cp] feat: add CompatParticleType and CompatParticleTypes for enhanced particle handling --- .../api/tile/CompatBlockEntity.java | 29 +++++ .../mcpitanlib/api/util/WorldUtil.java | 8 ++ .../api/util/particle/CompatParticleType.java | 34 +++++ .../util/particle/CompatParticleTypes.java | 121 ++++++++++++++++++ 4 files changed, 192 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleType.java create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java index 2b75f82b8..60b7fac3a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/tile/CompatBlockEntity.java @@ -150,4 +150,33 @@ public ServerWorld getServerWorld() { return BlockEntityUtil.getServerWorld(this); } + public void callMarkDirty() { + BlockEntityUtil.markDirty(this); + } + + @Deprecated + @Override + public void markRemoved() { + markRemovedOverride(); + } + + public void markRemovedOverride() { + super.markRemoved(); + } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(callGetWorld()); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(callGetPos()); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraBlockState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(callGetBlockState()); + } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraCachedState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(callGetCachedState()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java index bb903e3d2..d324f023f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/WorldUtil.java @@ -30,6 +30,7 @@ import net.pitan76.mcpitanlib.api.sound.CompatSoundEvent; import net.pitan76.mcpitanlib.api.util.math.BoxUtil; import net.pitan76.mcpitanlib.api.util.math.random.CompatRandom; +import net.pitan76.mcpitanlib.api.util.particle.CompatParticleType; import net.pitan76.mcpitanlib.midohra.block.BlockWrapper; import net.pitan76.mcpitanlib.midohra.entity.EntityTypeWrapper; import net.pitan76.mcpitanlib.midohra.util.math.Vector3d; @@ -466,4 +467,11 @@ public static List getEntitiesByType(World world, EntityTypeWrapper filter, n return getEntitiesByType(world, filter, box.toMinecraft(), predicate); } + /** + * ParticleType is a ParticleEffect only. + */ + public static void addParticle(World world, CompatParticleType parameters, double x, double y, double z, double velocityX, double velocityY, double velocityZ) { + if (parameters.getRaw() instanceof ParticleEffect) + addParticle(world, (ParticleEffect) parameters.getRaw(), x, y, z, velocityX, velocityY, velocityZ); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleType.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleType.java new file mode 100644 index 000000000..758900a07 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleType.java @@ -0,0 +1,34 @@ +package net.pitan76.mcpitanlib.api.util.particle; + +import net.minecraft.particle.ParticleType; +import net.minecraft.registry.Registries; +import net.minecraft.util.Identifier; +import net.pitan76.mcpitanlib.api.util.CompatIdentifier; + +public class CompatParticleType { + private final ParticleType particleType; + + public CompatParticleType(ParticleType particleType) { + this.particleType = particleType; + } + + public static CompatParticleType of(ParticleType particleType) { + return new CompatParticleType(particleType); + } + + public ParticleType getRaw() { + return particleType; + } + + public boolean shouldAlwaysSpawn() { + return particleType.shouldAlwaysSpawn(); + } + + public Identifier getId() { + return Registries.PARTICLE_TYPE.getId(particleType); + } + + public CompatIdentifier getCompatId() { + return CompatIdentifier.fromMinecraft(getId()); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java new file mode 100644 index 000000000..5562d9bda --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java @@ -0,0 +1,121 @@ +package net.pitan76.mcpitanlib.api.util.particle; + +import net.minecraft.particle.*; + +public class CompatParticleTypes { + public static final CompatParticleType ANGRY_VILLAGER = new CompatParticleType(ParticleTypes.ANGRY_VILLAGER); + public static final CompatParticleType BLOCK = new CompatParticleType(ParticleTypes.BLOCK); + public static final CompatParticleType BLOCK_MARKER = new CompatParticleType(ParticleTypes.BLOCK_MARKER); + public static final CompatParticleType BUBBLE = new CompatParticleType(ParticleTypes.BUBBLE); + public static final CompatParticleType CLOUD = new CompatParticleType(ParticleTypes.CLOUD); + public static final CompatParticleType COPPER_FIRE_FLAME = new CompatParticleType(ParticleTypes.COPPER_FIRE_FLAME); + public static final CompatParticleType CRIT = new CompatParticleType(ParticleTypes.CRIT); + public static final CompatParticleType DAMAGE_INDICATOR = new CompatParticleType(ParticleTypes.DAMAGE_INDICATOR); + public static final CompatParticleType DRAGON_BREATH = new CompatParticleType(ParticleTypes.DRAGON_BREATH); + public static final CompatParticleType DRIPPING_LAVA = new CompatParticleType(ParticleTypes.DRIPPING_LAVA); + public static final CompatParticleType FALLING_LAVA = new CompatParticleType(ParticleTypes.FALLING_LAVA); + public static final CompatParticleType LANDING_LAVA = new CompatParticleType(ParticleTypes.LANDING_LAVA); + public static final CompatParticleType DRIPPING_WATER = new CompatParticleType(ParticleTypes.DRIPPING_WATER); + public static final CompatParticleType FALLING_WATER = new CompatParticleType(ParticleTypes.FALLING_WATER); + public static final CompatParticleType DUST = new CompatParticleType(ParticleTypes.DUST); + public static final CompatParticleType DUST_COLOR_TRANSITION = new CompatParticleType(ParticleTypes.DUST_COLOR_TRANSITION); + public static final CompatParticleType EFFECT = new CompatParticleType(ParticleTypes.EFFECT); + public static final CompatParticleType ELDER_GUARDIAN = new CompatParticleType(ParticleTypes.ELDER_GUARDIAN); + public static final CompatParticleType ENCHANTED_HIT = new CompatParticleType(ParticleTypes.ENCHANTED_HIT); + public static final CompatParticleType ENCHANT = new CompatParticleType(ParticleTypes.ENCHANT); + public static final CompatParticleType END_ROD = new CompatParticleType(ParticleTypes.END_ROD); + public static final CompatParticleType ENTITY_EFFECT = new CompatParticleType(ParticleTypes.ENTITY_EFFECT); + public static final CompatParticleType EXPLOSION_EMITTER = new CompatParticleType(ParticleTypes.EXPLOSION_EMITTER); + public static final CompatParticleType EXPLOSION = new CompatParticleType(ParticleTypes.EXPLOSION); + public static final CompatParticleType GUST = new CompatParticleType(ParticleTypes.GUST); + public static final CompatParticleType SMALL_GUST = new CompatParticleType(ParticleTypes.SMALL_GUST); + public static final CompatParticleType GUST_EMITTER_LARGE = new CompatParticleType(ParticleTypes.GUST_EMITTER_LARGE); + public static final CompatParticleType GUST_EMITTER_SMALL = new CompatParticleType(ParticleTypes.GUST_EMITTER_SMALL); + public static final CompatParticleType SONIC_BOOM = new CompatParticleType(ParticleTypes.SONIC_BOOM); + public static final CompatParticleType FALLING_DUST = new CompatParticleType(ParticleTypes.FALLING_DUST); + public static final CompatParticleType FIREWORK = new CompatParticleType(ParticleTypes.FIREWORK); + public static final CompatParticleType FISHING = new CompatParticleType(ParticleTypes.FISHING); + public static final CompatParticleType FLAME = new CompatParticleType(ParticleTypes.FLAME); + public static final CompatParticleType INFESTED = new CompatParticleType(ParticleTypes.INFESTED); + public static final CompatParticleType CHERRY_LEAVES = new CompatParticleType(ParticleTypes.CHERRY_LEAVES); + public static final CompatParticleType PALE_OAK_LEAVES = new CompatParticleType(ParticleTypes.PALE_OAK_LEAVES); + public static final CompatParticleType TINTED_LEAVES = new CompatParticleType(ParticleTypes.TINTED_LEAVES); + public static final CompatParticleType SCULK_SOUL = new CompatParticleType(ParticleTypes.SCULK_SOUL); + public static final CompatParticleType SCULK_CHARGE = new CompatParticleType(ParticleTypes.SCULK_CHARGE); + public static final CompatParticleType SCULK_CHARGE_POP = new CompatParticleType(ParticleTypes.SCULK_CHARGE_POP); + public static final CompatParticleType SOUL_FIRE_FLAME = new CompatParticleType(ParticleTypes.SOUL_FIRE_FLAME); + public static final CompatParticleType SOUL = new CompatParticleType(ParticleTypes.SOUL); + public static final CompatParticleType FLASH = new CompatParticleType(ParticleTypes.FLASH); + public static final CompatParticleType HAPPY_VILLAGER = new CompatParticleType(ParticleTypes.HAPPY_VILLAGER); + public static final CompatParticleType COMPOSTER = new CompatParticleType(ParticleTypes.COMPOSTER); + public static final CompatParticleType HEART = new CompatParticleType(ParticleTypes.HEART); + public static final CompatParticleType INSTANT_EFFECT = new CompatParticleType(ParticleTypes.INSTANT_EFFECT); + public static final CompatParticleType ITEM = new CompatParticleType(ParticleTypes.ITEM); + public static final CompatParticleType VIBRATION = new CompatParticleType(ParticleTypes.VIBRATION); + public static final CompatParticleType TRAIL = new CompatParticleType(ParticleTypes.TRAIL); + public static final CompatParticleType ITEM_SLIME = new CompatParticleType(ParticleTypes.ITEM_SLIME); + public static final CompatParticleType ITEM_COBWEB = new CompatParticleType(ParticleTypes.ITEM_COBWEB); + public static final CompatParticleType ITEM_SNOWBALL = new CompatParticleType(ParticleTypes.ITEM_SNOWBALL); + public static final CompatParticleType LARGE_SMOKE = new CompatParticleType(ParticleTypes.LARGE_SMOKE); + public static final CompatParticleType LAVA = new CompatParticleType(ParticleTypes.LAVA); + public static final CompatParticleType MYCELIUM = new CompatParticleType(ParticleTypes.MYCELIUM); + public static final CompatParticleType NOTE = new CompatParticleType(ParticleTypes.NOTE); + public static final CompatParticleType POOF = new CompatParticleType(ParticleTypes.POOF); + public static final CompatParticleType PORTAL = new CompatParticleType(ParticleTypes.PORTAL); + public static final CompatParticleType RAIN = new CompatParticleType(ParticleTypes.RAIN); + public static final CompatParticleType SMOKE = new CompatParticleType(ParticleTypes.SMOKE); + public static final CompatParticleType WHITE_SMOKE = new CompatParticleType(ParticleTypes.WHITE_SMOKE); + public static final CompatParticleType SNEEZE = new CompatParticleType(ParticleTypes.SNEEZE); + public static final CompatParticleType SPIT = new CompatParticleType(ParticleTypes.SPIT); + public static final CompatParticleType SQUID_INK = new CompatParticleType(ParticleTypes.SQUID_INK); + public static final CompatParticleType SWEEP_ATTACK = new CompatParticleType(ParticleTypes.SWEEP_ATTACK); + public static final CompatParticleType TOTEM_OF_UNDYING = new CompatParticleType(ParticleTypes.TOTEM_OF_UNDYING); + public static final CompatParticleType UNDERWATER = new CompatParticleType(ParticleTypes.UNDERWATER); + public static final CompatParticleType SPLASH = new CompatParticleType(ParticleTypes.SPLASH); + public static final CompatParticleType WITCH = new CompatParticleType(ParticleTypes.WITCH); + public static final CompatParticleType BUBBLE_POP = new CompatParticleType(ParticleTypes.BUBBLE_POP); + public static final CompatParticleType CURRENT_DOWN = new CompatParticleType(ParticleTypes.CURRENT_DOWN); + public static final CompatParticleType BUBBLE_COLUMN_UP = new CompatParticleType(ParticleTypes.BUBBLE_COLUMN_UP); + public static final CompatParticleType NAUTILUS = new CompatParticleType(ParticleTypes.NAUTILUS); + public static final CompatParticleType DOLPHIN = new CompatParticleType(ParticleTypes.DOLPHIN); + public static final CompatParticleType CAMPFIRE_COSY_SMOKE = new CompatParticleType(ParticleTypes.CAMPFIRE_COSY_SMOKE); + public static final CompatParticleType CAMPFIRE_SIGNAL_SMOKE = new CompatParticleType(ParticleTypes.CAMPFIRE_SIGNAL_SMOKE); + public static final CompatParticleType DRIPPING_HONEY = new CompatParticleType(ParticleTypes.DRIPPING_HONEY); + public static final CompatParticleType FALLING_HONEY = new CompatParticleType(ParticleTypes.FALLING_HONEY); + public static final CompatParticleType LANDING_HONEY = new CompatParticleType(ParticleTypes.LANDING_HONEY); + public static final CompatParticleType FALLING_NECTAR = new CompatParticleType(ParticleTypes.FALLING_NECTAR); + public static final CompatParticleType FALLING_SPORE_BLOSSOM = new CompatParticleType(ParticleTypes.FALLING_SPORE_BLOSSOM); + public static final CompatParticleType ASH = new CompatParticleType(ParticleTypes.ASH); + public static final CompatParticleType CRIMSON_SPORE = new CompatParticleType(ParticleTypes.CRIMSON_SPORE); + public static final CompatParticleType WARPED_SPORE = new CompatParticleType(ParticleTypes.WARPED_SPORE); + public static final CompatParticleType SPORE_BLOSSOM_AIR = new CompatParticleType(ParticleTypes.SPORE_BLOSSOM_AIR); + public static final CompatParticleType DRIPPING_OBSIDIAN_TEAR = new CompatParticleType(ParticleTypes.DRIPPING_OBSIDIAN_TEAR); + public static final CompatParticleType FALLING_OBSIDIAN_TEAR = new CompatParticleType(ParticleTypes.FALLING_OBSIDIAN_TEAR); + public static final CompatParticleType LANDING_OBSIDIAN_TEAR = new CompatParticleType(ParticleTypes.LANDING_OBSIDIAN_TEAR); + public static final CompatParticleType REVERSE_PORTAL = new CompatParticleType(ParticleTypes.REVERSE_PORTAL); + public static final CompatParticleType WHITE_ASH = new CompatParticleType(ParticleTypes.WHITE_ASH); + public static final CompatParticleType SMALL_FLAME = new CompatParticleType(ParticleTypes.SMALL_FLAME); + public static final CompatParticleType SNOWFLAKE = new CompatParticleType(ParticleTypes.SNOWFLAKE); + public static final CompatParticleType DRIPPING_DRIPSTONE_LAVA = new CompatParticleType(ParticleTypes.DRIPPING_DRIPSTONE_LAVA); + public static final CompatParticleType FALLING_DRIPSTONE_LAVA = new CompatParticleType(ParticleTypes.FALLING_DRIPSTONE_LAVA); + public static final CompatParticleType DRIPPING_DRIPSTONE_WATER = new CompatParticleType(ParticleTypes.DRIPPING_DRIPSTONE_WATER); + public static final CompatParticleType FALLING_DRIPSTONE_WATER = new CompatParticleType(ParticleTypes.FALLING_DRIPSTONE_WATER); + public static final CompatParticleType GLOW_SQUID_INK = new CompatParticleType(ParticleTypes.GLOW_SQUID_INK); + public static final CompatParticleType GLOW = new CompatParticleType(ParticleTypes.GLOW); + public static final CompatParticleType WAX_ON = new CompatParticleType(ParticleTypes.WAX_ON); + public static final CompatParticleType WAX_OFF = new CompatParticleType(ParticleTypes.WAX_OFF); + public static final CompatParticleType ELECTRIC_SPARK = new CompatParticleType(ParticleTypes.ELECTRIC_SPARK); + public static final CompatParticleType SCRAPE = new CompatParticleType(ParticleTypes.SCRAPE); + public static final CompatParticleType SHRIEK = new CompatParticleType(ParticleTypes.SHRIEK); + public static final CompatParticleType EGG_CRACK = new CompatParticleType(ParticleTypes.EGG_CRACK); + public static final CompatParticleType DUST_PLUME = new CompatParticleType(ParticleTypes.DUST_PLUME); + public static final CompatParticleType TRIAL_SPAWNER_DETECTION = new CompatParticleType(ParticleTypes.TRIAL_SPAWNER_DETECTION); + public static final CompatParticleType TRIAL_SPAWNER_DETECTION_OMINOUS = new CompatParticleType(ParticleTypes.TRIAL_SPAWNER_DETECTION_OMINOUS); + public static final CompatParticleType VAULT_CONNECTION = new CompatParticleType(ParticleTypes.VAULT_CONNECTION); + public static final CompatParticleType DUST_PILLAR = new CompatParticleType(ParticleTypes.DUST_PILLAR); + public static final CompatParticleType OMINOUS_SPAWNING = new CompatParticleType(ParticleTypes.OMINOUS_SPAWNING); + public static final CompatParticleType RAID_OMEN = new CompatParticleType(ParticleTypes.RAID_OMEN); + public static final CompatParticleType TRIAL_OMEN = new CompatParticleType(ParticleTypes.TRIAL_OMEN); + public static final CompatParticleType BLOCK_CRUMBLE = new CompatParticleType(ParticleTypes.BLOCK_CRUMBLE); + public static final CompatParticleType FIREFLY = new CompatParticleType(ParticleTypes.FIREFLY); +} From bdb6241dc543638befe762d0c8fef22bff3f22fa Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 03:07:00 +0900 Subject: [PATCH 612/622] [cp] feat: add utility methods for BlockEntity and BlockPos iteration --- .../mcpitanlib/api/util/BlockEntityUtil.java | 4 +++ .../mcpitanlib/api/util/world/TickerUtil.java | 6 +++- .../midohra/util/math/BlockPos.java | 33 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java index f86662c5c..59d344fb2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockEntityUtil.java @@ -100,4 +100,8 @@ public static void writeToStack(ItemStack stack, BlockEntity blockEntity, Compat stack.applyComponentsFrom(blockEntity.createComponentMap()); } + + public static boolean isRemoved(BlockEntity blockEntity) { + return blockEntity.isRemoved(); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java index 9b1a31163..eebe3f823 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/world/TickerUtil.java @@ -10,7 +10,7 @@ public class TickerUtil { public static void tick(T blockEntity, World world, BlockPos pos, BlockState state) { - if (blockEntity instanceof BlockEntityTicker) + if (isTicker(blockEntity)) ((BlockEntityTicker) blockEntity).tick(world, pos, state, blockEntity); } @@ -25,4 +25,8 @@ public static void tick(T blockEntity) { public static void tick(T entity) { entity.tick(); } + + public static boolean isTicker(BlockEntity blockEntity) { + return blockEntity instanceof BlockEntityTicker; + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java index 73d9bf7d2..fe07631fe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/util/math/BlockPos.java @@ -2,6 +2,8 @@ import net.minecraft.util.math.Vec3i; +import java.util.Iterator; + public class BlockPos { private final net.minecraft.util.math.BlockPos blockPos; @@ -101,4 +103,35 @@ public boolean equals(Object obj) { BlockPos pos = (BlockPos) obj; return blockPos.equals(pos.blockPos); } + + public static Iterator iterate(BlockPos start, BlockPos end) { + return new Iterator() { + private final net.minecraft.util.math.BlockPos startRaw = start.toMinecraft(); + private final net.minecraft.util.math.BlockPos endRaw = end.toMinecraft(); + private int x = startRaw.getX(); + private int y = startRaw.getY(); + private int z = startRaw.getZ(); + + @Override + public boolean hasNext() { + return x <= endRaw.getX() && y <= endRaw.getY() && z <= endRaw.getZ(); + } + + @Override + public BlockPos next() { + BlockPos current = new BlockPos(new net.minecraft.util.math.BlockPos(x, y, z)); + if (x < endRaw.getX()) { + x++; + } else if (y < endRaw.getY()) { + x = startRaw.getX(); + y++; + } else if (z < endRaw.getZ()) { + x = startRaw.getX(); + y = startRaw.getY(); + z++; + } + return current; + } + }; + } } \ No newline at end of file From ea5e49ab6971bff1b452203bedb7b6c37eac1901 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 13:38:03 +0900 Subject: [PATCH 613/622] [cp] feat: add utility methods for BlockState manipulation in IProperty and DirectionBoolPropertyUtil --- .../mcpitanlib/api/state/property/IProperty.java | 16 ++++++++++++++++ .../api/util/DirectionBoolPropertyUtil.java | 10 ++++++++++ 2 files changed, 26 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java index 549d2708e..2274a41e3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/state/property/IProperty.java @@ -30,4 +30,20 @@ default String getName() { } Property getProperty(); + + default net.pitan76.mcpitanlib.midohra.block.BlockState with(net.pitan76.mcpitanlib.midohra.block.BlockState state, T value) { + return state.with(getProperty(), value); + } + + default T get(net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return state.get(getProperty()); + } + + default boolean contains(net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return state.contains(getProperty()); + } + + default net.pitan76.mcpitanlib.midohra.block.BlockState cycle(net.pitan76.mcpitanlib.midohra.block.BlockState state) { + return state.cycle(getProperty()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java index efad0af51..13d9ad550 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/DirectionBoolPropertyUtil.java @@ -55,4 +55,14 @@ public static void addProperties(AppendPropertiesArgs args) { args.addProperty(CompatProperties.UP, CompatProperties.DOWN, CompatProperties.NORTH, CompatProperties.EAST, CompatProperties.SOUTH, CompatProperties.WEST); } + + public static BlockState withAll(BlockState state, boolean value) { + return state + .with(CompatProperties.UP, value) + .with(CompatProperties.DOWN, value) + .with(CompatProperties.NORTH, value) + .with(CompatProperties.EAST, value) + .with(CompatProperties.SOUTH, value) + .with(CompatProperties.WEST, value); + } } From 29bdacbe00d089aba3c247538cbea04c009358f7 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 13:52:19 +0900 Subject: [PATCH 614/622] [cp] feat: implement hashCode and equals methods for various wrapper classes and add utility methods for BlockState --- .../api/event/block/FluidStateArgs.java | 4 ++++ .../mcpitanlib/midohra/block/BlockState.java | 21 +++++++++++++++++++ .../midohra/block/BlockWrapper.java | 13 ++++++++++++ .../midohra/client/render/CameraWrapper.java | 18 +++++++++++----- .../midohra/entity/EntityTypeWrapper.java | 13 ++++++++++++ .../mcpitanlib/midohra/world/WorldView.java | 13 ++++++++++++ 6 files changed, 77 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java index 12482458a..9bcda6872 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/event/block/FluidStateArgs.java @@ -12,4 +12,8 @@ public FluidStateArgs(BlockState state) { public BlockState getState() { return state; } + + public net.pitan76.mcpitanlib.midohra.block.BlockState getMidohraState() { + return net.pitan76.mcpitanlib.midohra.block.BlockState.of(state); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java index 8cce5880f..b2f6a36ff 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java @@ -104,4 +104,25 @@ public > boolean contains(IProperty property) { public boolean contains(DirectionProperty property) { return contains(property.getProperty()); } + + @Override + public int hashCode() { + return toMinecraft().hashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + BlockState state = (BlockState) obj; + return toMinecraft().equals(state.toMinecraft()); + } + + public boolean isOpaque() { + return BlockStateUtil.isOpaque(toMinecraft()); + } + + public boolean hasRandomTicks() { + return BlockStateUtil.hasRandomTicks(toMinecraft()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java index fa1618e11..9b0a7b54a 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockWrapper.java @@ -90,4 +90,17 @@ public BlockState getDefaultState() { public boolean rawEquals(BlockWrapper block) { return get() == block.get(); } + + @Override + public int hashCode() { + return get() != null ? get().hashCode() : 0; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + BlockWrapper other = (BlockWrapper) obj; + return rawEquals(other); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java index e605609e1..f6203ec42 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/client/render/CameraWrapper.java @@ -4,6 +4,8 @@ import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; import net.pitan76.mcpitanlib.midohra.util.math.Vector3d; +import java.util.Objects; + public class CameraWrapper { private final Camera camera; @@ -55,10 +57,16 @@ public float getPitch() { return camera.getPitch(); } + @Override + public int hashCode() { + return camera != null ? camera.hashCode() : 0; + } - - - - - + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + CameraWrapper other = (CameraWrapper) obj; + return Objects.equals(camera, other.camera); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java index bf90199bb..af0d640c8 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/entity/EntityTypeWrapper.java @@ -53,4 +53,17 @@ public String getTranslationKey() { public boolean rawEquals(EntityTypeWrapper other) { return entityType == other.entityType; } + + @Override + public int hashCode() { + return get() != null ? get().hashCode() : 0; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + EntityTypeWrapper other = (EntityTypeWrapper) obj; + return rawEquals(other); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java index bd78fec9e..dc836d089 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/world/WorldView.java @@ -71,4 +71,17 @@ public FluidState getFluidState(net.minecraft.util.math.BlockPos pos) { public net.minecraft.world.RedstoneView getRedstoneView() { return getRaw(); } + + @Override + public int hashCode() { + return getRaw() != null ? getRaw().hashCode() : 0; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null || getClass() != obj.getClass()) return false; + WorldView other = (WorldView) obj; + return getRaw() != null ? getRaw().equals(other.getRaw()) : other.getRaw() == null; + } } From 95fccf3ac7d92b65b4d212c0c21dc3d7584ea83b Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 14:04:39 +0900 Subject: [PATCH 615/622] [cp] feat: add canPlaceAt method and CanPlaceAtArgs class for block placement validation --- .../api/block/args/v2/CanPlaceAtArgs.java | 54 +++++++++++++++++++ .../mcpitanlib/api/block/v2/CompatBlock.java | 10 ++++ .../mcpitanlib/api/util/BlockStateUtil.java | 8 +++ .../mcpitanlib/midohra/block/BlockState.java | 6 +++ 4 files changed, 78 insertions(+) create mode 100644 common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CanPlaceAtArgs.java diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CanPlaceAtArgs.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CanPlaceAtArgs.java new file mode 100644 index 000000000..c111c0aa3 --- /dev/null +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/args/v2/CanPlaceAtArgs.java @@ -0,0 +1,54 @@ +package net.pitan76.mcpitanlib.api.block.args.v2; + +import net.pitan76.mcpitanlib.api.event.BaseEvent; +import net.pitan76.mcpitanlib.midohra.block.BlockState; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.WorldView; + +public class CanPlaceAtArgs extends BaseEvent { + public final net.minecraft.block.BlockState state; + public final net.minecraft.world.WorldView world; + public final net.minecraft.util.math.BlockPos pos; + + public CanPlaceAtArgs(net.minecraft.block.BlockState state, net.minecraft.world.WorldView world, net.minecraft.util.math.BlockPos pos) { + this.state = state; + this.world = world; + this.pos = pos; + } + + public CanPlaceAtArgs(BlockState state, WorldView world, BlockPos pos) { + this(state.toMinecraft(), world.toMinecraft(), pos.toMinecraft()); + } + + public net.minecraft.block.BlockState getState() { + return state; + } + + public net.minecraft.world.WorldView getWorld() { + return world; + } + + public net.minecraft.util.math.BlockPos getPos() { + return pos; + } + + public BlockState getMidohraState() { + return BlockState.of(state); + } + + public WorldView getMidohraWorld() { + return WorldView.of(world); + } + + public BlockPos getMidohraPos() { + return BlockPos.of(pos); + } + + public boolean isClient() { + return world.isClient(); + } + + public boolean isServer() { + return !world.isClient(); + } +} diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index aa9d10fef..213e8751f 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -163,4 +163,14 @@ public int getComparatorOutput(BlockState state, World world, BlockPos pos) { public int getComparatorOutput(GetComparatorOutputArgs args) { return super.getComparatorOutput(args.state, args.world, args.pos); } + + @Deprecated + @Override + protected boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { + return canPlaceAt(new CanPlaceAtArgs(state, world, pos)); + } + + public boolean canPlaceAt(CanPlaceAtArgs args) { + return super.canPlaceAt(args.state, args.world, args.pos); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java index 79284f399..b49fd782c 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/BlockStateUtil.java @@ -143,4 +143,12 @@ public static int getOpacity(net.pitan76.mcpitanlib.midohra.block.BlockState sta public static int getComparatorOutput(net.pitan76.mcpitanlib.midohra.block.BlockState state, net.pitan76.mcpitanlib.midohra.world.World world, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos) { return getComparatorOutput(state.toMinecraft(), world.getRaw(), pos.toMinecraft()); } + + public static boolean canPlaceAt(BlockState state, BlockPos pos, World world) { + return state.canPlaceAt(world, pos); + } + + public static boolean canPlaceAt(net.pitan76.mcpitanlib.midohra.block.BlockState state, net.pitan76.mcpitanlib.midohra.util.math.BlockPos pos, net.pitan76.mcpitanlib.midohra.world.World world) { + return canPlaceAt(state.toMinecraft(), pos.toMinecraft(), world.getRaw()); + } } diff --git a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java index b2f6a36ff..7d6d9d0f3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/midohra/block/BlockState.java @@ -5,6 +5,8 @@ import net.pitan76.mcpitanlib.api.state.property.DirectionProperty; import net.pitan76.mcpitanlib.api.state.property.IProperty; import net.pitan76.mcpitanlib.api.util.BlockStateUtil; +import net.pitan76.mcpitanlib.midohra.util.math.BlockPos; +import net.pitan76.mcpitanlib.midohra.world.World; public class BlockState { private final net.minecraft.block.BlockState state; @@ -125,4 +127,8 @@ public boolean isOpaque() { public boolean hasRandomTicks() { return BlockStateUtil.hasRandomTicks(toMinecraft()); } + + public boolean canPlaceAt(BlockPos pos, World world) { + return BlockStateUtil.canPlaceAt(this, pos, world); + } } From 55a834096c8bb65dde922fb8396862cf97c7872a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 14:05:19 +0900 Subject: [PATCH 616/622] [cp] chore: bump version 3.5.0 --- info.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/info.properties b/info.properties index e5b2bf5ff..d6856a9aa 100644 --- a/info.properties +++ b/info.properties @@ -1,4 +1,4 @@ archives_base_name=mcpitanlib -mod_version=3.4.9 +mod_version=3.5.0 maven_group=net.pitan76 changelog=Add Compat APIs From 719f0f64cd8dab6abcbeb08ea5821141918af88a Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 13:34:50 +0900 Subject: [PATCH 617/622] [cp] feat: add methods for Midohra world and position handling in CompatEntity and PosUtil --- .../mcpitanlib/api/entity/CompatEntity.java | 17 +++++++++++++++++ .../mcpitanlib/api/util/math/PosUtil.java | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java index f1b0126b5..f78178be2 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/entity/CompatEntity.java @@ -13,6 +13,7 @@ import net.pitan76.mcpitanlib.api.event.entity.InitDataTrackerArgs; import net.pitan76.mcpitanlib.api.event.nbt.ReadNbtArgs; import net.pitan76.mcpitanlib.api.event.nbt.WriteNbtArgs; +import net.pitan76.mcpitanlib.midohra.util.math.Vector3d; public class CompatEntity extends Entity { public CompatEntity(EntityType type, World world) { @@ -99,4 +100,20 @@ public boolean hasServerWorld() { public ServerWorld getServerWorld() { return (ServerWorld) getWorld(); } + + public net.pitan76.mcpitanlib.midohra.world.World getMidohraWorld() { + return net.pitan76.mcpitanlib.midohra.world.World.of(callGetWorld()); + } + + public net.pitan76.mcpitanlib.midohra.util.math.BlockPos getMidohraBlockPos() { + return net.pitan76.mcpitanlib.midohra.util.math.BlockPos.of(callGetBlockPos()); + } + + public Vector3d getMidohraPos() { + return Vector3d.of(callGetPos()); + } + + public net.pitan76.mcpitanlib.midohra.world.ServerWorld getMidohraServerWorld() { + return net.pitan76.mcpitanlib.midohra.world.ServerWorld.of(getServerWorld()); + } } \ No newline at end of file diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java index b5ab899fa..2ed72acda 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/math/PosUtil.java @@ -105,4 +105,8 @@ public static BlockPos offset(BlockPos pos, net.pitan76.mcpitanlib.midohra.util. public static BlockPos offset(BlockPos pos, net.pitan76.mcpitanlib.midohra.util.math.Direction direction, int n) { return pos.offset(direction.toMinecraft(), n); } + + public static BlockPos toImmutable(BlockPos pos) { + return pos.toImmutable(); + } } From 034f633914a0b44a8067fa2b16bb06e2a356f107 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 14:15:27 +0900 Subject: [PATCH 618/622] [cp] fix: update COPPER_FIRE_FLAME particle type to use FLAME type --- .../mcpitanlib/api/util/particle/CompatParticleTypes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java index 5562d9bda..f1bb122a9 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java @@ -8,7 +8,7 @@ public class CompatParticleTypes { public static final CompatParticleType BLOCK_MARKER = new CompatParticleType(ParticleTypes.BLOCK_MARKER); public static final CompatParticleType BUBBLE = new CompatParticleType(ParticleTypes.BUBBLE); public static final CompatParticleType CLOUD = new CompatParticleType(ParticleTypes.CLOUD); - public static final CompatParticleType COPPER_FIRE_FLAME = new CompatParticleType(ParticleTypes.COPPER_FIRE_FLAME); + public static final CompatParticleType COPPER_FIRE_FLAME = new CompatParticleType(ParticleTypes.FLAME); public static final CompatParticleType CRIT = new CompatParticleType(ParticleTypes.CRIT); public static final CompatParticleType DAMAGE_INDICATOR = new CompatParticleType(ParticleTypes.DAMAGE_INDICATOR); public static final CompatParticleType DRAGON_BREATH = new CompatParticleType(ParticleTypes.DRAGON_BREATH); From cc5909d084328cd5e52a56f2ffb8c0867a4927b0 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 14:30:40 +0900 Subject: [PATCH 619/622] [cp] fix: update TINTED_LEAVES and FIREFLY particle types to use PALE_OAK_LEAVES and NOTE types respectively --- .../mcpitanlib/api/util/particle/CompatParticleTypes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java index f1bb122a9..5a6767daa 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java @@ -39,7 +39,7 @@ public class CompatParticleTypes { public static final CompatParticleType INFESTED = new CompatParticleType(ParticleTypes.INFESTED); public static final CompatParticleType CHERRY_LEAVES = new CompatParticleType(ParticleTypes.CHERRY_LEAVES); public static final CompatParticleType PALE_OAK_LEAVES = new CompatParticleType(ParticleTypes.PALE_OAK_LEAVES); - public static final CompatParticleType TINTED_LEAVES = new CompatParticleType(ParticleTypes.TINTED_LEAVES); + public static final CompatParticleType TINTED_LEAVES = new CompatParticleType(ParticleTypes.PALE_OAK_LEAVES); public static final CompatParticleType SCULK_SOUL = new CompatParticleType(ParticleTypes.SCULK_SOUL); public static final CompatParticleType SCULK_CHARGE = new CompatParticleType(ParticleTypes.SCULK_CHARGE); public static final CompatParticleType SCULK_CHARGE_POP = new CompatParticleType(ParticleTypes.SCULK_CHARGE_POP); @@ -117,5 +117,5 @@ public class CompatParticleTypes { public static final CompatParticleType RAID_OMEN = new CompatParticleType(ParticleTypes.RAID_OMEN); public static final CompatParticleType TRIAL_OMEN = new CompatParticleType(ParticleTypes.TRIAL_OMEN); public static final CompatParticleType BLOCK_CRUMBLE = new CompatParticleType(ParticleTypes.BLOCK_CRUMBLE); - public static final CompatParticleType FIREFLY = new CompatParticleType(ParticleTypes.FIREFLY); + public static final CompatParticleType FIREFLY = new CompatParticleType(ParticleTypes.NOTE); } From 35828432e22e16a5b7c62667a2c14a132f853076 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 14:33:05 +0900 Subject: [PATCH 620/622] [cp] fix: update PALE_OAK_LEAVES and TINTED_LEAVES particle types to use BLOCK type --- .../mcpitanlib/api/util/particle/CompatParticleTypes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java index 5a6767daa..d0b25a5fe 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java @@ -38,8 +38,8 @@ public class CompatParticleTypes { public static final CompatParticleType FLAME = new CompatParticleType(ParticleTypes.FLAME); public static final CompatParticleType INFESTED = new CompatParticleType(ParticleTypes.INFESTED); public static final CompatParticleType CHERRY_LEAVES = new CompatParticleType(ParticleTypes.CHERRY_LEAVES); - public static final CompatParticleType PALE_OAK_LEAVES = new CompatParticleType(ParticleTypes.PALE_OAK_LEAVES); - public static final CompatParticleType TINTED_LEAVES = new CompatParticleType(ParticleTypes.PALE_OAK_LEAVES); + public static final CompatParticleType PALE_OAK_LEAVES = new CompatParticleType(ParticleTypes.BLOCK); + public static final CompatParticleType TINTED_LEAVES = new CompatParticleType(ParticleTypes.BLOCK); public static final CompatParticleType SCULK_SOUL = new CompatParticleType(ParticleTypes.SCULK_SOUL); public static final CompatParticleType SCULK_CHARGE = new CompatParticleType(ParticleTypes.SCULK_CHARGE); public static final CompatParticleType SCULK_CHARGE_POP = new CompatParticleType(ParticleTypes.SCULK_CHARGE_POP); From 59d3648be6c3712adf0b749132175673bec61992 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 14:35:09 +0900 Subject: [PATCH 621/622] [cp] fix: add import for WorldView in CompatBlock.java --- .../java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java index 213e8751f..ffbf00cc3 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/block/v2/CompatBlock.java @@ -11,6 +11,7 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; import net.pitan76.mcpitanlib.api.block.CompatBlockRenderType; import net.pitan76.mcpitanlib.api.block.ExtendBlock; import net.pitan76.mcpitanlib.api.block.args.RenderTypeArgs; From 8d096ea33ab0eab8b41da8294f9dd0f03c26b4f6 Mon Sep 17 00:00:00 2001 From: PTOM76 Date: Mon, 23 Mar 2026 14:35:58 +0900 Subject: [PATCH 622/622] [cp] fix CompatParticleTypes1211 --- .../mcpitanlib/api/util/particle/CompatParticleTypes.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java index d0b25a5fe..e19059ab7 100644 --- a/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java +++ b/common/src/main/java/net/pitan76/mcpitanlib/api/util/particle/CompatParticleTypes.java @@ -52,7 +52,7 @@ public class CompatParticleTypes { public static final CompatParticleType INSTANT_EFFECT = new CompatParticleType(ParticleTypes.INSTANT_EFFECT); public static final CompatParticleType ITEM = new CompatParticleType(ParticleTypes.ITEM); public static final CompatParticleType VIBRATION = new CompatParticleType(ParticleTypes.VIBRATION); - public static final CompatParticleType TRAIL = new CompatParticleType(ParticleTypes.TRAIL); + public static final CompatParticleType TRAIL = new CompatParticleType(ParticleTypes.EFFECT); public static final CompatParticleType ITEM_SLIME = new CompatParticleType(ParticleTypes.ITEM_SLIME); public static final CompatParticleType ITEM_COBWEB = new CompatParticleType(ParticleTypes.ITEM_COBWEB); public static final CompatParticleType ITEM_SNOWBALL = new CompatParticleType(ParticleTypes.ITEM_SNOWBALL); @@ -116,6 +116,6 @@ public class CompatParticleTypes { public static final CompatParticleType OMINOUS_SPAWNING = new CompatParticleType(ParticleTypes.OMINOUS_SPAWNING); public static final CompatParticleType RAID_OMEN = new CompatParticleType(ParticleTypes.RAID_OMEN); public static final CompatParticleType TRIAL_OMEN = new CompatParticleType(ParticleTypes.TRIAL_OMEN); - public static final CompatParticleType BLOCK_CRUMBLE = new CompatParticleType(ParticleTypes.BLOCK_CRUMBLE); + public static final CompatParticleType BLOCK_CRUMBLE = new CompatParticleType(ParticleTypes.BLOCK); public static final CompatParticleType FIREFLY = new CompatParticleType(ParticleTypes.NOTE); }