From a8e79826bd734edacb87e2a543ae05ee9a10a17a Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Tue, 28 Jul 2020 21:54:10 +0200 Subject: [PATCH] Fix fabric-api version --- build.gradle | 3 ++- gradle.properties | 2 +- src/main/java/appeng/core/AppEngBase.java | 3 +-- src/main/java/appeng/spatial/StorageHelper.java | 2 +- src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 3470f0de1..d77cb41a4 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ repositories { mavenLocal() jcenter() mavenCentral() - maven { url = "http://maven.fabricmc.net/" } + maven { url = "https://maven.fabricmc.net/" } maven { name = "BuildCraft" url = "https://mod-buildcraft.com/maven" @@ -37,6 +37,7 @@ repositories { maven { name = "HYWLA" url = "https://maven.tehnut.info/" + } maven { name = 'Earthcomputer Mods' diff --git a/gradle.properties b/gradle.properties index 5d718fee0..fa872d6a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ yarn_mappings=1.16.1+build.19 loader_version=0.8.9+build.203 #Fabric api -fabric_version=0.15.0+local-indigo-flat-lighting-fix +fabric_version=0.16.0+build.384-1.16.1 loom_version=0.4-SNAPSHOT diff --git a/src/main/java/appeng/core/AppEngBase.java b/src/main/java/appeng/core/AppEngBase.java index 305b5f5e4..eaad3d6f7 100644 --- a/src/main/java/appeng/core/AppEngBase.java +++ b/src/main/java/appeng/core/AppEngBase.java @@ -562,8 +562,7 @@ public abstract class AppEngBase implements AppEng { LibStructure.registerStructure(MeteoriteStructure.ID, MeteoriteStructure.INSTANCE, GenerationStep.Feature.TOP_LAYER_MODIFICATION, new StructureConfig(32, 8, 124895654), new MeteoriteStructure(DefaultFeatureConfig.CODEC).configure(DefaultFeatureConfig.INSTANCE)); - Registry.register(Registry.FEATURE, AppEng.makeId("charged_quartz_ore"), - new ChargedQuartzOreFeature(ChargedQuartzOreConfig.CODEC)); + Registry.register(Registry.FEATURE, AppEng.makeId("charged_quartz_ore"), ChargedQuartzOreFeature.INSTANCE); Biome.BIOMES.forEach(b -> { addMeteoriteWorldGen(b); diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index ef7c54865..5cb22c51c 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -99,7 +99,7 @@ public class StorageHelper { ChunkStatus.FULL, true); if (entity instanceof ServerPlayerEntity - && link.dim.getDimensionRegistryKey().equals(SpatialDimensionManager.STORAGE_DIMENSION_TYPE)) { + && link.dim.getDimensionRegistryKey() == SpatialDimensionManager.STORAGE_DIMENSION_TYPE) { AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger((ServerPlayerEntity) entity); } diff --git a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java index 89ddaea2e..be53a280e 100644 --- a/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java +++ b/src/main/java/appeng/worldgen/ChargedQuartzOreFeature.java @@ -23,7 +23,7 @@ public class ChargedQuartzOreFeature extends Feature { public static final ChargedQuartzOreFeature INSTANCE = new ChargedQuartzOreFeature(ChargedQuartzOreConfig.CODEC); - public ChargedQuartzOreFeature(Codec codec) { + private ChargedQuartzOreFeature(Codec codec) { super(codec); }