Skip to content

Commit dcff3ed

Browse files
jrbuddajrbudda
committed
b18
1 parent 0222ff1 commit dcff3ed

71 files changed

Lines changed: 2233 additions & 1854 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎installer/Installer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ public class Installer extends JPanel implements PropertyChangeListener
5959
private static final String MC_VERSION = "1.16.1";
6060
private static final String MC_MD5 = "9b94beec05c9580343f663165fa53d3f";
6161
private static final String OF_LIB_PATH = "libraries/optifine/OptiFine/";
62-
private static final String OF_FILE_NAME = "1.16.1_HD_U_G2_pre3";
63-
private static final String OF_MD5 = "e93ad02cc2a06ddbfb5843d9fba7c0a2";
62+
private static final String OF_FILE_NAME = "1.16.1_HD_U_G2_pre10";
63+
private static final String OF_MD5 = "6addbd1d567a82a3545f079d2deb2a7c";
6464
private static final String OF_VERSION_EXT = ".jar";
65-
private static String FORGE_VERSION = "32.0.63";
65+
private static String FORGE_VERSION = "32.0.75";
6666
/* END OF DO NOT RENAME */
6767

6868
private static final String DEFAULT_PROFILE_NAME = "Vivecraft " + MINECRAFT_VERSION;
@@ -1629,7 +1629,7 @@ private void updateInstructions(){
16291629
ramAllocation.setEnabled(createProfile.isSelected());
16301630
txtCustomForgeVersion.setEnabled(optCustomForgeVersion.isSelected());
16311631
txtCustomForgeVersion.setVisible(useForge.isSelected());
1632-
optCustomForgeVersion.setVisible(false);
1632+
optCustomForgeVersion.setVisible(useForge.isSelected());
16331633
this.revalidate();
16341634
}
16351635

‎installer/vivecraft-forge.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,28 @@
7575
}
7676
}
7777
},
78+
{
79+
"name": "org.ow2.asm:asm-util:7.2",
80+
"downloads": {
81+
"artifact": {
82+
"path": "org/ow2/asm/asm-util/7.2/asm-util-7.2.jar",
83+
"url": "https://files.minecraftforge.net/maven/org/ow2/asm/asm-util/7.2/asm-util-7.2.jar",
84+
"sha1": "a3ae34e57fa8a4040e28247291d0cc3d6b8c7bcf",
85+
"size": 80707
86+
}
87+
}
88+
},
89+
{
90+
"name": "org.ow2.asm:asm-analysis:7.2",
91+
"downloads": {
92+
"artifact": {
93+
"path": "org/ow2/asm/asm-analysis/7.2/asm-analysis-7.2.jar",
94+
"url": "https://files.minecraftforge.net/maven/org/ow2/asm/asm-analysis/7.2/asm-analysis-7.2.jar",
95+
"sha1": "b6e6abe057f23630113f4167c34bda7086691258",
96+
"size": 33444
97+
}
98+
}
99+
},
78100
{
79101
"name": "cpw.mods:modlauncher:5.1.0",
80102
"downloads": {
@@ -250,6 +272,17 @@
250272
"size": 78146
251273
}
252274
}
275+
},
276+
{
277+
"name": "org.spongepowered:mixin:0.8",
278+
"downloads": {
279+
"artifact": {
280+
"path": "org/spongepowered/mixin/0.8/mixin-0.8.jar",
281+
"url": "https://files.minecraftforge.net/maven/org/spongepowered/mixin/0.8/mixin-0.8.jar",
282+
"sha1": "dbe9e5db694a7c3cd644d5bb98f8a21295c75048",
283+
"size": 931239
284+
}
285+
}
253286
},
254287
{
255288
"name": "optifine:OptiFine:$OFVERSION"

‎mcppatches/patches/net/minecraft/client/gui/overlay/DebugOverlayGui.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.Map.Entry;
99
import java.util.concurrent.CompletableFuture;
1010
import java.util.stream.Collectors;
11-
@@ -542,7 +543,7 @@
11+
@@ -565,7 +566,7 @@
1212
{
1313
list.add("");
1414

‎mcppatches/patches/net/minecraft/client/renderer/FluidBlockRenderer.java.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
try
1111
{
1212
@@ -139,7 +139,7 @@
13-
float f35 = (float)(i >> 16 & 255) / 255.0F;
13+
float f28 = (float)(i >> 16 & 255) / 255.0F;
1414
float f1 = (float)(i >> 8 & 255) / 255.0F;
1515
float f2 = (float)(i & 255) / 255.0F;
1616
- boolean flag7 = false;
1717
+ flag7 = false;
1818
float f3 = lightReaderIn.func_230487_a_(Direction.DOWN, true);
1919
float f4 = lightReaderIn.func_230487_a_(Direction.UP, true);
2020
float f5 = lightReaderIn.func_230487_a_(Direction.NORTH, true);
21-
@@ -405,7 +405,7 @@
21+
@@ -421,7 +421,7 @@
2222
return flag7;
2323
}
2424

@@ -27,7 +27,7 @@
2727
}
2828
finally
2929
{
30-
@@ -415,7 +415,7 @@
30+
@@ -431,7 +431,7 @@
3131
}
3232
}
3333

