This commit is contained in:
modmuss50 2023-03-29 16:07:13 +01:00
parent b09c81ea46
commit 848ffaabb4
6 changed files with 6 additions and 45 deletions
fabric-data-generation-api-v1/src/main/resources
fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric
api/object/builder/v1/block
mixin/object/builder
fabric-transitive-access-wideners-v1
gradle.properties

View file

@ -147,7 +147,7 @@ transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createBooleanModelMap (Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateVariantMap;
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerMirrorable (Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRotatable (Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerSuspiciousSand (Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerBrushableBlock (Lnet/minecraft/block/Block;)V
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createButtonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator fillDoorVariantMap (Lnet/minecraft/data/client/BlockStateVariantMap$QuadrupleProperty;Lnet/minecraft/block/enums/DoubleBlockHalf;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateVariantMap$QuadrupleProperty;
transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createDoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier;

View file

@ -18,7 +18,6 @@ package net.fabricmc.fabric.api.object.builder.v1.block;
import net.minecraft.block.MapColor;
import net.minecraft.block.Material;
import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.util.DyeColor;
import net.fabricmc.fabric.mixin.object.builder.MaterialBuilderAccessor;
@ -32,34 +31,11 @@ public class FabricMaterialBuilder extends Material.Builder {
this(color.getMapColor());
}
@Override
public FabricMaterialBuilder burnable() {
super.burnable();
return this;
}
public FabricMaterialBuilder pistonBehavior(PistonBehavior behavior) {
((MaterialBuilderAccessor) this).setPistonBehavior(behavior);
return this;
}
public FabricMaterialBuilder lightPassesThrough() {
((MaterialBuilderAccessor) this).invokeLightPassesThrough();
return this;
}
@Override
public FabricMaterialBuilder destroyedByPiston() {
super.destroyedByPiston();
return this;
}
@Override
public FabricMaterialBuilder blocksPistons() {
super.blocksPistons();
return this;
}
@Override
public FabricMaterialBuilder allowsMovement() {
super.allowsMovement();

View file

@ -17,17 +17,12 @@
package net.fabricmc.fabric.mixin.object.builder;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker;
import net.minecraft.block.Material;
import net.minecraft.block.piston.PistonBehavior;
@Mixin(Material.Builder.class)
public interface MaterialBuilderAccessor {
@Accessor
void setPistonBehavior(PistonBehavior behavior);
@Invoker
Material.Builder invokeLightPassesThrough();
}

View file

@ -43,11 +43,6 @@ transitive-accessible class net/minecraft/village/TradeOffers$SellDyedArmorFacto
# Registering custom entity spawn restrictions
transitive-accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V
# Creating custom block materials
transitive-accessible method net/minecraft/block/Material$Builder burnable ()Lnet/minecraft/block/Material$Builder;
transitive-accessible method net/minecraft/block/Material$Builder destroyedByPiston ()Lnet/minecraft/block/Material$Builder;
transitive-accessible method net/minecraft/block/Material$Builder blocksPistons ()Lnet/minecraft/block/Material$Builder;
# Item usage context constructors
transitive-accessible method net/minecraft/item/ItemUsageContext <init> (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V
transitive-accessible method net/minecraft/item/ItemPlacementContext <init> (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V

View file

@ -38,11 +38,6 @@ transitive-accessible class net/minecraft/village/TradeOffers$SellDyedArmorFacto
# Registering custom entity spawn restrictions
transitive-accessible method net/minecraft/entity/SpawnRestriction register (Lnet/minecraft/entity/EntityType;Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/Heightmap$Type;Lnet/minecraft/entity/SpawnRestriction$SpawnPredicate;)V
# Creating custom block materials
transitive-accessible method net/minecraft/block/Material$Builder burnable ()Lnet/minecraft/block/Material$Builder;
transitive-accessible method net/minecraft/block/Material$Builder destroyedByPiston ()Lnet/minecraft/block/Material$Builder;
transitive-accessible method net/minecraft/block/Material$Builder blocksPistons ()Lnet/minecraft/block/Material$Builder;
# Item usage context constructors
transitive-accessible method net/minecraft/item/ItemUsageContext <init> (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V
transitive-accessible method net/minecraft/item/ItemPlacementContext <init> (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V

View file

@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true
version=0.76.1
minecraft_version=23w12a
version=0.76.2
minecraft_version=23w13a
yarn_version=+build.1
loader_version=0.14.18
installer_version=0.11.1
@ -22,7 +22,7 @@ fabric-commands-v0-version=0.2.42
fabric-containers-v0-version=0.1.52
fabric-content-registries-v0-version=3.5.7
fabric-crash-report-info-v1-version=0.2.14
fabric-data-generation-api-v1-version=11.3.6
fabric-data-generation-api-v1-version=11.3.7
fabric-dimensions-v1-version=2.1.44
fabric-entity-events-v1-version=1.5.12
fabric-events-interaction-v0-version=0.4.42
@ -41,7 +41,7 @@ fabric-mining-level-api-v1-version=2.1.37
fabric-models-v0-version=0.3.29
fabric-networking-api-v1-version=1.2.22
fabric-networking-v0-version=0.3.39
fabric-object-builder-api-v1-version=7.0.2
fabric-object-builder-api-v1-version=8.0.0
fabric-particles-v1-version=1.0.22
fabric-recipe-api-v1-version=1.0.6
fabric-registry-sync-v0-version=2.1.2
@ -58,6 +58,6 @@ fabric-screen-api-v1-version=1.0.44
fabric-screen-handler-api-v1-version=1.3.18
fabric-sound-api-v1-version=1.0.8
fabric-transfer-api-v1-version=3.0.1
fabric-transitive-access-wideners-v1-version=3.0.2
fabric-transitive-access-wideners-v1-version=4.0.0
fabric-convention-tags-v1-version=1.4.0
fabric-client-tags-api-v1-version=1.0.14