1
0
forked from xjboss/KCauldronX

Normalize patches

This commit is contained in:
Prototik 2015-06-08 23:18:24 +07:00
parent 75eb280f0e
commit 33633471ca
26 changed files with 36 additions and 36 deletions

View File

@ -17,11 +17,11 @@
+ if (!"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) { + if (!"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
+ java.util.Iterator<ModContainer> iterator = modList.iterator(); + java.util.Iterator<ModContainer> iterator = modList.iterator();
+ while(iterator.hasNext()) { + while(iterator.hasNext()) {
+ ModContainer container = iterator.next(); + ModContainer container = iterator.next();
+ if ("FastCraft".equals(container.getModId())) { + if ("FastCraft".equals(container.getModId())) {
+ FMLLog.log(Level.WARN, "Found FastCraft mod, removing it..."); + FMLLog.log(Level.WARN, "Found FastCraft mod, removing it...");
+ iterator.remove(); + iterator.remove();
+ } + }
+ } + }
+ } + }
+ +

View File

@ -75,8 +75,8 @@
if (cascadedTweaker != null) if (cascadedTweaker != null)
{ {
+ if ("fastcraft.Tweaker".equals(cascadedTweaker) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) { + if ("fastcraft.Tweaker".equals(cascadedTweaker) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
+ FMLRelaunchLog.info("Found FastCraft tweaker, skipping..."); + FMLRelaunchLog.info("Found FastCraft tweaker, skipping...");
+ continue; + continue;
+ } + }
FMLRelaunchLog.info("Loading tweaker %s from %s", cascadedTweaker, coreMod.getName()); FMLRelaunchLog.info("Loading tweaker %s from %s", cascadedTweaker, coreMod.getName());
Integer sortOrder = Ints.tryParse(Strings.nullToEmpty(mfAttributes.getValue("TweakOrder"))); Integer sortOrder = Ints.tryParse(Strings.nullToEmpty(mfAttributes.getValue("TweakOrder")));

View File

@ -791,7 +791,7 @@
+ } + }
+ +
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return false; + return false;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -92,7 +92,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -55,7 +55,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -17,7 +17,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -62,7 +62,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -30,7 +30,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -74,7 +74,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -17,7 +17,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -22,7 +22,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -26,7 +26,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -63,7 +63,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -165,7 +165,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -153,7 +153,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -81,7 +81,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -130,7 +130,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -122,7 +122,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -109,7 +109,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -50,7 +50,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -8,7 +8,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -44,7 +44,7 @@
+ // Cauldron start + // Cauldron start
+ @Override + @Override
+ public boolean entityProjectileHook() { + public boolean entityProjectileHook() {
+ return true; + return true;
+ } + }
+ // Cauldron end + // Cauldron end
} }

View File

@ -912,8 +912,8 @@
} }
+ public int getMaxVisiblePlayers() { + public int getMaxVisiblePlayers() {
+ int max = mcServer.cauldronConfig.maxPlayersVisible.getValue(); + int max = mcServer.cauldronConfig.maxPlayersVisible.getValue();
+ return max > 0 ? max : maxPlayers; + return max > 0 ? max : maxPlayers;
+ } + }
+ +
public String[] getAvailablePlayerDat() public String[] getAvailablePlayerDat()

View File

@ -1037,7 +1037,7 @@
public void updateEntityWithOptionalForce(Entity p_72866_1_, boolean p_72866_2_) public void updateEntityWithOptionalForce(Entity p_72866_1_, boolean p_72866_2_)
{ {
+ if (p_72866_1_.isDead) return; + if (p_72866_1_.isDead) return;
int i = MathHelper.floor_double(p_72866_1_.posX); int i = MathHelper.floor_double(p_72866_1_.posX);
int j = MathHelper.floor_double(p_72866_1_.posZ); int j = MathHelper.floor_double(p_72866_1_.posZ);
boolean isForced = getPersistentChunks().containsKey(new ChunkCoordIntPair(i >> 4, j >> 4)); boolean isForced = getPersistentChunks().containsKey(new ChunkCoordIntPair(i >> 4, j >> 4));

View File

@ -139,11 +139,11 @@
- this.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition); - this.unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
- } - }
+ this.loadedChunkHashMap.forEachValue(new TObjectProcedure<Chunk>() { + this.loadedChunkHashMap.forEachValue(new TObjectProcedure<Chunk>() {
+ @Override + @Override
+ public boolean execute(Chunk chunk) { + public boolean execute(Chunk chunk) {
+ unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition); + unloadChunksIfNotNearSpawn(chunk.xPosition, chunk.zPosition);
+ return true; + return true;
+ } + }
+ }); + });
} }

View File

@ -21,7 +21,7 @@
+ switch(this) { + switch(this) {
+ case NETHER_PORTAL: + case NETHER_PORTAL:
+ case END_PORTAL: + case END_PORTAL:
+ return true; + return true;
+ } + }
+ return false; + return false;
+ } + }