diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-05-27 12:53:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-27 12:53:54 +0200 |
commit | 3997e9f86243bef67175609a6093fe6668cf5ed7 (patch) | |
tree | d2b9c7838dcfeb3b5693a73e84cbd7731e36647a /src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java | |
parent | 067e6c04b2416f73cb08698a245fd8c275e9258d (diff) | |
download | GT5-Unofficial-3997e9f86243bef67175609a6093fe6668cf5ed7.tar.gz GT5-Unofficial-3997e9f86243bef67175609a6093fe6668cf5ed7.tar.bz2 GT5-Unofficial-3997e9f86243bef67175609a6093fe6668cf5ed7.zip |
Update to v13
* Added VoidMinerWIP
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Continue work on VoidMiner
+ Added a function to BWOreLayers
+ Made the voidminer actually WORK somewhat
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Continue work on VoidMiner
+ added recipes
+ made the void miner consume noble gasses to boost output
+ refactored code by quite a lot
+ added newest GT
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added GalacticGreg lib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* added localisation of achivements
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* updated GTLib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* updated GTlib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Several fixes
+ Fixed BioVat
+ Added some Debug Commands
+ Changed Void Miner logic
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Refactor
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Refactor
+ removed Experimental ThreadedLoader
+ moved LoaderCalls into LoaderReference
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Refactor
+ moved FMLCommonHandler.instance().get(Effective)Side() into SideReference
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* made radio hatch compat call static
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Made More Stuff static
+ improved flow control
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added more Block-Recipes
+version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* api changes
+ fixed void miner not consuming energy
+ Made API standalone (mostly)
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Made OrePrefixes lookups NullSecure
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed a typo
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* LICENSE update
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added Config for Metas and Tiers for Ross
+ fixed GT++ compability
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixes
+ Fixed ConfigHandler initiating GTValues during coremod startup
+ Fixed MegaEBF sometimes overflowing
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* change recipes for Void Miner using Ore Drill Tier 6
bump gt dependencie and version
* update code chicken core and gt version
* Added VoidMiner Tiers
+ Added Recipes for Void Miners
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixed VoidMiner Output
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* added void miner localisation for achievements
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed NPE
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Made Void Miner Times in Assembly Line more reasonable
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed fermentation recipes in biovat
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added a force shutdown, due to licensing of GT++
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixed Glass Checked
+ buffed Oganesson
+ made LoadItemContainers static
+ removed force shutdown
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Update WerkstoffLoader.java
* Fix imports
import cpw.mods.fml.common.Loader was missing
* Redid CLS support
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Some new featues
+ Added Multiblock Updateability to BW Blocks
+ Added Pollution to WaterPump
+ Added new Windmill GUI
+ Refactored Windmill a bit
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added animation to windmill
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* add gt to libs folder to let jenkins build
(cherry picked from commit 12f6dae5e2233b533bce1cf6b0c29e9e85a60a0b)
* Various Development
+ Added TT support to MEBF and MVAC
+ Fixed Energy Logic on MDT
+ Fixed MEBF not outputting fluids on bottom hatches
+ added auto-export for water on the simple stirling pump
+ redid glass folder structure
+ added EBF / Large Chem circuit Unification
+ updated TT dependancy
+ version increase x2
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Various Development (#75)
+ Added TT support to MEBF and MVAC
+ Fixed Energy Logic on MDT
+ Fixed MEBF not outputting fluids on bottom hatches
+ added auto-export for water on the simple stirling pump
+ redid glass folder structure
+ added EBF / Large Chem circuit Unification
+ updated TT dependancy
+ version increase x2
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added TT Low Power Lasers
+ Fixed Circuit Logic and added bounds check
+ added TT Low Power recipes
+ updated GT-lib
+ version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Block changes2 (#77)
* Various Development
+ Added TT support to MEBF and MVAC
+ Fixed Energy Logic on MDT
+ Fixed MEBF not outputting fluids on bottom hatches
+ added auto-export for water on the simple stirling pump
+ redid glass folder structure
+ added EBF / Large Chem circuit Unification
+ updated TT dependancy
+ version increase x2
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Added TT Low Power Lasers
+ Fixed Circuit Logic and added bounds check
+ added TT Low Power recipes
+ updated GT-lib
+ version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Redid LuV Osmiridium Replacer
+ version increase
+ deleted old lib
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* Fixes
+ Unified usage of .hasItemType instead of bitshifts/ .getGenerationFeatures().hasXY()
+ removed a wrong cast
+ fixed textures
+ cleaned up code
+ removed *some* duplicate recipes for tool items
+ increased version, increased api version
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
* fixed voidminer
+ fixed MEBF not working with LAZORS or Multi Amp hatches below UV-Glas
+ fixed LAZORS not exploding when they recive too much Amp lasers
* Redid Radio Hatch Stuffs ~~~
+ ItemStacks finally work properly
+ Forbid insertion of a non-Rad-Material
+ Version increase
* fixes
+ disabled circuit unification
+ removed unused decoratePlanet on Ross128ba
+ changed "splitStack" to "setStackSize"
+ renamed "WorldProviderRoss128Ba" to "WorldProviderRoss128ba"
* Math update
+ Added specialised functions for floor ceil wrap and clamp
+ Replaced old function calls
+ LowPower Pipes now have the IC2 glass fibre texture
+ fixed overflow on the AccessPriorityList
+ fixed "NOSUCHITEM rod" error
+ suppressed some warnings
+ version increase
* Fixed Burned Out THTR Stuff
* Had the wrong version number
Co-authored-by: Dream-Master <dream-master@gmx.net>
Co-authored-by: jackowski626 <jf@wikiera.net>
Former-commit-id: 3dce197579f950aa9c2e450e446e03c74b41dc83
Diffstat (limited to 'src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java')
-rw-r--r-- | src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java index 255f83a125..447909e03d 100644 --- a/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java +++ b/src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 bartimaeusnek + * Copyright (c) 2018-2020 bartimaeusnek * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -22,12 +22,12 @@ package com.github.bartimaeusnek.crossmod.galacticraft; +import com.github.bartimaeusnek.bartworks.API.SideReference; import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler; import com.github.bartimaeusnek.bartworks.system.oregen.BW_WorldGenRoss128b; import com.github.bartimaeusnek.bartworks.system.oregen.BW_WorldGenRoss128ba; import com.github.bartimaeusnek.crossmod.galacticraft.atmosphere.BWAtmosphereManager; import com.github.bartimaeusnek.crossmod.galacticraft.solarsystems.Ross128SolarSystem; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; @@ -44,7 +44,7 @@ public class GalacticraftProxy { } public static void postInit(FMLPostInitializationEvent e){ - if (FMLCommonHandler.instance().getSide().isServer() || FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (SideReference.Side.Server || SideReference.EffectiveSide.Server) { GalacticraftProxy.serverPostInit(e); } else { GalacticraftProxy.clientPostInit(e); @@ -53,7 +53,7 @@ public class GalacticraftProxy { } public static void preInit(FMLPreInitializationEvent e) { - if (FMLCommonHandler.instance().getSide().isServer() || FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (SideReference.Side.Server || SideReference.EffectiveSide.Server) { GalacticraftProxy.serverpreInit(e); } else { GalacticraftProxy.clientpreInit(e); @@ -81,7 +81,7 @@ public class GalacticraftProxy { } public static void init(FMLInitializationEvent e) { - if (FMLCommonHandler.instance().getSide().isServer() || FMLCommonHandler.instance().getEffectiveSide().isServer()) { + if (SideReference.Side.Server || SideReference.EffectiveSide.Server) { GalacticraftProxy.serverInit(e); } else { GalacticraftProxy.clientInit(e); |