Skip to content

Commit 1aa2869

Browse files
Bogdan-GBogdan-G
committed
update to last MFF and change by rules
1 parent c93493f commit 1aa2869

File tree

10 files changed

+251
-19
lines changed

10 files changed

+251
-19
lines changed

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ ext.buildInfoCached = null;
5151
def buildInfo(String key) {
5252
if (!buildInfoCached) {
5353
buildInfoCached = [
54-
nextBuildNumber: 'test34.15',
55-
version : 'test34.14'
54+
nextBuildNumber: 'test34.17',
55+
version : 'test34.16'
5656
]
5757
}
5858
return key ? buildInfoCached[key] : buildInfoCached;
@@ -81,7 +81,7 @@ def gitInfo(String key) {
8181
return key ? gitInfoCached[key] : gitInfoCached;
8282
}
8383

84-
version = "1.7.10-0.test34.15"
84+
version = "1.7.10-0.test34.17"
8585

8686
launch4j {
8787
jreMinVersion = '1.6.0'

‎eclipse-patch/patch.patch‎

Lines changed: 230 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31368,6 +31368,92 @@ index 5951732..40d8c2d 100644
3136831368
+ }
3136931369
}
3137031370
\ No newline at end of file
31371+
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/client/ClientCommandHandler.java ./eclipse/cauldron/src/main/java/net/minecraftforge/client/ClientCommandHandler.java
31372+
index 08bd913..2e01a60 100644
31373+
--- ./eclipse/Clean/src/main/java/net/minecraftforge/client/ClientCommandHandler.java
31374+
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/client/ClientCommandHandler.java
31375+
@@ -39,7 +39,7 @@ public class ClientCommandHandler extends CommandHandler
31376+
{
31377+
message = message.trim();
31378+
31379+
- if (message.startsWith("/"))
31380+
+ if (message.charAt(0) == '/')//message.startsWith("/")
31381+
{
31382+
message = message.substring(1);
31383+
}
31384+
@@ -119,14 +119,16 @@ public class ClientCommandHandler extends CommandHandler
31385+
{
31386+
if (leftOfCursor.indexOf(' ') == -1)
31387+
{
31388+
- for (int i = 0; i < commands.size(); i++)
31389+
+ int commands_sS=commands.size();
31390+
+ for (int i = 0; i < commands_sS; i++)
31391+
{
31392+
commands.set(i, GRAY + "/" + commands.get(i) + RESET);
31393+
}
31394+
}
31395+
else
31396+
{
31397+
- for (int i = 0; i < commands.size(); i++)
31398+
+ int commands_sS=commands.size();
31399+
+ for (int i = 0; i < commands_sS; i++)
31400+
{
31401+
commands.set(i, GRAY + commands.get(i) + RESET);
31402+
}
31403+
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/client/GuiIngameForge.java ./eclipse/cauldron/src/main/java/net/minecraftforge/client/GuiIngameForge.java
31404+
index 87d31b4..230f378 100644
31405+
--- ./eclipse/Clean/src/main/java/net/minecraftforge/client/GuiIngameForge.java
31406+
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/client/GuiIngameForge.java
31407+
@@ -527,7 +527,7 @@ public class GuiIngameForge extends GuiIngame
31408+
mc.mcProfiler.startSection("expLevel");
31409+
boolean flag1 = false;
31410+
int color = flag1 ? 16777215 : 8453920;
31411+
- String text = "" + mc.thePlayer.experienceLevel;
31412+
+ String text = String.valueOf(mc.thePlayer.experienceLevel);
31413+
int x = (width - fontrenderer.getStringWidth(text)) / 2;
31414+
int y = height - 31 - 4;
31415+
fontrenderer.drawString(text, x + 1, y, 0);
31416+
@@ -698,14 +698,16 @@ public class GuiIngameForge extends GuiIngame
31417+
RenderGameOverlayEvent.Text event = new RenderGameOverlayEvent.Text(eventParent, left, right);
31418+
if (!MinecraftForge.EVENT_BUS.post(event))
31419+
{
31420+
- for (int x = 0; x < left.size(); x++)
31421+
+ int left_sS=left.size();
31422+
+ for (int x = 0; x < left_sS; x++)
31423+
{
31424+
String msg = left.get(x);
31425+
if (msg == null) continue;
31426+
fontrenderer.drawStringWithShadow(msg, 2, 2 + x * 10, WHITE);
31427+
}
31428+
31429+
- for (int x = 0; x < right.size(); x++)
31430+
+ int right_sS=right.size();
31431+
+ for (int x = 0; x < right_sS; x++)
31432+
{
31433+
String msg = right.get(x);
31434+
if (msg == null) continue;
31435+
@@ -814,7 +816,7 @@ public class GuiIngameForge extends GuiIngame
31436+
if (maxX - endX > 5)
31437+
{
31438+
Score score = scoreobjective.getScoreboard().func_96529_a(player.name, scoreobjective);
31439+
- String scoreDisplay = EnumChatFormatting.YELLOW + "" + score.getScorePoints();
31440+
+ String scoreDisplay = String.valueOf(EnumChatFormatting.YELLOW) + String.valueOf(score.getScorePoints());
31441+
fontrenderer.drawStringWithShadow(scoreDisplay, maxX - fontrenderer.getStringWidth(scoreDisplay), yPos, 16777215);
31442+
}
31443+
}
31444+
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java ./eclipse/cauldron/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
31445+
index dc5b48d..25a95fd 100644
31446+
--- ./eclipse/Clean/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
31447+
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
31448+
@@ -83,7 +83,7 @@ public class WavefrontObject implements IModelCustom
31449+
lineCount++;
31450+
currentLine = currentLine.replaceAll("\\s+", " ").trim();
31451+
31452+
- if (currentLine.startsWith("#") || currentLine.length() == 0)
31453+
+ if (currentLine.charAt(0) == '#' || currentLine.length() == 0)//currentLine.startsWith("#")
31454+
{
31455+
continue;
31456+
}
3137131457
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/common/DimensionManager.java ./eclipse/cauldron/src/main/java/net/minecraftforge/common/DimensionManager.java
3137231458
index 130646b..2b1f8c5 100644
3137331459
--- ./eclipse/Clean/src/main/java/net/minecraftforge/common/DimensionManager.java
@@ -32119,7 +32205,7 @@ index f4982c9..1da02a6 100644
3211932205

3212032206
chunk.populateChunk(queuedChunk.provider, queuedChunk.provider, queuedChunk.x, queuedChunk.z);
3212132207
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/common/config/Configuration.java ./eclipse/cauldron/src/main/java/net/minecraftforge/common/config/Configuration.java
32122-
index 849986d..34228ca 100644
32208+
index 849986d..cddb482 100644
3212332209
--- ./eclipse/Clean/src/main/java/net/minecraftforge/common/config/Configuration.java
3212432210
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/common/config/Configuration.java
3212532211
@@ -15,6 +15,8 @@ import java.io.BufferedWriter;
@@ -32140,6 +32226,70 @@ index 849986d..34228ca 100644
3214032226
defaultEncoding = input.getEncoding();
3214132227
buffer = new BufferedReader(input);
3214232228

32229+
@@ -860,9 +862,9 @@ public class Configuration
32230+
int nameStart = -1, nameEnd = -1;
32231+
boolean skip = false;
32232+
boolean quoted = false;
32233+
- boolean isFirstNonWhitespaceCharOnLine = true;
32234+
+ boolean isFirstNonWhitespaceCharOnLine = true;int line_sS=line.length();
32235+
32236+
- for (int i = 0; i < line.length() && !skip; ++i)
32237+
+ for (int i = 0; i < line_sS && !skip; ++i)
32238+
{
32239+
if (Character.isLetterOrDigit(line.charAt(i)) || ALLOWED_CHARS.indexOf(line.charAt(i)) != -1 || (quoted && line.charAt(i) != '"'))
32240+
{
32241+
@@ -942,7 +944,7 @@ public class Configuration
32242+
}
32243+
32244+
Property prop = new Property(name, line.substring(i + 1), type, true);
32245+
- i = line.length();
32246+
+ i = line.length();line_sS=line.length();
32247+
32248+
currentCat.put(name, prop);
32249+
32250+
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/common/config/Property.java ./eclipse/cauldron/src/main/java/net/minecraftforge/common/config/Property.java
32251+
index 8616986..312140f 100644
32252+
--- ./eclipse/Clean/src/main/java/net/minecraftforge/common/config/Property.java
32253+
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/common/config/Property.java
32254+
@@ -843,9 +843,10 @@ public class Property
32255+
catch (NumberFormatException e){}
32256+
}
32257+
32258+
- int[] primitives = new int[nums.size()];
32259+
+ int nums_sS=nums.size();
32260+
+ int[] primitives = new int[nums_sS];
32261+
32262+
- for (int i = 0; i < nums.size(); i++)
32263+
+ for (int i = 0; i < nums_sS; i++)
32264+
{
32265+
primitives[i] = nums.get(i);
32266+
}
32267+
@@ -892,9 +893,10 @@ public class Property
32268+
catch (NumberFormatException e){}
32269+
}
32270+
32271+
- boolean[] primitives = new boolean[tmp.size()];
32272+
+ int temp_sS=tmp.size();
32273+
+ boolean[] primitives = new boolean[temp_sS];
32274+
32275+
- for (int i = 0; i < tmp.size(); i++)
32276+
+ for (int i = 0; i < temp_sS; i++)
32277+
{
32278+
primitives[i] = tmp.get(i);
32279+
}
32280+
@@ -938,9 +940,10 @@ public class Property
32281+
catch (NumberFormatException e) {}
32282+
}
32283+
32284+
- double[] primitives = new double[tmp.size()];
32285+
+ int temp_sS=tmp.size();
32286+
+ double[] primitives = new double[temp_sS];
32287+
32288+
- for (int i = 0; i < tmp.size(); i++)
32289+
+ for (int i = 0; i < temp_sS; i++)
32290+
{
32291+
primitives[i] = tmp.get(i);
32292+
}
3214332293
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java ./eclipse/cauldron/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java
3214432294
index d00bd91..c024c87 100644
3214532295
--- ./eclipse/Clean/src/main/java/net/minecraftforge/common/network/ForgeNetworkHandler.java
@@ -32529,8 +32679,22 @@ index 2c8e01e..9c66d5a 100644
3252932679
}
3253032680
}
3253132681

