mirror of
https://github.com/FabricMC/fabric.git
synced 2024-11-21 10:48:18 -05:00
24w14potato
This commit is contained in:
modmuss50
parent
e78eae2df0
commit
cda3b7dd45
18 changed files with 163 additions and 82 deletions
|
|
@ -4,7 +4,7 @@ plugins {
|
|||
id "idea"
|
||||
id "maven-publish"
|
||||
id 'jacoco'
|
||||
id "fabric-loom" version "1.5.4" apply false
|
||||
id "fabric-loom" version "1.5.8" apply false
|
||||
id "com.diffplug.spotless" version "6.20.0"
|
||||
id "org.ajoberstar.grgit" version "3.1.0"
|
||||
id "me.modmuss50.remotesign" version "0.4.0" apply false
|
||||
|
|
@ -361,7 +361,7 @@ remapTestmodJar {
|
|||
|
||||
// Apply auxiliary buildscripts to submodules
|
||||
// This must be done after all plugins are applied to subprojects
|
||||
apply from: "gradle/module-validation.gradle"
|
||||
//apply from: "gradle/module-validation.gradle"
|
||||
apply from: "gradle/module-versioning.gradle"
|
||||
|
||||
loom {
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@
|
|||
"minecraft:lake_lava_surface"
|
||||
],
|
||||
[
|
||||
"minecraft:amethyst_geode"
|
||||
"minecraft:amethyst_geode",
|
||||
"minecraft:potato_geode"
|
||||
],
|
||||
[
|
||||
"minecraft:monster_room",
|
||||
|
|
@ -49,6 +50,7 @@
|
|||
"minecraft:ore_iron_upper",
|
||||
"minecraft:ore_iron_middle",
|
||||
"minecraft:ore_iron_small",
|
||||
"minecraft:ore_poisonous_potato",
|
||||
"minecraft:ore_gold",
|
||||
"minecraft:ore_gold_lower",
|
||||
"minecraft:ore_redstone",
|
||||
|
|
@ -94,6 +96,12 @@
|
|||
"maxCount": 8,
|
||||
"minCount": 8,
|
||||
"weight": 10
|
||||
},
|
||||
{
|
||||
"type": "minecraft:batato",
|
||||
"maxCount": 16,
|
||||
"minCount": 8,
|
||||
"weight": 13
|
||||
}
|
||||
],
|
||||
"axolotls": [],
|
||||
|
|
@ -149,6 +157,12 @@
|
|||
"minCount": 4,
|
||||
"weight": 95
|
||||
},
|
||||
{
|
||||
"type": "minecraft:poisonous_potato_zombie",
|
||||
"maxCount": 4,
|
||||
"minCount": 1,
|
||||
"weight": 25
|
||||
},
|
||||
{
|
||||
"type": "minecraft:zombie_villager",
|
||||
"maxCount": 1,
|
||||
|
|
|
|||
|
|
@ -23,6 +23,12 @@
|
|||
"maxCount": 8,
|
||||
"minCount": 8,
|
||||
"weight": 10
|
||||
},
|
||||
{
|
||||
"type": "minecraft:batato",
|
||||
"maxCount": 16,
|
||||
"minCount": 8,
|
||||
"weight": 13
|
||||
}
|
||||
],
|
||||
"axolotls": [],
|
||||
|
|
@ -78,6 +84,12 @@
|
|||
"minCount": 4,
|
||||
"weight": 95
|
||||
},
|
||||
{
|
||||
"type": "minecraft:poisonous_potato_zombie",
|
||||
"maxCount": 4,
|
||||
"minCount": 1,
|
||||
"weight": 25
|
||||
},
|
||||
{
|
||||
"type": "minecraft:zombie_villager",
|
||||
"maxCount": 1,
|
||||
|
|
|
|||
|
|
@ -31,6 +31,12 @@
|
|||
"maxCount": 8,
|
||||
"minCount": 8,
|
||||
"weight": 10
|
||||
},
|
||||
{
|
||||
"type": "minecraft:batato",
|
||||
"maxCount": 16,
|
||||
"minCount": 8,
|
||||
"weight": 13
|
||||
}
|
||||
],
|
||||
"axolotls": [],
|
||||
|
|
@ -86,6 +92,12 @@
|
|||
"minCount": 4,
|
||||
"weight": 95
|
||||
},
|
||||
{
|
||||
"type": "minecraft:poisonous_potato_zombie",
|
||||
"maxCount": 4,
|
||||
"minCount": 1,
|
||||
"weight": 25
|
||||
},
|
||||
{
|
||||
"type": "minecraft:zombie_villager",
|
||||
"maxCount": 1,
|
||||
|
|
|
|||
|
|
@ -23,6 +23,12 @@
|
|||
"maxCount": 8,
|
||||
"minCount": 8,
|
||||
"weight": 10
|
||||
},
|
||||
{
|
||||
"type": "minecraft:batato",
|
||||
"maxCount": 16,
|
||||
"minCount": 8,
|
||||
"weight": 13
|
||||
}
|
||||
],
|
||||
"axolotls": [],
|
||||
|
|
@ -78,6 +84,12 @@
|
|||
"minCount": 4,
|
||||
"weight": 95
|
||||
},
|
||||
{
|
||||
"type": "minecraft:poisonous_potato_zombie",
|
||||
"maxCount": 4,
|
||||
"minCount": 1,
|
||||
"weight": 25
|
||||
},
|
||||
{
|
||||
"type": "minecraft:zombie_villager",
|
||||
"maxCount": 1,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"values": [
|
||||
"minecraft:potato_fruit",
|
||||
"minecraft:apple",
|
||||
"minecraft:mushroom_stew",
|
||||
"minecraft:bread",
|
||||
|
|
@ -7,6 +8,8 @@
|
|||
"minecraft:cooked_porkchop",
|
||||
"minecraft:golden_apple",
|
||||
"minecraft:enchanted_golden_apple",
|
||||
"minecraft:golden_poisonous_potato",
|
||||
"minecraft:enchanted_golden_poisonous_potato",
|
||||
"minecraft:cod",
|
||||
"minecraft:salmon",
|
||||
"minecraft:tropical_fish",
|
||||
|
|
@ -25,6 +28,11 @@
|
|||
"minecraft:carrot",
|
||||
"minecraft:potato",
|
||||
"minecraft:baked_potato",
|
||||
"minecraft:hot_potato",
|
||||
"minecraft:poisonous_potato_fries",
|
||||
"minecraft:poisonous_potato_sticks",
|
||||
"minecraft:poisonous_potato_slices",
|
||||
"minecraft:poisonous_potato_chips",
|
||||
"minecraft:poisonous_potato",
|
||||
"minecraft:golden_carrot",
|
||||
"minecraft:pumpkin_pie",
|
||||
|
|
@ -39,6 +47,8 @@
|
|||
"minecraft:suspicious_stew",
|
||||
"minecraft:sweet_berries",
|
||||
"minecraft:glow_berries",
|
||||
"minecraft:honey_bottle"
|
||||
"minecraft:honey_bottle",
|
||||
"minecraft:hash_browns",
|
||||
"minecraft:poisonous_potato_plant"
|
||||
]
|
||||
}
|
||||
|
|
@ -56,7 +56,7 @@ public class AttachmentCopyTests implements FabricGameTest {
|
|||
entity.setAttached(DUMMY, () -> 10);
|
||||
entity.setAttached(COPY_ON_DEATH, () -> 10);
|
||||
|
||||
Entity moved = entity.moveToWorld(end);
|
||||
Entity moved = entity.moveToWorld(end, false);
|
||||
if (moved == null) throw new GameTestException("Cross-world teleportation failed");
|
||||
|
||||
IntSupplier attached1 = moved.getAttached(DUMMY);
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@ transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider off
|
|||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerCompactingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerPlanksRecipe2 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/registry/tag/TagKey;I)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerPlanksRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/registry/tag/TagKey;I)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_59464 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;I)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerBarkBlockRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerBoatRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerChestBoatRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V
|
||||
|
|
@ -116,6 +117,10 @@ transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider off
|
|||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider createChiseledBlockRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/ShapedRecipeJsonBuilder;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerStonecuttingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerStonecuttingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;I)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_59465 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;I)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_59461 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemStack;F)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_59463 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;F)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_59462 (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;F)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerCrackingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerReversibleCompactingRecipes (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)V
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerReversibleCompactingRecipesWithCompactingRecipeGroup (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;)V
|
||||
|
|
@ -142,6 +147,8 @@ transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider get
|
|||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider convertBetween (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider getSmeltingItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider getBlastingItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_59459 (Lnet/minecraft/item/ItemStack;)Ljava/lang/String;
|
||||
transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider method_59460 (Lnet/minecraft/component/type/PotionContentsComponent;)Ljava/lang/String;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createStoneState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createMudBrickState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createDeepslateState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier;
|
||||
|
|
@ -217,37 +224,50 @@ transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator
|
|||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerGlassPane (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCommandBlock (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAnvil (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59456 (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getBambooBlockStateVariants (I)Ljava/util/List;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createUpDefaultFacingVariantMap ()Lnet/minecraft/data/client/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createValueFencedModelMap (Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateVariantMap;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerBeehive (Lnet/minecraft/block/Block;Ljava/util/function/Function;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCrop (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/Property;[I)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCooker (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TexturedModel$Factory;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCampfire ([Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCampfire (Lnet/minecraft/block/Block;[Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAzalea (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPottedAzaleaBush (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerMushroomBlock (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCubeWithCustomTextures (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Ljava/util/function/BiFunction;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59448 (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNorthDefaultHorizontalRotatable (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDispenserLikeOrientable (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerChorusPlant (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59457 (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCopperBulb (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59442 (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59454 (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59443 (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerWaxedCopperBulb (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAmethyst (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/data/client/BlockStateVariant;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNetherrackBottomCustomTop (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPointedDripstone (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/block/Block;Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/data/client/BlockStateVariant;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNetherrackBottomCustomTop (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDaylightDetector (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRod (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerFarmland (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getFireFloorModels (Lnet/minecraft/block/Block;)Ljava/util/List;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getFireSideModels (Lnet/minecraft/block/Block;)Ljava/util/List;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getFireUpModels (Lnet/minecraft/block/Block;)Ljava/util/List;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator buildBlockStateVariants (Ljava/util/List;Ljava/util/function/UnaryOperator;)Ljava/util/List;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerLantern (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTopSoil (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/BlockStateVariant;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDirtPath (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerWeightedPressurePlate (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerParented (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNorthDefaultHorizontalRotation (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59444 (Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPiston (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTorch (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_59455 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getTurtleEggModel (ILjava/lang/String;Lnet/minecraft/data/client/TextureMap;)Lnet/minecraft/util/Identifier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getTurtleEggModel (Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/util/Identifier;
|
||||
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerWallPlant (Lnet/minecraft/block/Block;)V
|
||||
|
|
@ -273,6 +293,7 @@ transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableG
|
|||
transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator slabDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
|
||||
transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithProperty (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;)Lnet/minecraft/loot/LootTable$Builder;
|
||||
transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator nameableContainerDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
|
||||
transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator method_59416 (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
|
||||
transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator shulkerBoxDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
|
||||
transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator copperOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
|
||||
transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator lapisOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder;
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ public final class FabricDimensionInternals {
|
|||
return teleported;
|
||||
}
|
||||
|
||||
return (E) teleported.moveToWorld(dimension);
|
||||
return (E) teleported.moveToWorld(dimension, false);
|
||||
} finally {
|
||||
((Teleportable) teleported).fabric_setCustomTeleportTarget(null);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public class EntityMixin implements Teleportable {
|
|||
}
|
||||
|
||||
@Inject(method = "getTeleportTarget", at = @At("HEAD"), cancellable = true, allow = 1)
|
||||
public void getTeleportTarget(ServerWorld destination, CallbackInfoReturnable<TeleportTarget> cir) {
|
||||
public void getTeleportTarget(ServerWorld destination, boolean bl, CallbackInfoReturnable<TeleportTarget> cir) {
|
||||
// Check if a destination has been set for the entity currently being teleported
|
||||
TeleportTarget customTarget = this.customTeleportTarget;
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ abstract class EntityMixin {
|
|||
public World world;
|
||||
|
||||
@Inject(method = "moveToWorld", at = @At("RETURN"))
|
||||
private void afterWorldChanged(ServerWorld destination, CallbackInfoReturnable<Entity> cir) {
|
||||
private void afterWorldChanged(ServerWorld destination, boolean bl, CallbackInfoReturnable<Entity> cir) {
|
||||
// Ret will only have an entity if the teleport worked (entity not removed, teleportTarget was valid, entity was successfully created)
|
||||
Entity ret = cir.getReturnValue();
|
||||
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ public interface FluidRenderHandler {
|
|||
* @param blockState The block state being rendered.
|
||||
* @param fluidState The fluid state being rendered.
|
||||
*/
|
||||
default void renderFluid(BlockPos pos, BlockRenderView world, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState) {
|
||||
FluidRenderingImpl.renderDefault(this, world, pos, vertexConsumer, blockState, fluidState);
|
||||
default void renderFluid(BlockPos pos, BlockRenderView world, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double x, double y, double z) {
|
||||
FluidRenderingImpl.renderDefault(this, world, pos, vertexConsumer, blockState, fluidState, x, y, z);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -45,8 +45,8 @@ public final class FluidRendering {
|
|||
* @param fluidState the fluid state
|
||||
* @param defaultRenderer the renderer to use whenever the handler requests default geometry
|
||||
*/
|
||||
public static void render(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, DefaultRenderer defaultRenderer) {
|
||||
FluidRenderingImpl.render(handler, world, pos, vertexConsumer, blockState, fluidState, defaultRenderer);
|
||||
public static void render(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double x, double y, double z, DefaultRenderer defaultRenderer) {
|
||||
FluidRenderingImpl.render(handler, world, pos, vertexConsumer, blockState, fluidState, z, y, z, defaultRenderer);
|
||||
}
|
||||
|
||||
public interface DefaultRenderer {
|
||||
|
|
@ -65,8 +65,8 @@ public final class FluidRendering {
|
|||
* @param blockState the block state
|
||||
* @param fluidState the fluid state
|
||||
*/
|
||||
default void render(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState) {
|
||||
FluidRenderingImpl.renderVanillaDefault(handler, world, pos, vertexConsumer, blockState, fluidState);
|
||||
default void render(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double d, double e, double f) {
|
||||
FluidRenderingImpl.renderVanillaDefault(handler, world, pos, vertexConsumer, blockState, fluidState, d, e, f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,35 +32,35 @@ public class FluidRenderingImpl {
|
|||
private static FluidRenderer vanillaRenderer;
|
||||
|
||||
// Only invoked manually from FluidRendering#render
|
||||
public static void render(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, FluidRendering.DefaultRenderer defaultRenderer) {
|
||||
public static void render(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double x, double y, double z, FluidRendering.DefaultRenderer defaultRenderer) {
|
||||
CURRENT_DEFAULT_RENDERER.set(defaultRenderer);
|
||||
|
||||
try {
|
||||
handler.renderFluid(pos, world, vertexConsumer, blockState, fluidState);
|
||||
handler.renderFluid(pos, world, vertexConsumer, blockState, fluidState, x, y, z);
|
||||
} finally {
|
||||
CURRENT_DEFAULT_RENDERER.remove();
|
||||
}
|
||||
}
|
||||
|
||||
// Only invoked when FluidRenderHandler#renderFluid calls super
|
||||
public static void renderDefault(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState) {
|
||||
public static void renderDefault(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double x, double y, double z) {
|
||||
FluidRendering.DefaultRenderer renderer = CURRENT_DEFAULT_RENDERER.get();
|
||||
|
||||
if (renderer != null) {
|
||||
renderer.render(handler, world, pos, vertexConsumer, blockState, fluidState);
|
||||
renderer.render(handler, world, pos, vertexConsumer, blockState, fluidState, x, y, z);
|
||||
} else {
|
||||
renderVanillaDefault(handler, world, pos, vertexConsumer, blockState, fluidState);
|
||||
renderVanillaDefault(handler, world, pos, vertexConsumer, blockState, fluidState, x, y, z);
|
||||
}
|
||||
}
|
||||
|
||||
// Invoked when FluidRenderHandler#renderFluid is called directly without using FluidRendering#render (such as
|
||||
// from vanilla FluidRenderer#render via mixin) or from the default implementation of DefaultRenderer#render
|
||||
public static void renderVanillaDefault(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState) {
|
||||
public static void renderVanillaDefault(FluidRenderHandler handler, BlockRenderView world, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double x, double y, double z) {
|
||||
FluidRenderHandlerInfo info = CURRENT_INFO.get();
|
||||
info.setup(handler, world, pos, fluidState);
|
||||
|
||||
try {
|
||||
vanillaRenderer.render(world, pos, vertexConsumer, blockState, fluidState);
|
||||
vanillaRenderer.render(world, pos, vertexConsumer, blockState, fluidState, x, y, z);
|
||||
} finally {
|
||||
info.clear();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,14 +61,14 @@ public class FluidRendererMixin {
|
|||
}
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "render", cancellable = true)
|
||||
public void onHeadRender(BlockRenderView view, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, CallbackInfo ci) {
|
||||
public void onHeadRender(BlockRenderView view, BlockPos pos, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double x, double y, double z, CallbackInfo ci) {
|
||||
FluidRenderHandlerInfo info = FluidRenderingImpl.getCurrentInfo();
|
||||
|
||||
if (info.handler == null) {
|
||||
FluidRenderHandler handler = FluidRenderHandlerRegistry.INSTANCE.get(fluidState.getFluid());
|
||||
|
||||
if (handler != null) {
|
||||
handler.renderFluid(pos, view, vertexConsumer, blockState, fluidState);
|
||||
handler.renderFluid(pos, view, vertexConsumer, blockState, fluidState, x, y, z);
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class CustomizedFluidRenderer extends SimpleFluidRenderHandler {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void renderFluid(BlockPos pos, BlockRenderView world, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState) {
|
||||
public void renderFluid(BlockPos pos, BlockRenderView world, VertexConsumer vertexConsumer, BlockState blockState, FluidState fluidState, double x, double y, double z) {
|
||||
int light = getLight(world, pos);
|
||||
float u1 = sprites[2].getFrameU(0);
|
||||
float v1 = sprites[2].getFrameV(0);
|
||||
|
|
|
|||
|
|
@ -2,62 +2,62 @@ org.gradle.jvmargs=-Xmx2560M
|
|||
org.gradle.parallel=true
|
||||
fabric.loom.multiProjectOptimisation=true
|
||||
|
||||
version=0.96.12
|
||||
minecraft_version=24w12a
|
||||
yarn_version=+build.5
|
||||
loader_version=0.15.6
|
||||
version=0.96.14
|
||||
minecraft_version=24w14potato
|
||||
yarn_version=+build.2
|
||||
loader_version=0.15.9
|
||||
installer_version=0.11.1
|
||||
|
||||
prerelease=true
|
||||
curseforge_minecraft_version=1.20.5-Snapshot
|
||||
|
||||
# Do not manually update, use the bumpversions task:
|
||||
fabric-api-base-version=0.4.38
|
||||
fabric-api-lookup-api-v1-version=1.6.56
|
||||
fabric-biome-api-v1-version=13.0.20
|
||||
fabric-block-api-v1-version=1.0.18
|
||||
fabric-block-view-api-v2-version=1.0.6
|
||||
fabric-blockrenderlayer-v1-version=1.1.48
|
||||
fabric-command-api-v1-version=1.2.43
|
||||
fabric-command-api-v2-version=2.2.22
|
||||
fabric-commands-v0-version=0.2.60
|
||||
fabric-content-registries-v0-version=6.0.14
|
||||
fabric-crash-report-info-v1-version=0.2.25
|
||||
fabric-data-attachment-api-v1-version=1.1.9
|
||||
fabric-data-generation-api-v1-version=18.0.0
|
||||
fabric-dimensions-v1-version=2.1.64
|
||||
fabric-entity-events-v1-version=1.6.6
|
||||
fabric-events-interaction-v0-version=0.7.4
|
||||
fabric-events-lifecycle-v0-version=0.2.84
|
||||
fabric-game-rule-api-v1-version=1.0.48
|
||||
fabric-gametest-api-v1-version=1.3.11
|
||||
fabric-item-api-v1-version=6.0.0
|
||||
fabric-item-group-api-v1-version=4.0.33
|
||||
fabric-key-binding-api-v1-version=1.0.43
|
||||
fabric-keybindings-v0-version=0.2.41
|
||||
fabric-lifecycle-events-v1-version=2.3.1
|
||||
fabric-loot-api-v2-version=2.1.13
|
||||
fabric-message-api-v1-version=6.0.8
|
||||
fabric-model-loading-api-v1-version=1.0.10
|
||||
fabric-models-v0-version=0.4.9
|
||||
fabric-networking-api-v1-version=4.0.5
|
||||
fabric-object-builder-api-v1-version=15.0.0
|
||||
fabric-particles-v1-version=2.0.0
|
||||
fabric-recipe-api-v1-version=4.1.1
|
||||
fabric-registry-sync-v0-version=5.0.10
|
||||
fabric-renderer-api-v1-version=3.2.9
|
||||
fabric-renderer-indigo-version=1.5.9
|
||||
fabric-renderer-registries-v1-version=3.2.58
|
||||
fabric-rendering-data-attachment-v1-version=0.3.44
|
||||
fabric-rendering-fluids-v1-version=3.1.1
|
||||
fabric-rendering-v0-version=1.1.61
|
||||
fabric-rendering-v1-version=4.2.1
|
||||
fabric-resource-conditions-api-v1-version=3.0.0
|
||||
fabric-resource-loader-v0-version=1.0.0
|
||||
fabric-screen-api-v1-version=2.0.19
|
||||
fabric-screen-handler-api-v1-version=1.3.67
|
||||
fabric-sound-api-v1-version=1.0.19
|
||||
fabric-transfer-api-v1-version=5.1.2
|
||||
fabric-transitive-access-wideners-v1-version=6.0.6
|
||||
fabric-convention-tags-v1-version=1.5.14
|
||||
fabric-client-tags-api-v1-version=1.1.9
|
||||
fabric-api-base-version=0.4.39
|
||||
fabric-api-lookup-api-v1-version=1.6.57
|
||||
fabric-biome-api-v1-version=13.0.21
|
||||
fabric-block-api-v1-version=1.0.19
|
||||
fabric-block-view-api-v2-version=1.0.7
|
||||
fabric-blockrenderlayer-v1-version=1.1.49
|
||||
fabric-command-api-v1-version=1.2.44
|
||||
fabric-command-api-v2-version=2.2.23
|
||||
fabric-commands-v0-version=0.2.61
|
||||
fabric-content-registries-v0-version=6.0.15
|
||||
fabric-crash-report-info-v1-version=0.2.26
|
||||
fabric-data-attachment-api-v1-version=1.1.10
|
||||
fabric-data-generation-api-v1-version=18.0.1
|
||||
fabric-dimensions-v1-version=2.1.65
|
||||
fabric-entity-events-v1-version=1.6.7
|
||||
fabric-events-interaction-v0-version=0.7.5
|
||||
fabric-events-lifecycle-v0-version=0.2.85
|
||||
fabric-game-rule-api-v1-version=1.0.49
|
||||
fabric-gametest-api-v1-version=1.3.12
|
||||
fabric-item-api-v1-version=6.0.1
|
||||
fabric-item-group-api-v1-version=4.0.34
|
||||
fabric-key-binding-api-v1-version=1.0.44
|
||||
fabric-keybindings-v0-version=0.2.42
|
||||
fabric-lifecycle-events-v1-version=2.3.2
|
||||
fabric-loot-api-v2-version=2.1.14
|
||||
fabric-message-api-v1-version=6.0.9
|
||||
fabric-model-loading-api-v1-version=1.0.11
|
||||
fabric-models-v0-version=0.4.10
|
||||
fabric-networking-api-v1-version=4.0.6
|
||||
fabric-object-builder-api-v1-version=15.0.1
|
||||
fabric-particles-v1-version=2.0.1
|
||||
fabric-recipe-api-v1-version=4.1.2
|
||||
fabric-registry-sync-v0-version=5.0.11
|
||||
fabric-renderer-api-v1-version=3.2.10
|
||||
fabric-renderer-indigo-version=1.5.10
|
||||
fabric-renderer-registries-v1-version=3.2.59
|
||||
fabric-rendering-data-attachment-v1-version=0.3.45
|
||||
fabric-rendering-fluids-v1-version=4.0.0
|
||||
fabric-rendering-v0-version=1.1.62
|
||||
fabric-rendering-v1-version=4.2.2
|
||||
fabric-resource-conditions-api-v1-version=3.0.1
|
||||
fabric-resource-loader-v0-version=1.0.1
|
||||
fabric-screen-api-v1-version=2.0.20
|
||||
fabric-screen-handler-api-v1-version=1.3.68
|
||||
fabric-sound-api-v1-version=1.0.20
|
||||
fabric-transfer-api-v1-version=5.1.3
|
||||
fabric-transitive-access-wideners-v1-version=6.0.7
|
||||
fabric-convention-tags-v1-version=1.5.15
|
||||
fabric-client-tags-api-v1-version=1.1.10
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@
|
|||
"FabricMC"
|
||||
],
|
||||
"depends": {
|
||||
"fabricloader": ">=0.15.6",
|
||||
"fabricloader": ">=0.15.9",
|
||||
"java": ">=17",
|
||||
"minecraft": ">=1.20.5- <1.20.6-"
|
||||
"minecraft": "1.20.5-alpha.24.12.potato"
|
||||
},
|
||||
"description": "Core API module providing key hooks and intercompatibility features."
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue