mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2026-02-07 19:30:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #316 from SquidDev-CC/feature/minecraft-1.12.2

Browse Source 
Update to 1.12. Bam!
This commit is contained in:
Daniel Ratcliffe
2017-09-10 20:52:26 +01:00
committed by GitHub
parent bde9ac9747 3b2de38227
commit 61ff91f237
146 changed files with 2298 additions and 1337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/dan200/computercraft/ComputerCraft.java
View File

@@ -239,11 +239,11 @@ public class ComputerCraft
public static Logger log;
// API users
private static List<IPeripheralProvider> peripheralProviders = new ArrayList<IPeripheralProvider>();
private static List<IBundledRedstoneProvider> bundledRedstoneProviders = new ArrayList<IBundledRedstoneProvider>();
private static List<IMediaProvider> mediaProviders = new ArrayList<IMediaProvider>();
private static List<ITurtlePermissionProvider> permissionProviders = new ArrayList<ITurtlePermissionProvider>();
private static final Map<String, IPocketUpgrade> pocketUpgrades = new HashMap<String, IPocketUpgrade>();
private static List<IPeripheralProvider> peripheralProviders = new ArrayList<>();
private static List<IBundledRedstoneProvider> bundledRedstoneProviders = new ArrayList<>();
private static List<IMediaProvider> mediaProviders = new ArrayList<>();
private static List<ITurtlePermissionProvider> permissionProviders = new ArrayList<>();
private static final Map<String, IPocketUpgrade> pocketUpgrades = new HashMap<>();
// Implementation
@Mod.Instance( value = ComputerCraft.MOD_ID )
@@ -397,14 +397,6 @@ public class ComputerCraft
turtleProxy.init();
}
@Mod.EventHandler
public void onMissingMappings( FMLMissingMappingsEvent event )
{
proxy.remap( event );
turtleProxy.remap( event );
}
@Mod.EventHandler
public void onServerStarting( FMLServerStartingEvent event )
{
@@ -764,7 +756,7 @@ public class ComputerCraft
}
public static Iterable<IPocketUpgrade> getVanillaPocketUpgrades() {
List<IPocketUpgrade> upgrades = new ArrayList<IPocketUpgrade>();
List<IPocketUpgrade> upgrades = new ArrayList<>();
for(IPocketUpgrade upgrade : pocketUpgrades.values()) {
if(upgrade instanceof PocketModem || upgrade instanceof PocketSpeaker) {
upgrades.add( upgrade );
@@ -799,7 +791,7 @@ public class ComputerCraft
public static IMount createResourceMount( Class<?> modClass, String domain, String subPath )
{
// Start building list of mounts
List<IMount> mounts = new ArrayList<IMount>();
List<IMount> mounts = new ArrayList<>();
subPath = "assets/" + domain + "/" + subPath;
// Mount from debug dir