Move from Embers-Rekindled to Embers Unofficial Extended Life (#103)

* Moved from Embers-Rekindled to Embers Unofficial Extended Life * Added backwards compatibility with Embers Rekindled
CleanroomMC · Feb 3, 2024 · 530e494 · 530e494
1 parent 528e760
commit 530e494
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -104,7 +104,7 @@ dependencies {
     compileOnly 'curse.maven:project-e-226410:2702991'
     compileOnly 'curse.maven:blood-magic-224791:2822288'
     compileOnly 'curse.maven:guide-api-228832:2645992'
-    compileOnly 'curse.maven:embers-rekindled-300777:3695248'
+    compileOnly 'curse.maven:embers-extended-life-936489:5077562'
     compileOnly 'curse.maven:thaumic-augmentation-319441:3536155'
     compileOnly 'curse.maven:mystical-mechanics-300742:3006392'
     compileOnly 'me.desht.pneumaticcraft:pneumaticcraft-repressurized:1.12.2-0.11.9-384'

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 org.gradle.jvmargs = -Xmx3G
 
 # Mod Information
-mod_version = 0.8.5
+mod_version = 0.8.6
 maven_group = com.cleanroommc
 archives_base_name = multiblocked
 

diff --git a/src/main/java/com/cleanroommc/multiblocked/common/capability/EmberEmbersCapability.java b/src/main/java/com/cleanroommc/multiblocked/common/capability/EmberEmbersCapability.java
@@ -16,7 +16,10 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import net.minecraft.tileentity.TileEntity;
-import teamroots.embers.RegistryManager;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.fml.common.registry.ForgeRegistries;
+import teamroots.embers.Embers;
+import teamroots.embers.register.BlockRegister;
 import teamroots.embers.api.capabilities.EmbersCapabilities;
 import teamroots.embers.api.power.IEmberCapability;
 
@@ -63,12 +66,12 @@ public CapabilityProxy<? extends Double> createProxy(@Nonnull IO io, @Nonnull Ti
     @Override
     public BlockInfo[] getCandidates() {
         return new BlockInfo[] {
-                BlockInfo.fromBlockState(RegistryManager.charger.getDefaultState()),
-                BlockInfo.fromBlockState(RegistryManager.copper_cell.getDefaultState()),
-                BlockInfo.fromBlockState(RegistryManager.ember_funnel.getDefaultState()),
-                BlockInfo.fromBlockState(RegistryManager.ember_siphon.getDefaultState()),
-                BlockInfo.fromBlockState(RegistryManager.ember_injector.getDefaultState()),
-                BlockInfo.fromBlockState(RegistryManager.ember_activator.getDefaultState())
+                BlockInfo.fromBlockState(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Embers.MODID,"charger")).getDefaultState()),
+                BlockInfo.fromBlockState(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Embers.MODID,"copper_cell")).getDefaultState()),
+                BlockInfo.fromBlockState(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Embers.MODID,"ember_funnel")).getDefaultState()),
+                BlockInfo.fromBlockState(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Embers.MODID,"ember_siphon")).getDefaultState()),
+                BlockInfo.fromBlockState(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Embers.MODID,"ember_injector")).getDefaultState()),
+                BlockInfo.fromBlockState(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(Embers.MODID,"ember_activator")).getDefaultState())
         };
     }