‎mcppatches/patches/net/minecraft/client/renderer/RenderType.java.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/client/renderer/RenderType.java
22
+++ b/net/minecraft/client/renderer/RenderType.java
3-
@@ -120,9 +120,10 @@
3+
@@ -121,9 +121,10 @@
44
public static RenderType func_239263_a_(ResourceLocation p_239263_0_)
55
{
66
p_239263_0_ = getCustomTexture(p_239263_0_);
@@ -12,7 +12,7 @@
1212
return makeType("armor_cutout_no_cull", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
1313
});
1414
}
15-
@@ -130,9 +131,10 @@
15+
@@ -131,9 +132,10 @@
1616
public static RenderType getEntitySolid(ResourceLocation locationIn)
1717
{
1818
locationIn = getCustomTexture(locationIn);
@@ -24,7 +24,7 @@
2424
return makeType("entity_solid", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
2525
});
2626
}
27-
@@ -140,9 +142,10 @@
27+
@@ -141,9 +143,10 @@
2828
public static RenderType getEntityCutout(ResourceLocation locationIn)
2929
{
3030
locationIn = getCustomTexture(locationIn);
@@ -36,7 +36,7 @@
3636
return makeType("entity_cutout", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
3737
});
3838
}
39-
@@ -150,9 +153,10 @@
39+
@@ -151,9 +154,10 @@
4040
public static RenderType func_230167_a_(ResourceLocation p_230167_0_, boolean p_230167_1_)
4141
{
4242
p_230167_0_ = getCustomTexture(p_230167_0_);
@@ -48,7 +48,7 @@
4848
return makeType("entity_cutout_no_cull", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
4949
});
5050
}
51-
@@ -165,9 +169,10 @@
51+
@@ -166,9 +170,10 @@
5252
public static RenderType func_239266_b_(ResourceLocation p_239266_0_, boolean p_239266_1_)
5353
{
5454
p_239266_0_ = getCustomTexture(p_239266_0_);
@@ -60,7 +60,7 @@
6060
return makeType("entity_cutout_no_cull_z_offset", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
6161
});
6262
}
63-
@@ -180,9 +185,10 @@
63+
@@ -181,9 +186,10 @@
6464
public static RenderType func_239268_f_(ResourceLocation p_239268_0_)
6565
{
6666
p_239268_0_ = getCustomTexture(p_239268_0_);
@@ -72,7 +72,7 @@
7272
return makeType("item_entity_translucent_cull", DefaultVertexFormats.ENTITY, 7, 256, true, true, rendertype$state);
7373
});
7474
}
75-
@@ -190,19 +196,20 @@
75+
@@ -191,19 +197,20 @@
7676
public static RenderType getEntityTranslucentCull(ResourceLocation locationIn)
7777
{
7878
locationIn = getCustomTexture(locationIn);
@@ -97,7 +97,7 @@
9797
return makeType("entity_translucent", DefaultVertexFormats.ENTITY, 7, 256, true, true, rendertype$state);
9898
});
9999
}
100-
@@ -214,80 +221,80 @@
100+
@@ -215,80 +222,80 @@
101101