32682+
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/oredict/OreDictionary.java ./eclipse/cauldron/src/main/java/net/minecraftforge/oredict/OreDictionary.java
32683+
index fcc3f34..1da8c4b 100644
32684+
--- ./eclipse/Clean/src/main/java/net/minecraftforge/oredict/OreDictionary.java
32685+
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/oredict/OreDictionary.java
32686+
@@ -576,7 +576,8 @@ public class OreDictionary
32687+
{
32688+
//System.out.println("Baking OreDictionary:");
32689+
stackToId.clear();
32690+
- for (int id = 0; id < idToStack.size(); id++)
32691+
+ int idToStack_sS=idToStack.size();
32692+
+ for (int id = 0; id < idToStack_sS; id++)
32693+
{
32694+
List<ItemStack> ores = idToStack.get(id);
32695+
if (ores == null) continue;
3253232696
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java ./eclipse/cauldron/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java
32533-
index 100acef..fb419ba 100644
32697+
index 100acef..d7bd5c3 100644
3253432698
--- ./eclipse/Clean/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java
3253532699
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java
3253632700
@@ -6,6 +6,10 @@ import java.util.Iterator;
@@ -32560,15 +32724,59 @@ index 100acef..fb419ba 100644
3256032724

3256132725
public ShapedOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); }
3256232726
public ShapedOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); }
32563-
@@ -127,6 +133,7 @@ public class ShapedOreRecipe implements IRecipe
32727+
@@ -51,34 +57,39 @@ public class ShapedOreRecipe implements IRecipe
32728+
if (recipe[idx] instanceof String[])
32729+
{
32730+
String[] parts = ((String[])recipe[idx++]);
32731+
+ StringBuilder shapeSB = new StringBuilder(shape);
32732+
32733+
for (String s : parts)
32734+
{
32735+
width = s.length();
32736+
- shape += s;
32737+
+ shapeSB.append(s);
32738+
}
32739+
32740+
+ shape=String.valueOf(shapeSB);
32741+
height = parts.length;
32742+
}
32743+
else
32744+
{
32745+
+ StringBuilder shapeSB = new StringBuilder(shape);
32746+
while (recipe[idx] instanceof String)
32747+
{
32748+
String s = (String)recipe[idx++];
32749+
- shape += s;
32750+
+ shapeSB.append(s);
32751+
width = s.length();
32752+
height++;
32753+
}
32754+
+ shape=String.valueOf(shapeSB);
32755+
}
32756+
32757+
if (width * height != shape.length())
32758+
{
32759+
String ret = "Invalid shaped ore recipe: ";
32760+
+ StringBuilder retSB = new StringBuilder(ret);
32761+
for (Object tmp : recipe)
32762+
{
32763+
- ret += tmp + ", ";
32764+
+ retSB.append(tmp).append(", ");
32765+
}
32766+
- ret += output;
32767+
+ retSB.append(output); ret = String.valueOf(retSB);
32768+
throw new RuntimeException(ret);
32769+
}
32770+
32771+
@@ -127,6 +138,7 @@ public class ShapedOreRecipe implements IRecipe
3256432772

