mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-10 14:25:59 +00:00
Code Issues Releases Wiki Activity

Bump Forge version

Browse Source 
Not much has changed, just some cleanup.
This commit is contained in:
Jonathan Coates
2021-09-19 11:57:37 +01:00
parent 0d6528aaf0
commit d0e79f310e
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -6,5 +6,5 @@ mod_version=1.98.2
# Minecraft properties (update mods.toml when changing) # Minecraft properties (update mods.toml when changing)
mc_version=1.17.1 mc_version=1.17.1
mapping_version=2021.08.15 mapping_version=2021.08.15
forge_version=37.0.34 forge_version=37.0.69
# NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING # NO SERIOUSLY, UPDATE mods.toml WHEN CHANGING

13
src/main/java/dan200/computercraft/shared/Registry.java
View File

@@ -82,7 +82,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType; import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType;
import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
@@ -353,6 +353,13 @@ public final class Registry
); );
} }
@SubscribeEvent
public static void registerCapabilities( RegisterCapabilitiesEvent event )
{
event.register( IWiredElement.class );
event.register( IPeripheral.class );
}
@SubscribeEvent @SubscribeEvent
public static void init( FMLCommonSetupEvent event ) public static void init( FMLCommonSetupEvent event )
{ {
@@ -382,10 +389,6 @@ public final class Registry
return null; return null;
} ); } );
// Register capabilities
CapabilityManager.INSTANCE.register( IWiredElement.class );
CapabilityManager.INSTANCE.register( IPeripheral.class );
// Register generic capabilities. This can technically be done off-thread, but we need it to happen // Register generic capabilities. This can technically be done off-thread, but we need it to happen
// after Forge's common setup, so this is easiest. // after Forge's common setup, so this is easiest.
ComputerCraftAPI.registerGenericCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY ); ComputerCraftAPI.registerGenericCapability( CapabilityItemHandler.ITEM_HANDLER_CAPABILITY );

2
src/main/resources/META-INF/mods.toml
View File

@@ -20,6 +20,6 @@ CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles a
[[dependencies.computercraft]] [[dependencies.computercraft]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[37.0.25,38)" versionRange="[37.0.69,38)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"