Merge pull request #7 from jumpcutfindo/1.1.2a

Fix naughty nice capability issue
jumpcutfindo · Oct 16, 2021 · b27e57b · b27e57b
2 parents e55acb9 + e93eecc
commit b27e57b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'
 
-version = '1.1.2'
+version = '1.1.2a'
 group = 'com.jumpcutfindo.happyholidays' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'happyholidays'
 

diff --git a/...ava/com/jumpcutfindo/happyholidays/common/capabilities/christmas/NaughtyNiceProvider.java b/...ava/com/jumpcutfindo/happyholidays/common/capabilities/christmas/NaughtyNiceProvider.java
@@ -16,7 +16,7 @@ public class NaughtyNiceProvider implements ICapabilitySerializable<CompoundTag>
     @Nonnull
     @Override
     public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-        return meterOptional.cast();
+        return cap == CapabilityNaughtyNice.NAUGHTY_NICE_CAPABILITY ? meterOptional.cast() : LazyOptional.empty();
     }
 
     @Override

diff --git a/src/main/java/com/jumpcutfindo/happyholidays/common/handlers/SetupHandler.java b/src/main/java/com/jumpcutfindo/happyholidays/common/handlers/SetupHandler.java
@@ -5,6 +5,7 @@
 import com.jumpcutfindo.happyholidays.HappyHolidaysMod;
 import com.jumpcutfindo.happyholidays.common.block.christmas.ChristmasBlock;
 import com.jumpcutfindo.happyholidays.common.capabilities.christmas.CapabilityNaughtyNice;
+import com.jumpcutfindo.happyholidays.common.capabilities.christmas.INaughtyNiceHandler;
 import com.jumpcutfindo.happyholidays.common.registry.christmas.ChristmasBlocks;
 import com.jumpcutfindo.happyholidays.common.registry.christmas.ChristmasTriggers;
 
@@ -97,6 +98,7 @@ public static void configureBlocks(FMLCommonSetupEvent event) {
     @SubscribeEvent
     public static void registerCapabilities(RegisterCapabilitiesEvent event) {
         event.register(CapabilityNaughtyNice.class);
+        event.register(INaughtyNiceHandler.class);
     }
 
     @SubscribeEvent