FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-08 21:14:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

1.20-pre6

Browse source
This commit is contained in:
modmuss50 2023-05-25 14:26:11 +01:00
parent 488c3cd2d8
commit df34a27454
3 changed files with 8 additions and 7 deletions
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient
IngredientMixin.java
fabric-transitive-access-wideners-v1/src/main/resources
fabric-transitive-access-wideners-v1.accesswidener
gradle.properties

4
fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/ingredient/IngredientMixin.java
View file

@ -41,7 +41,7 @@ public class IngredientMixin implements FabricIngredient {
@Inject(
at = @At(
value = "INVOKE",
target = "net/minecraft/recipe/Ingredient.entryFromJson (Lcom/google/gson/JsonObject;Z)Lnet/minecraft/recipe/Ingredient$Entry;",
target = "net/minecraft/recipe/Ingredient.entryFromJson(Lcom/google/gson/JsonObject;)Lnet/minecraft/recipe/Ingredient$Entry;",
ordinal = 0
),
method = "fromJson(Lcom/google/gson/JsonElement;Z)Lnet/minecraft/recipe/Ingredient;",
@ -67,7 +67,7 @@ public class IngredientMixin implements FabricIngredient {
* The {@link AnyIngredient} should be used instead.
*/
@Inject(at = @At("HEAD"), method = "entryFromJson")
private static void injectEntryFromJson(JsonObject obj, boolean returnNullOnEmpty, CallbackInfoReturnable<?> cir) {
private static void injectEntryFromJson(JsonObject obj, CallbackInfoReturnable<?> cir) {
if (obj.has(CustomIngredientImpl.TYPE_KEY)) {
throw new IllegalArgumentException("Custom ingredient cannot be used inside an array ingredient. You can replace the array by a fabric:any ingredient.");
}

1
fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener
View file

@ -225,6 +225,7 @@ transitive-accessible method net/minecraft/block/WallRedstoneTorchBlock <init> (
transitive-accessible method net/minecraft/block/WallSkullBlock <init> (Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/WallTorchBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/particle/ParticleEffect;)V
transitive-accessible method net/minecraft/block/WallWitherSkullBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/WearableCarvedPumpkinBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/WeightedPressurePlateBlock <init> (ILnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/BlockSetType;)V
transitive-accessible method net/minecraft/block/WetSpongeBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V
transitive-accessible method net/minecraft/block/WitherSkullBlock <init> (Lnet/minecraft/block/AbstractBlock$Settings;)V

10
gradle.properties
View file

@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true
version=0.82.0
minecraft_version=1.20-pre5
version=0.82.1
minecraft_version=1.20-pre6
yarn_version=+build.1
loader_version=0.14.19
installer_version=0.11.1
@ -22,7 +22,7 @@ fabric-commands-v0-version=0.2.48
fabric-containers-v0-version=0.1.60
fabric-content-registries-v0-version=4.0.6
fabric-crash-report-info-v1-version=0.2.17
fabric-data-generation-api-v1-version=12.1.8
fabric-data-generation-api-v1-version=12.1.9
fabric-dimensions-v1-version=2.1.50
fabric-entity-events-v1-version=1.5.20
fabric-events-interaction-v0-version=0.5.2
@ -43,7 +43,7 @@ fabric-networking-api-v1-version=1.3.7
fabric-networking-v0-version=0.3.47
fabric-object-builder-api-v1-version=11.0.5
fabric-particles-v1-version=1.0.27
fabric-recipe-api-v1-version=1.0.16
fabric-recipe-api-v1-version=1.0.17
fabric-registry-sync-v0-version=2.2.5
fabric-renderer-api-v1-version=3.0.0
fabric-renderer-indigo-version=1.3.0
@ -58,6 +58,6 @@ fabric-screen-api-v1-version=2.0.5
fabric-screen-handler-api-v1-version=1.3.26
fabric-sound-api-v1-version=1.0.11
fabric-transfer-api-v1-version=3.2.1
fabric-transitive-access-wideners-v1-version=4.1.1
fabric-transitive-access-wideners-v1-version=4.1.2
fabric-convention-tags-v1-version=1.5.2
fabric-client-tags-api-v1-version=1.0.19