3256532773
ShapedOreRecipe(ShapedRecipes recipe, Map<ItemStack, String> replacements)
3256632774
{
3256732775
+ vanillaRecipe = recipe; // Cauldron - bukkit compatibility
3256832776
output = recipe.getRecipeOutput();
3256932777
width = recipe.recipeWidth;
3257032778
height = recipe.recipeHeight;
32571-
@@ -255,4 +262,13 @@ public class ShapedOreRecipe implements IRecipe
32779+
@@ -255,4 +267,13 @@ public class ShapedOreRecipe implements IRecipe
3257232780
{
3257332781
return this.input;
3257432782
}
@@ -32584,7 +32792,7 @@ index 100acef..fb419ba 100644
3258432792
}
3258532793
\ No newline at end of file
3258632794
diff --git ./eclipse/Clean/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java ./eclipse/cauldron/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java
32587-
index f4060ed..f1e1845 100644
32795+
index f4060ed..c38e846 100644
3258832796
--- ./eclipse/Clean/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java
3258932797
+++ ./eclipse/cauldron/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java
3259032798
@@ -6,6 +6,10 @@ import java.util.Map;
@@ -32612,15 +32820,30 @@ index f4060ed..f1e1845 100644
3261232820

3261332821
public ShapelessOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); }
3261432822
public ShapelessOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); }
32615-
@@ -59,6 +65,7 @@ public class ShapelessOreRecipe implements IRecipe
32823+
@@ -46,11 +52,12 @@ public class ShapelessOreRecipe implements IRecipe
32824+
else
32825+
{
32826+
String ret = "Invalid shapeless ore recipe: ";
32827+
+ StringBuilder retSB = new StringBuilder(ret);
32828+
for (Object tmp : recipe)
32829+
{
32830+
- ret += tmp + ", ";
32831+
+ retSB.append(tmp).append(", ");
32832+
}
32833+
- ret += output;
32834+
+ retSB.append(output); ret = String.valueOf(retSB);
32835+
throw new RuntimeException(ret);
32836+
}
32837+
}
32838+
@@ -59,6 +66,7 @@ public class ShapelessOreRecipe implements IRecipe
3261632839
@SuppressWarnings("unchecked")
3261732840
ShapelessOreRecipe(ShapelessRecipes recipe, Map<ItemStack, String> replacements)
3261832841
{
3261932842
+ vanillaRecipe = recipe; // Cauldron - bukkit compatibility
3262032843
output = recipe.getRecipeOutput();
3262132844

3262232845
for(ItemStack ingred : ((List<ItemStack>)recipe.recipeItems))
32623-
@@ -146,4 +153,13 @@ public class ShapelessOreRecipe implements IRecipe
32846+
@@ -146,4 +154,13 @@ public class ShapelessOreRecipe implements IRecipe
3262432847
{
3262532848
return this.input;
3262632849
}

‎src/main/java/net/minecraftforge/cauldron/CauldronHooks.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,8 @@ public static void writeChunks(File file, boolean logAll)
367367
TObjectIntHashMap<ChunkCoordIntPair> chunkTileCounts = new TObjectIntHashMap<ChunkCoordIntPair>();
368368
TObjectIntHashMap<Class> classTileCounts = new TObjectIntHashMap<Class>();
369369
writer.name("tiles").beginArray();
370-
for (int i = 0; i < world.loadedTileEntityList.size(); i++)
370+
int world_loadedTileEntityList_sS=world.loadedTileEntityList.size();
371+
for (int i = 0; i < world_loadedTileEntityList_sS; i++)
371372
{
372373
TileEntity tile = (TileEntity) world.loadedTileEntityList.get(i);
373374
if (logAll)

‎src/main/java/net/minecraftforge/cauldron/command/CauldronCommand.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public boolean execute(CommandSender sender, String commandLabel, String[] args)
6363
if ((args.length == 1) && "reload".equalsIgnoreCase(args[0]))
6464
{
6565
MinecraftServer.getServer().cauldronConfig.load();
66-
for (int i = 0; i < MinecraftServer.getServer().worlds.size(); i++)
66+
int worlds_sS=MinecraftServer.getServer().worlds.size();
67+
for (int i = 0; i < worlds_sS; i++)
6768
{
6869
MinecraftServer.getServer().worlds.get(i).cauldronConfig.init(); // reload world configs
6970
}

‎src/main/java/net/minecraftforge/cauldron/configuration/ConfigBase.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public void save()
7878

7979
public void saveWorldConfigs()
8080
{
81-
for (int i = 0; i < MinecraftServer.getServer().worlds.size(); ++i)
81+
int worlds_sS=MinecraftServer.getServer().worlds.size();
82+
for (int i = 0; i < worlds_sS; ++i)
8283
{
8384
WorldServer worldserver = MinecraftServer.getServer().worlds.get(i);
8485

‎src/main/java/org/bukkit/craftbukkit/CraftServer.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,8 @@ public WorldMetadataStore getWorldMetadata() {
14591459

14601460
public void detectListNameConflict(net.minecraft.entity.player.EntityPlayerMP entityPlayer) {
14611461
// Collisions will make for invisible people
1462-
for (int i = 0; i < getHandle().playerEntityList.size(); ++i) {
1462+
int getHandle_playerEntityList_sS=getHandle().playerEntityList.size();
1463+
for (int i = 0; i < getHandle_playerEntityList_sS; ++i) {
14631464
net.minecraft.entity.player.EntityPlayerMP testEntityPlayer = (net.minecraft.entity.player.EntityPlayerMP) getHandle().playerEntityList.get(i);
14641465

14651466
// We have a problem!

‎src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ public void setPlayerListName(String name) {
197197
}
198198

199199
// Collisions will make for invisible people
200-
for (int i = 0; i < server.getHandle().playerEntityList.size(); ++i) {
200+
int server_getHandle_playerEntityList_sS=server.getHandle().playerEntityList.size();
201+
for (int i = 0; i < server_getHandle_playerEntityList_sS; ++i) {
201202
if (((net.minecraft.entity.player.EntityPlayerMP) server.getHandle().playerEntityList.get(i)).listName.equals(name)) {
202203
throw new IllegalArgumentException(name + " is already assigned as a player list name for someone");
203204
}
@@ -208,7 +209,8 @@ public void setPlayerListName(String name) {
208209
// Change the name on the client side
209210
net.minecraft.network.play.server.S38PacketPlayerListItem oldpacket = new net.minecraft.network.play.server.S38PacketPlayerListItem(oldName, false, 9999);
210211
net.minecraft.network.play.server.S38PacketPlayerListItem packet = new net.minecraft.network.play.server.S38PacketPlayerListItem(name, true, getHandle().ping);
211-
for (int i = 0; i < server.getHandle().playerEntityList.size(); ++i) {
212+
server_getHandle_playerEntityList_sS=server.getHandle().playerEntityList.size();
213+
for (int i = 0; i < server_getHandle_playerEntityList_sS; ++i) {
212214
net.minecraft.entity.player.EntityPlayerMP entityplayer = (net.minecraft.entity.player.EntityPlayerMP) server.getHandle().playerEntityList.get(i);
213215
if (entityplayer.playerNetServerHandler == null) continue;
214216

‎src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ public static BlockMultiPlaceEvent callBlockMultiPlaceEvent(net.minecraft.world.
116116
Block blockClicked = craftWorld.getBlockAt(clickedX, clickedY, clickedZ);
117117

118118
boolean canBuild = true;
119-
for (int i = 0; i < blockStates.size(); i++) {
119+
int blockStates_sS=blockStates.size();
120+
for (int i = 0; i < blockStates_sS; i++) {
120121
if (!canBuild(craftWorld, player, blockStates.get(i).getX(), blockStates.get(i).getZ())) {
121122
canBuild = false;
122123
break;

0 commit comments

Comments
 (0)