mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
--------- Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> Co-authored-by: Fortern <blueten.ki@gmail.com> Co-authored-by: MC_XiaoHei <xor7xiaohei@gmail.com> Co-authored-by: Helvetica Volubi <88063803+Suisuroru@users.noreply.github.com> Co-authored-by: MC_XiaoHei <xiaohei.xor7@outlook.com>
112 lines
7.1 KiB
Diff
112 lines
7.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Mon, 3 Feb 2025 13:33:19 +0800
|
|
Subject: [PATCH] Jade Protocol
|
|
|
|
This patch is Powered by Jade(https://github.com/Snownee/Jade)
|
|
|
|
diff --git a/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
|
|
index b72e07ad954efa7f26f876a59f428086b40d9bb2..102746fc84ca9c8899db971fc1490060ea016b7e 100644
|
|
--- a/net/minecraft/world/entity/animal/armadillo/Armadillo.java
|
|
+++ b/net/minecraft/world/entity/animal/armadillo/Armadillo.java
|
|
@@ -62,7 +62,7 @@ public class Armadillo extends Animal {
|
|
public final AnimationState rollOutAnimationState = new AnimationState();
|
|
public final AnimationState rollUpAnimationState = new AnimationState();
|
|
public final AnimationState peekAnimationState = new AnimationState();
|
|
- private int scuteTime;
|
|
+ public int scuteTime; // Leaves - private -> public
|
|
private boolean peekReceivedClient = false;
|
|
|
|
public Armadillo(EntityType<? extends Animal> entityType, Level level) {
|
|
diff --git a/net/minecraft/world/entity/animal/frog/Tadpole.java b/net/minecraft/world/entity/animal/frog/Tadpole.java
|
|
index ebdfd3fb6c0de48982d392bb2aa415f3676c6056..9d5acb2559143358b1258cbb674191bdddb331e3 100644
|
|
--- a/net/minecraft/world/entity/animal/frog/Tadpole.java
|
|
+++ b/net/minecraft/world/entity/animal/frog/Tadpole.java
|
|
@@ -252,7 +252,7 @@ public class Tadpole extends AbstractFish {
|
|
}
|
|
}
|
|
|
|
- private int getTicksLeftUntilAdult() {
|
|
+ public int getTicksLeftUntilAdult() { // Leaves - private -> public
|
|
return Math.max(0, ticksToBeFrog - this.age);
|
|
}
|
|
|
|
diff --git a/net/minecraft/world/level/storage/loot/LootPool.java b/net/minecraft/world/level/storage/loot/LootPool.java
|
|
index 29ad43245a310756c4227acd7532e905f7f8b8ee..ad422817593449b8e914628b51d760e732e2d50c 100644
|
|
--- a/net/minecraft/world/level/storage/loot/LootPool.java
|
|
+++ b/net/minecraft/world/level/storage/loot/LootPool.java
|
|
@@ -36,7 +36,7 @@ public class LootPool {
|
|
)
|
|
.apply(instance, LootPool::new)
|
|
);
|
|
- private final List<LootPoolEntryContainer> entries;
|
|
+ public final List<LootPoolEntryContainer> entries; // Leaves - private -> public
|
|
private final List<LootItemCondition> conditions;
|
|
private final Predicate<LootContext> compositeCondition;
|
|
private final List<LootItemFunction> functions;
|
|
diff --git a/net/minecraft/world/level/storage/loot/LootTable.java b/net/minecraft/world/level/storage/loot/LootTable.java
|
|
index 7a8eb1e8b07647e1124594f78652d34731e4fda6..6cfe7ef8c81f506bce9c971b597cc4e902bcabbe 100644
|
|
--- a/net/minecraft/world/level/storage/loot/LootTable.java
|
|
+++ b/net/minecraft/world/level/storage/loot/LootTable.java
|
|
@@ -49,7 +49,7 @@ public class LootTable {
|
|
public static final LootTable EMPTY = new LootTable(LootContextParamSets.EMPTY, Optional.empty(), List.of(), List.of());
|
|
private final ContextKeySet paramSet;
|
|
private final Optional<ResourceLocation> randomSequence;
|
|
- private final List<LootPool> pools;
|
|
+ public final List<LootPool> pools; // Leaves - private -> public
|
|
private final List<LootItemFunction> functions;
|
|
private final BiFunction<ItemStack, LootContext, ItemStack> compositeFunction;
|
|
public org.bukkit.craftbukkit.CraftLootTable craftLootTable; // CraftBukkit
|
|
diff --git a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
|
|
index 8e91ddc6c0e492d165ad8322b4a3d5c3bad5409c..6e420bfb3c223b094157bdfec7dad20d8eab4968 100644
|
|
--- a/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
|
|
+++ b/net/minecraft/world/level/storage/loot/entries/CompositeEntryBase.java
|
|
@@ -9,7 +9,7 @@ import net.minecraft.world.level.storage.loot.ValidationContext;
|
|
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
|
|
|
|
public abstract class CompositeEntryBase extends LootPoolEntryContainer {
|
|
- protected final List<LootPoolEntryContainer> children;
|
|
+ public final List<LootPoolEntryContainer> children; // Leaves - private -> public
|
|
private final ComposableEntryContainer composedChildren;
|
|
|
|
protected CompositeEntryBase(List<LootPoolEntryContainer> children, List<LootItemCondition> conditions) {
|
|
diff --git a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
|
|
index e0e933245e038b7229eeddbda272b081161ab603..c5e3834fa970ac909cefea43420378394153d781 100644
|
|
--- a/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
|
|
+++ b/net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer.java
|
|
@@ -13,7 +13,7 @@ import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder;
|
|
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
|
|
|
|
public abstract class LootPoolEntryContainer implements ComposableEntryContainer {
|
|
- protected final List<LootItemCondition> conditions;
|
|
+ public final List<LootItemCondition> conditions; // Leaves - private -> public
|
|
private final Predicate<LootContext> compositeCondition;
|
|
|
|
protected LootPoolEntryContainer(List<LootItemCondition> conditions) {
|
|
diff --git a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
|
|
index f7b647e81ca99040bae8161a2bc0dcacf5bd537f..069df530b1db72bd4a2b1b80b2570dca545dfd20 100644
|
|
--- a/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
|
|
+++ b/net/minecraft/world/level/storage/loot/entries/NestedLootTable.java
|
|
@@ -22,7 +22,7 @@ public class NestedLootTable extends LootPoolSingletonContainer {
|
|
.and(singletonFields(instance))
|
|
.apply(instance, NestedLootTable::new)
|
|
);
|
|
- private final Either<ResourceKey<LootTable>, LootTable> contents;
|
|
+ public final Either<ResourceKey<LootTable>, LootTable> contents; // Leaves - private -> public
|
|
|
|
private NestedLootTable(
|
|
Either<ResourceKey<LootTable>, LootTable> contents, int weight, int quality, List<LootItemCondition> conditions, List<LootItemFunction> functions
|
|
diff --git a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
|
|
index 7134c54984a12949cd6a2e8dc35c2e1c0431e524..52f36fbb9bfcad81004e531efab85e9b87d3284d 100644
|
|
--- a/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
|
|
+++ b/net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition.java
|
|
@@ -11,7 +11,7 @@ import net.minecraft.world.level.storage.loot.LootContext;
|
|
import net.minecraft.world.level.storage.loot.ValidationContext;
|
|
|
|
public abstract class CompositeLootItemCondition implements LootItemCondition {
|
|
- protected final List<LootItemCondition> terms;
|
|
+ public final List<LootItemCondition> terms; // Leaves - private -> public
|
|
private final Predicate<LootContext> composedPredicate;
|
|
|
|
protected CompositeLootItemCondition(List<LootItemCondition> terms, Predicate<LootContext> composedPredicate) {
|