FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-05 19:47:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

1.15-pre2

Browse source
This commit is contained in:
modmuss50 2019-11-25 19:28:07 +00:00
parent 264dbbc635
commit e08a7305d5
9 changed files with 11 additions and 20 deletions
build.gradle
fabric-loot-tables-v1
build.gradle
src/main/java/net/fabricmc/fabric
api/loot/v1
FabricLootPoolBuilder.javaFabricLootSupplierBuilder.java
mixin/loot/table
MixinLootManager.java
fabric-networking-blockentity-v0
build.gradle
src/main/java/net/fabricmc/fabric/api/block/entity
BlockEntityClientSerializable.java
fabric-textures-v0
build.gradle
src/main/java/net/fabricmc/fabric/mixin/client/texture
MixinSpriteAtlasTexture.java

6
build.gradle
View file

@ -12,9 +12,9 @@ plugins {
def ENV = System.getenv()
class Globals {
static def baseVersion = "0.4.13"
static def mcVersion = "1.15-pre1"
static def yarnVersion = "+build.3"
static def baseVersion = "0.4.14"
static def mcVersion = "1.15-pre2"
static def yarnVersion = "+build.1"
}
import org.apache.commons.codec.digest.DigestUtils

2
fabric-loot-tables-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-loot-tables-v1"
version = getSubprojectVersion(project, "0.1.4")
version = getSubprojectVersion(project, "0.1.5")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

4
fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPoolBuilder.java
View file

@ -47,13 +47,13 @@ public class FabricLootPoolBuilder extends LootPool.Builder {
@Override
public FabricLootPoolBuilder withCondition(LootCondition.Builder condition) {
super.method_356(condition);
super.withCondition(condition);
return this;
}
@Override
public FabricLootPoolBuilder withFunction(LootFunction.Builder function) {
super.method_353(function);
super.withFunction(function);
return this;
}

2
fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplierBuilder.java
View file

@ -48,7 +48,7 @@ public class FabricLootSupplierBuilder extends LootTable.Builder {
@Override
public FabricLootSupplierBuilder withFunction(LootFunction.Builder function) {
super.method_335(function);
super.withFunction(function);
return this;
}

2
fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootManager.java
View file

@ -40,7 +40,7 @@ import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
public class MixinLootManager {
@Shadow private Map<Identifier, LootTable> suppliers;
@Inject(method = "method_20712", at = @At("RETURN"))
@Inject(method = "apply", at = @At("RETURN"))
private void apply(Map<Identifier, JsonObject> objectMap, ResourceManager manager, Profiler profiler, CallbackInfo info) {
Map<Identifier, LootTable> newSuppliers = new HashMap<>();

2
fabric-networking-blockentity-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-networking-blockentity-v0"
version = getSubprojectVersion(project, "0.2.2")
version = getSubprojectVersion(project, "0.2.3")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

2
fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/api/block/entity/BlockEntityClientSerializable.java
View file

@ -47,6 +47,6 @@ public interface BlockEntityClientSerializable {
Preconditions.checkNotNull(world); //Maintain distinct failure case from below
if (!(world instanceof ServerWorld)) throw new IllegalStateException("Cannot call sync() on the logical client! Did you check world.isClient first?");
((ServerWorld) world).method_14178().markForUpdate(((BlockEntity) this).getPos());
((ServerWorld) world).getChunkManager().markForUpdate(((BlockEntity) this).getPos());
}
}

2
fabric-textures-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-textures-v0"
version = getSubprojectVersion(project, "1.0.1")
version = getSubprojectVersion(project, "1.0.2")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

9
fabric-textures-v0/src/main/java/net/fabricmc/fabric/mixin/client/texture/MixinSpriteAtlasTexture.java
View file

@ -48,19 +48,10 @@ import net.fabricmc.fabric.impl.client.texture.SpriteRegistryCallbackHolder;
@Mixin(SpriteAtlasTexture.class)
public abstract class MixinSpriteAtlasTexture {
@Unique
private static Logger FABRIC_LOGGER = LogManager.getLogger();
@Shadow
private int mipLevel;
@Shadow
public abstract Sprite getSprite(Identifier id);
@Shadow
public abstract Identifier method_24106();
// INJECTION LOGIC
private Map<Identifier, Sprite> fabric_injectedSprites;
// Loads in custom sprite object injections.