FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-24 22:11:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update mappings

Browse source
This commit is contained in:
modmuss50 2020-06-09 22:29:07 +01:00
parent 4e84b64f5c
commit 059ea866ec
22 changed files with 30 additions and 30 deletions
build.gradle
fabric-biomes-v1
build.gradle
src/main/java/net/fabricmc/fabric/mixin/biome
MixinTheNetherDimension.java
fabric-content-registries-v0
build.gradle
src/main/java/net/fabricmc/fabric
api/registry
LootEntryTypeRegistry.java
impl/content/registry
LootEntryTypeRegistryImpl.java
fabric-loot-tables-v1
build.gradle
src/main/java/net/fabricmc/fabric
api/loot/v1
LootEntryTypeRegistry.java
impl/loot/table
LootEntryTypeRegistryImpl.java
fabric-object-builder-api-v1
build.gradle
src/main/java/net/fabricmc/fabric/api/object/builder/v1/block
FabricBlockSettings.java
fabric-registry-sync-v0
build.gradle
src/main/java/net/fabricmc/fabric/mixin/registry/sync
MixinLevelStorageSession.java
fabric-renderer-indigo
build.gradle
src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render
BlockRenderInfo.java
fabric-resource-loader-v0
build.gradle
src/main/java/net/fabricmc/fabric
impl/resource/loader
ModResourcePackCreator.java
mixin/resource/loader
MixinClass_5359.javaMixinResourcePackManager.javaMixinResourcePackManagerClient.java
fabric-tool-attribute-api-v1
build.gradle
src/testmod/java/net/fabricmc/fabric/test/tool/attribute
ToolAttributeTest.java

2
build.gradle
View file

@ -14,7 +14,7 @@ def ENV = System.getenv()
class Globals {
static def baseVersion = "0.11.7"
static def mcVersion = "1.16-pre2"
static def yarnVersion = "+build.1"
static def yarnVersion = "+build.29"
}
version = Globals.baseVersion + "+" + (ENV.BUILD_NUMBER ? ("build." + ENV.BUILD_NUMBER) : "local") + "-" + getBranch()

2
fabric-biomes-v1/build.gradle
View file

@ -1,2 +1,2 @@
archivesBaseName = "fabric-biomes-v1"
version = getSubprojectVersion(project, "0.2.6")
version = getSubprojectVersion(project, "0.2.7")

2
fabric-biomes-v1/src/main/java/net/fabricmc/fabric/mixin/biome/MixinTheNetherDimension.java
View file

@ -38,7 +38,7 @@ public class MixinTheNetherDimension {
private static void method_28467(long l, CallbackInfoReturnable<MultiNoiseBiomeSource> info) {
List<Biome> newList = new ArrayList<>(info.getReturnValue().method_28443());
newList.addAll(InternalBiomeData.getNetherBiomes());
MultiNoiseBiomeSource multiNoiseBiomeSource = new MultiNoiseBiomeSource(l, newList.stream().flatMap((biome) -> biome.streamNoises().map((point) -> Pair.of(point, biome))).collect(ImmutableList.toImmutableList()), Optional.of(MultiNoiseBiomeSource.class_5305.field_24723));
MultiNoiseBiomeSource multiNoiseBiomeSource = new MultiNoiseBiomeSource(l, newList.stream().flatMap((biome) -> biome.streamNoises().map((point) -> Pair.of(point, biome))).collect(ImmutableList.toImmutableList()), Optional.of(MultiNoiseBiomeSource.Preset.NETHER));
info.setReturnValue(multiNoiseBiomeSource);
}
}

2
fabric-content-registries-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-content-registries-v0"
version = getSubprojectVersion(project, "0.1.8")
version = getSubprojectVersion(project, "0.1.9")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

2
fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/api/registry/LootEntryTypeRegistry.java
View file

@ -29,5 +29,5 @@ public interface LootEntryTypeRegistry {
LootEntryTypeRegistry INSTANCE = LootEntryTypeRegistryImpl.INSTANCE;
@Deprecated
void register(LootPoolEntry.class_5337<?> serializer);
void register(LootPoolEntry.Serializer<?> serializer);
}

4
fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/LootEntryTypeRegistryImpl.java
View file

