Add a bunch of tags from the omnibus.

Fix test imports. And update patches for line numbers.
This commit is contained in:
LexManos 2019-09-03 15:38:15 -07:00
parent b5b43a5a36
commit 2c8c022034
122 changed files with 1122 additions and 61 deletions

View File

@ -1,6 +1,6 @@
--- a/net/minecraft/block/CropsBlock.java
+++ b/net/minecraft/block/CropsBlock.java
@@ -59,12 +59,14 @@
@@ -57,12 +57,14 @@
public void func_196267_b(BlockState p_196267_1_, World p_196267_2_, BlockPos p_196267_3_, Random p_196267_4_) {
super.func_196267_b(p_196267_1_, p_196267_2_, p_196267_3_, p_196267_4_);
@ -16,7 +16,7 @@
}
}
}
@@ -93,9 +95,9 @@
@@ -91,9 +93,9 @@
for(int j = -1; j <= 1; ++j) {
float f1 = 0.0F;
BlockState blockstate = p_180672_1_.func_180495_p(blockpos.func_177982_a(i, 0, j));
@ -28,7 +28,7 @@
f1 = 3.0F;
}
}
@@ -131,7 +133,7 @@
@@ -129,7 +131,7 @@
}
public void func_196262_a(BlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) {

View File

@ -52,7 +52,7 @@
while(i > 0) {
int j = ExperienceOrbEntity.func_70527_a(i);
i -= j;
@@ -395,7 +401,7 @@
@@ -395,7 +405,7 @@
}
}
@ -61,7 +61,7 @@
for(int k = 0; k < 20; ++k) {
double d2 = this.field_70146_Z.nextGaussian() * 0.02D;
@@ -590,7 +596,7 @@
@@ -590,7 +600,7 @@
Effect effect = iterator.next();
EffectInstance effectinstance = this.field_70713_bf.get(effect);
if (!effectinstance.func_76455_a(this)) {
@ -397,7 +397,7 @@
this.func_184602_cy();
}
@@ -2532,6 +2588,11 @@
@@ -2532,7 +2588,11 @@
public void func_184597_cx() {
if (!this.field_184627_bm.func_190926_b()) {

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:end_stone"
]
}

View File

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#forge:glass/colorless",
"#forge:stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:black_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:blue_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:brown_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:cyan_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gray_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:green_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_blue_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_gray_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:lime_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:magenta_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:orange_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:pink_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:purple_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:red_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:white_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:yellow_stained_glass"
]
}

View File

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#forge:glass_panes/colorless",
"#forge:stained_glass_panes"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:black_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:blue_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:brown_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:cyan_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gray_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:green_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_blue_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_gray_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:lime_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:magenta_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:orange_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:pink_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:purple_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:red_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:white_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:yellow_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gravel"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:netherrack"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:obsidian"
]
}

View File

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#forge:sand/colorless",
"#forge:sand/red"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:sand"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:red_sand"
]
}

View File

@ -0,0 +1,13 @@
{
"replace": false,
"values": [
"minecraft:sandstone",
"minecraft:cut_sandstone",
"minecraft:chiseled_sandstone",
"minecraft:smooth_sandstone",
"minecraft:red_sandstone",
"minecraft:cut_red_sandstone",
"minecraft:chiseled_red_sandstone",
"minecraft:smooth_red_sandstone"
]
}

View File

@ -0,0 +1,21 @@
{
"replace": false,
"values": [
"minecraft:white_stained_glass",
"minecraft:orange_stained_glass",
"minecraft:magenta_stained_glass",
"minecraft:light_blue_stained_glass",
"minecraft:yellow_stained_glass",
"minecraft:lime_stained_glass",
"minecraft:pink_stained_glass",
"minecraft:gray_stained_glass",
"minecraft:light_gray_stained_glass",
"minecraft:cyan_stained_glass",
"minecraft:purple_stained_glass",
"minecraft:blue_stained_glass",
"minecraft:brown_stained_glass",
"minecraft:green_stained_glass",
"minecraft:red_stained_glass",
"minecraft:black_stained_glass"
]
}

View File

@ -0,0 +1,21 @@
{
"replace": false,
"values": [
"minecraft:white_stained_glass_pane",
"minecraft:orange_stained_glass_pane",
"minecraft:magenta_stained_glass_pane",
"minecraft:light_blue_stained_glass_pane",
"minecraft:yellow_stained_glass_pane",
"minecraft:lime_stained_glass_pane",
"minecraft:pink_stained_glass_pane",
"minecraft:gray_stained_glass_pane",
"minecraft:light_gray_stained_glass_pane",
"minecraft:cyan_stained_glass_pane",
"minecraft:purple_stained_glass_pane",
"minecraft:blue_stained_glass_pane",
"minecraft:brown_stained_glass_pane",
"minecraft:green_stained_glass_pane",
"minecraft:red_stained_glass_pane",
"minecraft:black_stained_glass_pane"
]
}

View File

@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"minecraft:arrow",
"minecraft:tipped_arrow",
"minecraft:spectral_arrow"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:bone"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:bookshelf"
]
}

View File

@ -0,0 +1,10 @@
{
"replace": false,
"values": [
"#forge:crops/beetroot",
"#forge:crops/carrot",
"#forge:crops/nether_wart",
"#forge:crops/potatoe",
"#forge:crops/wheat"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:beetroot"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:carrot"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:nether_wart"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:potato"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:wheat"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:egg"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:end_stone"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:ender_pearl"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:feather"
]
}

View File

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#forge:glass/colorless",
"#forge:stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:black_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:blue_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:brown_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:cyan_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gray_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:green_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_blue_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_gray_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:lime_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:magenta_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:orange_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:pink_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:purple_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:red_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:white_stained_glass"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:yellow_stained_glass"
]
}

View File

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#forge:glass_panes/colorless",
"#forge:stained_glass_panes"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:black_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:blue_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:brown_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:cyan_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gray_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:green_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_blue_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:light_gray_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:lime_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:magenta_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:orange_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:pink_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:purple_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:red_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:white_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:yellow_stained_glass_pane"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gravel"
]
}

View File

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:gunpowder"
]
}

View File

@ -0,0 +1,11 @@
{
"replace": false,
"values": [
"minecraft:creeper_head",
"minecraft:dragon_head",
"minecraft:player_head",
"minecraft:skeleton_skull",
"minecraft:wither_skeleton_skull",
"minecraft:zombie_head"
]
}

Some files were not shown because too many files have changed in this diff Show More