102102
public static RenderType getEntitySmoothCutout(ResourceLocation locationIn)
103103
{

‎mcppatches/patches/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
--- a/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
22
+++ b/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
3-
@@ -986,7 +986,7 @@
3+
@@ -988,7 +988,7 @@
44
Random random = new Random();
55
BlockRendererDispatcher blockrendererdispatcher = Minecraft.getInstance().getBlockRendererDispatcher();
66

77
- for (BlockPosM blockposm : BlockPosM.getAllInBoxMutable(blockpos, blockpos1))
88
+ for (BlockPosM blockposm : (Iterable<BlockPosM>)BlockPosM.getAllInBoxMutable(blockpos, blockpos1))
99
{
1010
BlockState blockstate = chunkcacheof.getBlockState(blockposm);
11-
Block block = blockstate.getBlock();
12-
@@ -1093,7 +1093,7 @@
13-
14-
if (ChunkRenderDispatcher.FORGE_SET_RENDER_LAYER)
15-
{
16-
- Reflector.callVoid(Reflector.ForgeHooksClient_setRenderLayer, null);
17-
+ Reflector.callVoid(Reflector.ForgeHooksClient_setRenderLayer, (Object[])null);
18-
}
19-
}
2011

‎mcppatches/patches/net/minecraft/client/renderer/entity/layers/MooshroomMushroomLayer.java.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
--- a/net/minecraft/client/renderer/entity/layers/MooshroomMushroomLayer.java
22
+++ b/net/minecraft/client/renderer/entity/layers/MooshroomMushroomLayer.java
33
@@ -31,7 +31,7 @@
4-
public MooshroomMushroomLayer(IEntityRenderer<T, CowModel<T>> p_i250_1_)
4+
public MooshroomMushroomLayer(IEntityRenderer<T, CowModel<T>> p_i252_1_)
55
{
6-
super(p_i250_1_);
7-
- MooshroomRenderer mooshroomrenderer = (MooshroomRenderer)p_i250_1_;
8-
+ IEntityRenderer<T, CowModel<T>> mooshroomrenderer = p_i250_1_;
6+
super(p_i252_1_);
7+
- MooshroomRenderer mooshroomrenderer = (MooshroomRenderer)p_i252_1_;
8+
+ IEntityRenderer<T, CowModel<T>> mooshroomrenderer = p_i252_1_;
99
this.modelRendererMushroom = new ModelRenderer(mooshroomrenderer.getEntityModel());
1010
this.modelRendererMushroom.setTextureSize(16, 16);
1111
this.modelRendererMushroom.rotationPointX = -6.0F;

‎mcppatches/patches/net/minecraft/client/renderer/texture/AtlasTexture.java.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{
1919
TextureAtlasSprite textureatlassprite6 = textureatlassprite3.spriteSpecular;
2020

21-
@@ -752,7 +752,7 @@
21+
@@ -778,7 +778,7 @@
2222
}
2323
else
2424
{
@@ -27,7 +27,7 @@
2727
map.put(j, k + 1);
2828
}
2929
}
30-
@@ -765,12 +765,12 @@
30+
@@ -791,12 +791,12 @@
3131
}
3232

3333
int l = 0;
@@ -43,7 +43,7 @@
4343
l += l1;
4444
}
4545

46-
@@ -780,7 +780,7 @@
46+
@@ -806,7 +806,7 @@
4747

4848
for (int j2 : set1)
4949
{

‎mcppatches/patches/net/minecraft/world/SerializableTickList.java.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
+++ b/net/minecraft/world/SerializableTickList.java
33
@@ -18,7 +18,7 @@
44
{
5-
this(p_i2386_1_, p_i2386_2_.stream().map((p_234854_2_) ->
5+
this(p_i2387_1_, p_i2387_2_.stream().map((p_234854_2_) ->
66
{
7-
- return new SerializableTickList.TickHolder(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2386_3_), p_234854_2_.priority);
8-
+ return new SerializableTickList.TickHolder<>(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2386_3_), p_234854_2_.priority);
7+
- return new SerializableTickList.TickHolder(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2387_3_), p_234854_2_.priority);
8+
+ return new SerializableTickList.TickHolder<>(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2387_3_), p_234854_2_.priority);
99
}).collect(Collectors.toList()));
1010
}
1111

‎mcppatches/patches/net/minecraft/world/biome/Biome.java.patch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
}));
3232
private final String name;
3333
@@ -885,11 +880,6 @@
34-
this.name = p_i1933_3_;
34+
this.name = p_i1934_3_;
3535
}
3636

3737
- public String getName()

0 commit comments

Comments
 (0)