@ -32,7 +32,7 @@ public final class LootEntryTypeRegistryImpl implements LootEntryTypeRegistry {
Method target = null;
for (Method m : LootPoolEntryTypes.class.getDeclaredMethods()) {
if (m.getParameterCount() == 1 && m.getParameterTypes()[0] == LootPoolEntry.class_5337.class) {
if (m.getParameterCount() == 1 && m.getParameterTypes()[0] == LootPoolEntry.Serializer.class) {
if (target != null) {
throw new RuntimeException("More than one register-like method found in LootEntries!");
} else {
@ -52,7 +52,7 @@ public final class LootEntryTypeRegistryImpl implements LootEntryTypeRegistry {
private LootEntryTypeRegistryImpl() { }
@Override
public void register(LootPoolEntry.class_5337<?> serializer) {
public void register(LootPoolEntry.Serializer<?> serializer) {
try {
REGISTER_METHOD.invoke(null, serializer);
} catch (Throwable t) {

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

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

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

@ -34,5 +34,5 @@ public interface LootEntryTypeRegistry {
*
* @param serializer the loot entry serializer
*/
void register(LootPoolEntry.class_5337<?> serializer);
void register(LootPoolEntry.Serializer<?> serializer);
}

4
fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/impl/loot/table/LootEntryTypeRegistryImpl.java
View file

@ -29,7 +29,7 @@ public final class LootEntryTypeRegistryImpl implements net.fabricmc.fabric.api.
Method target = null;
for (Method m : LootPoolEntryTypes.class.getDeclaredMethods()) {
if (m.getParameterCount() == 1 && m.getParameterTypes()[0] == LootPoolEntry.class_5337.class) {
if (m.getParameterCount() == 1 && m.getParameterTypes()[0] == LootPoolEntry.Serializer.class) {
if (target != null) {
throw new RuntimeException("More than one register-like method found in LootEntries!");
} else {
@ -49,7 +49,7 @@ public final class LootEntryTypeRegistryImpl implements net.fabricmc.fabric.api.
private LootEntryTypeRegistryImpl() { }
@Override
public void register(LootPoolEntry.class_5337<?> serializer) {
public void register(LootPoolEntry.Serializer<?> serializer) {
try {
REGISTER_METHOD.invoke(null, serializer);
} catch (Throwable t) {

2
fabric-object-builder-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-object-builder-api-v1"
version = getSubprojectVersion(project, "1.5.3")
version = getSubprojectVersion(project, "1.5.4")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

4
fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/FabricBlockSettings.java
View file

@ -290,8 +290,8 @@ public class FabricBlockSettings extends AbstractBlock.Settings {
* Make the material require tool to drop and slows down mining speed if the incorrect tool is used.
*/
@Override
public FabricBlockSettings method_29292() {
super.method_29292();
public FabricBlockSettings requiresTool() {
super.requiresTool();
return this;
}
}

2
fabric-registry-sync-v0/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-registry-sync-v0"
version = getSubprojectVersion(project, "0.3.6")
version = getSubprojectVersion(project, "0.3.7")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

4
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/MixinLevelStorageSession.java
View file

@ -39,7 +39,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtIo;
import net.minecraft.world.SaveProperties;
import net.minecraft.world.level.storage.LevelStorage;
import net.minecraft.world.dimension.DimensionTracker;
import net.minecraft.util.registry.RegistryTracker;
import net.fabricmc.fabric.impl.registry.sync.RegistrySyncManager;
import net.fabricmc.fabric.impl.registry.sync.RemapException;
@ -130,7 +130,7 @@ public class MixinLevelStorageSession {
}
@Inject(method = "method_27426", at = @At("HEAD"))
public void saveWorld(DimensionTracker dimensionTracker, SaveProperties saveProperties, CompoundTag compoundTag, CallbackInfo info) {
public void saveWorld(RegistryTracker registryTracker, SaveProperties saveProperties, CompoundTag compoundTag, CallbackInfo info) {
if (!Files.exists(directory)) {
return;
}

2
fabric-renderer-indigo/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-renderer-indigo"
version = getSubprojectVersion(project, "0.3.0")
version = getSubprojectVersion(project, "0.3.1")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

2
fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/render/BlockRenderInfo.java
View file

@ -38,7 +38,7 @@ import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
* so they can be applied together with chunk offsets.
*/
public class BlockRenderInfo {
private final BlockColors blockColorMap = MinecraftClient.getInstance().getBlockColorMap();
private final BlockColors blockColorMap = MinecraftClient.getInstance().getBlockColors();
public final Random random = new Random();
public BlockRenderView blockView;
public BlockPos blockPos;

2
fabric-resource-loader-v0/build.gradle
View file

@ -1,2 +1,2 @@
archivesBaseName = "fabric-resource-loader-v0"
version = getSubprojectVersion(project, "0.2.4")
version = getSubprojectVersion(project, "0.2.5")

2
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackCreator.java
View file

@ -36,7 +36,7 @@ public class ModResourcePackCreator implements ResourcePackProvider {
}
@Override
public <T extends ResourcePackProfile> void register(Consumer<T> consumer, ResourcePackProfile.class_5351<T> factory) {
public <T extends ResourcePackProfile> void register(Consumer<T> consumer, ResourcePackProfile.Factory<T> factory) {
// TODO: "vanilla" does not emit a message; neither should a modded datapack
List<ResourcePack> packs = new ArrayList<>();
ModResourcePackUtil.appendModResourcePacks(packs, type);

8
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinClass_5359.java
View file

@ -28,7 +28,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.minecraft.class_5359;
import net.minecraft.resource.DataPackSettings;
import net.minecraft.resource.ResourcePack;
import net.minecraft.resource.ResourceType;
@ -36,12 +36,12 @@ import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.ModContainer;
import net.fabricmc.fabric.impl.resource.loader.ModNioResourcePack;
@Mixin(class_5359.class)
@Mixin(DataPackSettings.class)
public class MixinClass_5359 {
@Shadow
@Final
@Mutable
private List<String> field_25395;
private List<String> enabled;
/*
This injection takes all instances of this class with an enabled list that only have the vanilla pack enabled,
@ -67,7 +67,7 @@ public class MixinClass_5359 {
}
}
this.field_25395 = newEnabled;
this.enabled = newEnabled;
}
}
}

2
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinResourcePackManager.java
View file

@ -42,7 +42,7 @@ public class MixinResourcePackManager<T extends ResourcePackProfile> {
private Set<ResourcePackProvider> providers;
@Inject(method = "<init>", at = @At("RETURN"))
public void construct(ResourcePackProfile.class_5351<T> arg, ResourcePackProvider[] resourcePackProviders, CallbackInfo info) {
public void construct(ResourcePackProfile.Factory<T> arg, ResourcePackProvider[] resourcePackProviders, CallbackInfo info) {
providers = new HashSet<>(providers);
providers.add(new ModResourcePackCreator(ResourceType.SERVER_DATA));
}

4
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader/MixinResourcePackManagerClient.java
View file

@ -31,8 +31,8 @@ import net.fabricmc.fabric.impl.resource.loader.ModResourcePackUtil;
@Mixin(ResourcePackManager.class)
public class MixinResourcePackManagerClient {
@Inject(method = "method_29211", at = @At("RETURN"), cancellable = true)
public void method_29211(CallbackInfoReturnable<List<ResourcePack>> infoReturnable) {
@Inject(method = "createResourcePacks", at = @At("RETURN"), cancellable = true)
public void createResourcePacks(CallbackInfoReturnable<List<ResourcePack>> infoReturnable) {
List<ResourcePack> list = new ArrayList<>(infoReturnable.getReturnValue());
ModResourcePackUtil.modifyResourcePackList(list);
infoReturnable.setReturnValue(list);

2
fabric-tool-attribute-api-v1/build.gradle
View file

@ -1,5 +1,5 @@
archivesBaseName = "fabric-tool-attribute-api-v1"
version = getSubprojectVersion(project, "1.1.2")
version = getSubprojectVersion(project, "1.1.3")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')

2
fabric-tool-attribute-api-v1/src/testmod/java/net/fabricmc/fabric/test/tool/attribute/ToolAttributeTest.java
View file

@ -47,7 +47,7 @@ public class ToolAttributeTest implements ModInitializer {
Block block = Registry.register(Registry.BLOCK, new Identifier("fabric-tool-attribute-api-v1-testmod", "hardened_block"),
new Block(FabricBlockSettings.of(new FabricMaterialBuilder(MaterialColor.SAND).build(), MaterialColor.STONE)
.breakByTool(FabricToolTags.SHOVELS, 2)
.method_29292()
.requiresTool()
.strength(0.6F)
.sounds(BlockSoundGroup.GRAVEL)));
Registry.register(Registry.ITEM, new Identifier("fabric-tool-attribute-api-v1-testmod", "hardened_block"), new BlockItem(block, new Item.Settings()));