diff --git a/assets/hbm/models/chemplant.obj b/assets/hbm/models/chemplant.obj new file mode 100644 index 000000000..05fd844f9 --- /dev/null +++ b/assets/hbm/models/chemplant.obj @@ -0,0 +1,1295 @@ +# Blender v2.76 (sub 0) OBJ File: 'chemplant.blend' +# www.blender.org +o Cube.001_Cube.002 +v 0.427500 2.000000 -0.427500 +v 0.427500 2.000000 -0.822500 +v 0.822500 2.000000 -0.427500 +v 0.822500 2.000000 -0.822500 +v 0.427500 2.150000 -0.427500 +v 0.427500 2.150000 -0.822500 +v 0.822500 2.150000 -0.822500 +v 0.822500 2.150000 -0.427500 +v 0.476875 2.000000 -0.476875 +v 0.476875 2.000000 -0.773125 +v 0.773125 2.000000 -0.773125 +v 0.773125 2.000000 -0.476875 +v 0.476875 1.500000 -0.476875 +v 0.476875 1.500000 -0.773125 +v 0.773125 1.500000 -0.773125 +v 0.773125 1.500000 -0.476875 +v -0.822500 2.000000 -0.427500 +v -0.822500 2.000000 -0.822500 +v -0.427500 2.000000 -0.427500 +v -0.427500 2.000000 -0.822500 +v -0.822500 2.150000 -0.427500 +v -0.822500 2.150000 -0.822500 +v -0.427500 2.150000 -0.822500 +v -0.427500 2.150000 -0.427500 +v -0.773125 2.000000 -0.476875 +v -0.773125 2.000000 -0.773125 +v -0.476875 2.000000 -0.773125 +v -0.476875 2.000000 -0.476875 +v -0.773125 1.500000 -0.476875 +v -0.773125 1.500000 -0.773125 +v -0.476875 1.500000 -0.773125 +v -0.476875 1.500000 -0.476875 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +s off +f 3//1 12//1 11//1 +f 7//2 6//2 5//2 +f 4//3 7//3 8//3 +f 1//4 5//4 6//4 +f 3//5 8//5 5//5 +f 2//6 6//6 7//6 +f 9//5 13//5 16//5 +f 2//1 10//1 9//1 +f 1//1 9//1 12//1 +f 4//1 11//1 10//1 +f 13//1 14//1 15//1 +f 11//6 15//6 14//6 +f 12//3 16//3 15//3 +f 10//4 14//4 13//4 +f 19//1 28//1 27//1 +f 23//2 22//2 21//2 +f 20//3 23//3 24//3 +f 17//4 21//4 22//4 +f 19//5 24//5 21//5 +f 18//6 22//6 23//6 +f 25//5 29//5 32//5 +f 18//1 26//1 25//1 +f 17//1 25//1 28//1 +f 20//1 27//1 26//1 +f 29//1 30//1 31//1 +f 27//6 31//6 30//6 +f 28//3 32//3 31//3 +f 26//4 30//4 29//4 +f 4//1 3//1 11//1 +f 8//2 7//2 5//2 +f 3//3 4//3 8//3 +f 2//4 1//4 6//4 +f 1//5 3//5 5//5 +f 4//6 2//6 7//6 +f 12//5 9//5 16//5 +f 1//1 2//1 9//1 +f 3//1 1//1 12//1 +f 2//1 4//1 10//1 +f 16//1 13//1 15//1 +f 10//6 11//6 14//6 +f 11//3 12//3 15//3 +f 9//4 10//4 13//4 +f 20//1 19//1 27//1 +f 24//2 23//2 21//2 +f 19//3 20//3 24//3 +f 18//4 17//4 22//4 +f 17//5 19//5 21//5 +f 20//6 18//6 23//6 +f 28//5 25//5 32//5 +f 17//1 18//1 25//1 +f 19//1 17//1 28//1 +f 18//1 20//1 26//1 +f 32//1 29//1 31//1 +f 26//6 27//6 30//6 +f 27//3 28//3 31//3 +f 25//4 26//4 29//4 +o Cube_Cube.001 +v -1.500000 0.000000 1.500000 +v -1.500000 0.250000 1.500000 +v -1.500000 0.000000 -1.500000 +v -1.500000 0.250000 -1.500000 +v 1.500000 0.000000 1.500000 +v 1.500000 0.250000 1.500000 +v 1.500000 0.000000 -1.500000 +v 1.500000 0.250000 -1.500000 +v -1.250000 0.500000 1.250000 +v -1.250000 0.500000 -1.250000 +v 1.250000 0.500000 -1.250000 +v 1.250000 0.500000 1.250000 +v -1.250000 0.500000 0.000000 +v 0.000000 0.500000 -1.250000 +v 1.250000 0.500000 0.000000 +v 0.000000 0.500000 1.250000 +v 0.000000 0.500000 0.000000 +v 1.250000 0.750000 0.000000 +v 1.250000 0.750000 1.250000 +v 0.000000 0.750000 1.250000 +v 0.000000 0.750000 0.000000 +v 0.625000 0.750000 0.025000 +v 0.625000 2.750000 0.025000 +v 0.925000 0.750000 0.105385 +v 0.925000 2.750000 0.105385 +v 1.144615 0.750000 0.325000 +v 1.144615 2.750000 0.325000 +v 1.225000 0.750000 0.625000 +v 1.225000 2.750000 0.625000 +v 1.144615 0.750000 0.925000 +v 1.144615 2.750000 0.925000 +v 0.925000 0.750000 1.144615 +v 0.925000 2.750000 1.144615 +v 0.625000 0.750000 1.225000 +v 0.625000 2.750000 1.225000 +v 0.325000 0.750000 1.144615 +v 0.325000 2.750000 1.144615 +v 0.105385 0.750000 0.925000 +v 0.105385 2.750000 0.925000 +v 0.025000 0.750000 0.625000 +v 0.025000 2.750000 0.625000 +v 0.105385 0.750000 0.325000 +v 0.105385 2.750000 0.325000 +v 0.325000 0.750000 0.105385 +v 0.325000 2.750000 0.105385 +v 1.250000 0.750000 0.625000 +v 0.625000 0.750000 0.000000 +v 0.000000 0.750000 0.625000 +v 0.625000 0.750000 1.250000 +v 0.125000 0.500000 -1.125000 +v 1.125000 0.500000 -1.125000 +v 1.125000 0.500000 -0.125000 +v 0.125000 0.500000 -0.125000 +v -1.125000 0.500000 -0.125000 +v -1.125000 0.500000 -1.125000 +v -0.125000 0.500000 -1.125000 +v -0.125000 0.500000 -0.125000 +v 0.125000 0.650000 -1.125000 +v 1.125000 0.650000 -1.125000 +v 1.125000 0.650000 -0.125000 +v 0.125000 0.650000 -0.125000 +v 0.225000 0.650000 -1.025000 +v 1.025000 0.650000 -1.025000 +v 1.025000 0.650000 -0.225000 +v 0.225000 0.650000 -0.225000 +v -0.125000 0.650000 -0.125000 +v -0.125000 0.650000 -1.125000 +v -1.125000 0.650000 -1.125000 +v -1.125000 0.650000 -0.125000 +v 0.425000 2.000000 -0.425000 +v 0.825000 2.000000 -0.425000 +v 0.825000 2.000000 -0.825000 +v 0.425000 2.000000 -0.825000 +v 0.225000 1.850000 -1.025000 +v 1.025000 1.850000 -1.025000 +v 1.025000 1.850000 -0.225000 +v 0.225000 1.850000 -0.225000 +v 1.000000 2.750000 -0.024519 +v 0.625000 2.750000 -0.125000 +v 1.274519 2.750000 0.250000 +v 1.375000 2.750000 0.625000 +v 1.274519 2.750000 1.000000 +v 1.000000 2.750000 1.274519 +v 0.625000 2.750000 1.375000 +v 0.250000 2.750000 1.274519 +v -0.024519 2.750000 1.000000 +v -0.125000 2.750000 0.625000 +v -0.024519 2.750000 0.250000 +v 0.250000 2.750000 -0.024519 +v 1.000000 3.000000 -0.024519 +v 0.625000 3.000000 -0.125000 +v 1.274519 3.000000 0.250000 +v 1.375000 3.000000 0.625000 +v 1.274519 3.000000 1.000000 +v 1.000000 3.000000 1.274519 +v 0.625000 3.000000 1.375000 +v 0.250000 3.000000 1.274519 +v -0.024519 3.000000 1.000000 +v -0.125000 3.000000 0.625000 +v -0.024519 3.000000 0.250000 +v 0.250000 3.000000 -0.024519 +v -0.225000 0.650000 -1.025000 +v -0.225000 0.650000 -0.225000 +v -1.025000 0.650000 -0.225000 +v -1.025000 0.650000 -1.025000 +v -0.225000 1.850000 -1.025000 +v -0.225000 1.850000 -0.225000 +v -1.025000 1.850000 -0.225000 +v -1.025000 1.850000 -1.025000 +v -0.425000 2.000000 -0.825000 +v -0.425000 2.000000 -0.425000 +v -0.825000 2.000000 -0.425000 +v -0.825000 2.000000 -0.825000 +v -0.125000 0.500000 0.975000 +v -0.475000 0.500000 0.975000 +v -0.475000 0.500000 0.275000 +v -0.125000 0.500000 0.275000 +v -0.125000 1.250000 0.975000 +v -0.475000 1.250000 0.975000 +v -0.475000 1.250000 0.275000 +v -0.125000 1.250000 0.275000 +v -0.125000 1.500000 0.975000 +v -0.300000 1.500000 0.975000 +v -0.300000 1.500000 0.275000 +v -0.125000 1.500000 0.275000 +v -0.125000 1.500000 0.338636 +v -0.125000 1.500000 0.402273 +v -0.125000 1.500000 0.465909 +v -0.125000 1.500000 0.529545 +v -0.125000 1.500000 0.593182 +v -0.125000 1.500000 0.656818 +v -0.125000 1.500000 0.720455 +v -0.125000 1.500000 0.784091 +v -0.125000 1.500000 0.847727 +v -0.125000 1.500000 0.911364 +v -0.125000 1.650000 0.338636 +v -0.125000 1.650000 0.402273 +v -0.125000 1.650000 0.465909 +v -0.125000 1.650000 0.529545 +v -0.125000 1.650000 0.593182 +v -0.125000 1.650000 0.656818 +v -0.125000 1.650000 0.720455 +v -0.125000 1.650000 0.784091 +v -0.125000 1.650000 0.847727 +v -0.125000 1.650000 0.911364 +v -0.025000 1.750000 0.338636 +v -0.025000 1.750000 0.402273 +v -0.025000 1.750000 0.465909 +v -0.025000 1.750000 0.529545 +v -0.025000 1.750000 0.593182 +v -0.025000 1.750000 0.656818 +v -0.025000 1.750000 0.720455 +v -0.025000 1.750000 0.784091 +v -0.025000 1.750000 0.847727 +v -0.025000 1.750000 0.911364 +v 0.125000 1.750000 0.338636 +v 0.125000 1.750000 0.402273 +v 0.125000 1.750000 0.465909 +v 0.125000 1.750000 0.529545 +v 0.125000 1.750000 0.593182 +v 0.125000 1.750000 0.656818 +v 0.125000 1.750000 0.720455 +v 0.125000 1.750000 0.784091 +v 0.125000 1.750000 0.847727 +v 0.125000 1.750000 0.911364 +v 0.425000 2.000000 -0.767857 +v 0.425000 2.000000 -0.710714 +v 0.425000 2.000000 -0.653571 +v 0.425000 2.000000 -0.596429 +v 0.425000 2.000000 -0.539286 +v 0.425000 2.000000 -0.482143 +v -0.425000 2.000000 -0.767857 +v -0.425000 2.000000 -0.710714 +v -0.425000 2.000000 -0.653571 +v -0.425000 2.000000 -0.596429 +v -0.425000 2.000000 -0.539286 +v -0.425000 2.000000 -0.482143 +v 0.325000 2.121195 -0.749805 +v 0.325000 2.121195 -0.692662 +v 0.325000 2.121195 -0.635520 +v 0.325000 2.121195 -0.578377 +v 0.325000 2.121195 -0.521234 +v 0.325000 2.121195 -0.464091 +v -0.325000 2.100000 -0.767857 +v -0.325000 2.100000 -0.710714 +v -0.325000 2.100000 -0.653571 +v -0.325000 2.100000 -0.596429 +v -0.325000 2.100000 -0.539286 +v -0.325000 2.100000 -0.482143 +v 0.767857 2.000000 -0.425000 +v 0.710714 2.000000 -0.425000 +v 0.653571 2.000000 -0.425000 +v 0.596429 2.000000 -0.425000 +v 0.539286 2.000000 -0.425000 +v 0.482143 2.000000 -0.425000 +v 0.767857 2.771048 -0.425000 +v 0.710714 2.771048 -0.425000 +v 0.653571 2.771048 -0.425000 +v 0.596429 2.771048 -0.425000 +v 0.539286 2.771048 -0.425000 +v 0.482143 2.771048 -0.425000 +v 0.767857 2.871047 -0.325000 +v 0.710714 2.871047 -0.325000 +v 0.653571 2.871047 -0.325000 +v 0.596429 2.871047 -0.325000 +v 0.539286 2.871047 -0.325000 +v 0.482143 2.871047 -0.325000 +v 0.767857 2.871047 -0.075000 +v 0.710714 2.871047 -0.075000 +v 0.653571 2.871047 -0.075000 +v 0.596429 2.871047 -0.075000 +v 0.539286 2.871047 -0.075000 +v 0.482143 2.871047 -0.075000 +v -0.850000 1.200000 -0.250000 +v -0.850000 1.200000 0.350000 +v -0.814645 1.185355 -0.250000 +v -0.814645 1.185355 0.350000 +v -0.800000 1.150000 -0.250000 +v -0.800000 1.150000 0.350000 +v -0.814645 1.114645 -0.250000 +v -0.814645 1.114645 0.350000 +v -0.850000 1.100000 -0.250000 +v -0.850000 1.100000 0.350000 +v -0.885355 1.114645 -0.250000 +v -0.885355 1.114645 0.350000 +v -0.900000 1.150000 -0.250000 +v -0.900000 1.150000 0.350000 +v -0.885355 1.185355 -0.250000 +v -0.885355 1.185355 0.350000 +v -0.750000 1.150000 0.400000 +v -0.450000 1.150000 0.400000 +v -0.750000 1.114645 0.414645 +v -0.450000 1.114645 0.414645 +v -0.750000 1.100000 0.450000 +v -0.450000 1.100000 0.450000 +v -0.750000 1.114645 0.485355 +v -0.450000 1.114645 0.485355 +v -0.750000 1.150000 0.500000 +v -0.450000 1.150000 0.500000 +v -0.750000 1.185355 0.485355 +v -0.450000 1.185355 0.485355 +v -0.750000 1.200000 0.450000 +v -0.450000 1.200000 0.450000 +v -0.750000 1.185355 0.414645 +v -0.450000 1.185355 0.414645 +v -0.850000 1.000000 -0.250000 +v -0.850000 1.000000 0.350000 +v -0.814645 0.985355 -0.250000 +v -0.814645 0.985355 0.350000 +v -0.800000 0.950000 -0.250000 +v -0.800000 0.950000 0.350000 +v -0.814645 0.914645 -0.250000 +v -0.814645 0.914645 0.350000 +v -0.850000 0.900000 -0.250000 +v -0.850000 0.900000 0.350000 +v -0.885355 0.914645 -0.250000 +v -0.885355 0.914645 0.350000 +v -0.900000 0.950000 -0.250000 +v -0.900000 0.950000 0.350000 +v -0.885355 0.985355 -0.250000 +v -0.885355 0.985355 0.350000 +v -0.750000 0.950000 0.400000 +v -0.450000 0.950000 0.400000 +v -0.750000 0.914645 0.414645 +v -0.450000 0.914645 0.414645 +v -0.750000 0.900000 0.450000 +v -0.450000 0.900000 0.450000 +v -0.750000 0.914645 0.485355 +v -0.450000 0.914645 0.485355 +v -0.750000 0.950000 0.500000 +v -0.450000 0.950000 0.500000 +v -0.750000 0.985355 0.485355 +v -0.450000 0.985355 0.485355 +v -0.750000 1.000000 0.450000 +v -0.450000 1.000000 0.450000 +v -0.750000 0.985355 0.414645 +v -0.450000 0.985355 0.414645 +v -0.850000 0.800000 -0.250000 +v -0.850000 0.800000 0.350000 +v -0.814645 0.785355 -0.250000 +v -0.814645 0.785355 0.350000 +v -0.800000 0.750000 -0.250000 +v -0.800000 0.750000 0.350000 +v -0.814645 0.714645 -0.250000 +v -0.814645 0.714645 0.350000 +v -0.850000 0.700000 -0.250000 +v -0.850000 0.700000 0.350000 +v -0.885355 0.714645 -0.250000 +v -0.885355 0.714645 0.350000 +v -0.900000 0.750000 -0.250000 +v -0.900000 0.750000 0.350000 +v -0.885355 0.785355 -0.250000 +v -0.885355 0.785355 0.350000 +v -0.750000 0.750000 0.400000 +v -0.450000 0.750000 0.400000 +v -0.750000 0.714645 0.414645 +v -0.450000 0.714645 0.414645 +v -0.750000 0.700000 0.450000 +v -0.450000 0.700000 0.450000 +v -0.750000 0.714645 0.485355 +v -0.450000 0.714645 0.485355 +v -0.750000 0.750000 0.500000 +v -0.450000 0.750000 0.500000 +v -0.750000 0.785355 0.485355 +v -0.450000 0.785355 0.485355 +v -0.750000 0.800000 0.450000 +v -0.450000 0.800000 0.450000 +v -0.750000 0.785355 0.414645 +v -0.450000 0.785355 0.414645 +v 1.000000 0.250000 -0.250000 +v 1.000000 0.750000 -0.250000 +v 1.000000 0.250000 -0.750000 +v 1.000000 0.750000 -0.750000 +v 2.000000 0.000000 0.000000 +v 2.000000 1.000000 0.000000 +v 2.000000 0.000000 -1.000000 +v 2.000000 1.000000 -1.000000 +v 1.500000 1.000000 -1.000000 +v 1.500000 0.000000 -1.000000 +v 1.500000 1.000000 0.000000 +v 1.500000 0.000000 0.000000 +v 2.000000 0.875000 -0.875000 +v 2.000000 0.125000 -0.875000 +v 2.000000 0.875000 -0.125000 +v 2.000000 0.125000 -0.125000 +v 1.500000 0.687500 -0.687500 +v 1.500000 0.312500 -0.687500 +v 1.500000 0.687500 -0.312500 +v 1.500000 0.312500 -0.312500 +v -1.000000 0.250000 0.750000 +v -1.000000 0.750000 0.750000 +v -1.000000 0.250000 0.250000 +v -1.000000 0.750000 0.250000 +v -2.000000 0.000000 1.000000 +v -2.000000 1.000000 1.000000 +v -2.000000 0.000000 0.000000 +v -2.000000 1.000000 0.000000 +v -1.500000 1.000000 0.000000 +v -1.500000 0.000000 0.000000 +v -1.500000 1.000000 1.000000 +v -1.500000 0.000000 1.000000 +v -2.000000 0.875000 0.125000 +v -2.000000 0.125000 0.125000 +v -2.000000 0.875000 0.875000 +v -2.000000 0.125000 0.875000 +v -1.500000 0.687500 0.312500 +v -1.500000 0.312500 0.312500 +v -1.500000 0.687500 0.687500 +v -1.500000 0.312500 0.687500 +v 0.656250 0.343750 -2.000000 +v 0.656250 0.656250 -2.000000 +v 0.343750 0.343750 -1.150000 +v 0.343750 0.656250 -1.150000 +v 0.343750 0.343750 -2.000000 +v 0.343750 0.656250 -2.000000 +v 0.656250 0.343750 -1.150000 +v 0.656250 0.656250 -1.150000 +v 0.328125 0.671875 -1.150000 +v 0.328125 0.328125 -1.150000 +v 0.671875 0.671875 -1.150000 +v 0.671875 0.328125 -1.150000 +v 0.328125 0.671875 -1.000000 +v 0.328125 0.328125 -1.000000 +v 0.671875 0.671875 -1.000000 +v 0.671875 0.328125 -1.000000 +v -0.343750 0.343750 -2.000000 +v -0.343750 0.656250 -2.000000 +v -0.656250 0.343750 -1.150000 +v -0.656250 0.656250 -1.150000 +v -0.656250 0.343750 -2.000000 +v -0.656250 0.656250 -2.000000 +v -0.343750 0.343750 -1.150000 +v -0.343750 0.656250 -1.150000 +v -0.671875 0.671875 -1.150000 +v -0.671875 0.328125 -1.150000 +v -0.328125 0.671875 -1.150000 +v -0.328125 0.328125 -1.150000 +v -0.671875 0.671875 -1.000000 +v -0.671875 0.328125 -1.000000 +v -0.328125 0.671875 -1.000000 +v -0.328125 0.328125 -1.000000 +v -0.343750 0.343750 2.000000 +v -0.343750 0.656250 2.000000 +v -0.656250 0.343750 1.150000 +v -0.656250 0.656250 1.150000 +v -0.656250 0.343750 2.000000 +v -0.656250 0.656250 2.000000 +v -0.343750 0.343750 1.150000 +v -0.343750 0.656250 1.150000 +v -0.671875 0.671875 1.150000 +v -0.671875 0.328125 1.150000 +v -0.328125 0.671875 1.150000 +v -0.328125 0.328125 1.150000 +v -0.671875 0.671875 1.000000 +v -0.671875 0.328125 1.000000 +v -0.328125 0.671875 1.000000 +v -0.328125 0.328125 1.000000 +v 0.656250 0.343750 2.000000 +v 0.656250 0.656250 2.000000 +v 0.343750 0.343750 1.150000 +v 0.343750 0.656250 1.150000 +v 0.343750 0.343750 2.000000 +v 0.343750 0.656250 2.000000 +v 0.656250 0.343750 1.150000 +v 0.656250 0.656250 1.150000 +v 0.328125 0.671875 1.150000 +v 0.328125 0.328125 1.150000 +v 0.671875 0.671875 1.150000 +v 0.671875 0.328125 1.150000 +v 0.328125 0.671875 1.000000 +v 0.328125 0.328125 1.000000 +v 0.671875 0.671875 1.000000 +v 0.671875 0.328125 1.000000 +v 1.916667 0.250000 -1.100000 +v 1.916667 0.750000 -1.100000 +v 1.666667 0.500000 -1.100000 +v 1.916667 0.250000 0.100000 +v 1.916667 0.750000 0.100000 +v 1.666667 0.500000 0.100000 +v -1.583333 0.250000 -0.100000 +v -1.583333 0.750000 -0.100000 +v -1.833333 0.500000 -0.100000 +v -1.583333 0.250000 1.100000 +v -1.583333 0.750000 1.100000 +v -1.833333 0.500000 1.100000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.707100 0.707100 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.707100 -0.707100 +vn 0.707100 0.707100 0.000000 +vn -0.707100 0.707100 0.000000 +vn 0.258800 0.000000 -0.965900 +vn 0.707100 0.000000 -0.707100 +vn 0.965900 0.000000 -0.258800 +vn 0.965900 0.000000 0.258800 +vn 0.707100 0.000000 0.707100 +vn 0.258800 0.000000 0.965900 +vn -0.258800 0.000000 0.965900 +vn -0.707100 0.000000 0.707100 +vn -0.965900 0.000000 0.258800 +vn -0.965900 0.000000 -0.258800 +vn -0.258800 0.000000 -0.965900 +vn -0.707100 0.000000 -0.707100 +vn 0.600000 0.800000 0.000000 +vn -0.600000 0.800000 0.000000 +vn 0.000000 0.800000 -0.600000 +vn 0.000000 0.800000 0.600000 +vn -0.819200 0.573500 0.000000 +vn 0.707100 -0.707100 0.000000 +vn 0.032600 -0.999500 0.000000 +vn 0.771300 0.636400 0.000000 +vn 0.000000 0.382700 0.923900 +vn 0.382700 0.923900 0.000000 +vn 0.678600 0.281100 -0.678600 +vn -0.678600 0.281100 0.678600 +vn 0.923900 0.382700 0.000000 +vn 0.357400 0.862900 -0.357400 +vn 0.000000 -0.923900 -0.382700 +vn 0.923900 -0.382700 0.000000 +vn 0.000000 -0.382700 0.923900 +vn 0.382700 -0.923900 0.000000 +vn -0.382700 -0.923900 0.000000 +vn -0.357400 0.862900 0.357400 +vn 0.000000 -0.382700 -0.923900 +vn -0.923900 -0.382700 0.000000 +vn -0.678600 -0.281100 0.678600 +vn -0.382700 0.923900 -0.000000 +vn -0.923900 0.382700 0.000000 +vn 0.000000 -0.923900 0.382700 +vn -0.000000 0.923900 0.382700 +vn 0.000000 0.382700 -0.923900 +vn 0.678600 -0.281100 -0.678600 +vn 0.000000 0.923900 -0.382700 +vn -0.357400 -0.862900 0.357400 +vn 0.357400 -0.862900 -0.357400 +vn -0.447200 0.000000 0.894400 +vn -0.447200 0.894400 0.000000 +vn -0.447200 -0.894400 0.000000 +vn -0.447200 0.000000 -0.894400 +vn 0.351100 0.000000 -0.936300 +vn 0.351100 0.000000 0.936300 +vn 0.351100 0.936300 0.000000 +vn 0.351100 -0.936300 0.000000 +vn 0.447200 0.000000 0.894400 +vn 0.447200 0.894400 0.000000 +vn 0.447200 -0.894400 0.000000 +vn 0.447200 0.000000 -0.894400 +vn -0.351100 0.000000 -0.936300 +vn -0.351100 0.000000 0.936300 +vn -0.351100 0.936300 0.000000 +vn -0.351100 -0.936300 0.000000 +s off +f 36//7 35//7 33//7 +f 40//8 39//8 35//8 +f 38//9 37//9 39//9 +f 34//10 33//10 37//10 +f 35//11 39//11 37//11 +f 38//12 48//12 34//12 +f 42//13 87//13 88//13 +f 36//14 46//14 40//14 +f 40//15 47//15 38//15 +f 34//16 45//16 36//16 +f 48//13 146//13 147//13 +f 48//7 80//7 49//7 +f 46//13 82//13 83//13 +f 47//9 78//9 44//9 +f 49//8 79//8 47//8 +f 44//10 81//10 48//10 +f 55//17 57//17 56//17 +f 57//18 59//18 58//18 +f 59//19 61//19 60//19 +f 61//20 63//20 62//20 +f 63//21 65//21 64//21 +f 65//22 67//22 66//22 +f 67//23 69//23 68//23 +f 69//24 71//24 70//24 +f 71//25 73//25 72//25 +f 73//26 75//26 74//26 +f 71//11 118//11 119//11 +f 77//27 55//27 54//27 +f 75//28 77//28 76//28 +f 81//13 51//13 64//13 +f 81//13 66//13 68//13 +f 68//13 70//13 52//13 +f 80//13 52//13 70//13 +f 74//13 53//13 80//13 +f 76//13 53//13 74//13 +f 79//13 53//13 76//13 +f 56//13 50//13 79//13 +f 64//13 51//13 62//13 +f 78//13 60//13 62//13 +f 78//13 50//13 58//13 +f 58//13 50//13 56//13 +f 84//10 92//10 93//10 +f 43//13 83//13 84//13 +f 49//13 85//13 82//13 +f 47//13 84//13 85//13 +f 89//10 98//10 101//10 +f 49//13 89//13 86//13 +f 46//13 88//13 89//13 +f 45//13 86//13 87//13 +f 93//13 97//13 94//13 +f 82//8 90//8 91//8 +f 85//7 93//7 90//7 +f 83//9 91//9 92//9 +f 96//10 108//10 109//10 +f 91//13 95//13 96//13 +f 92//13 96//13 97//13 +f 90//13 94//13 95//13 +f 87//8 100//8 99//8 +f 88//9 99//9 98//9 +f 86//7 101//7 100//7 +f 101//13 136//13 137//13 +f 107//29 104//29 103//29 +f 201//30 106//30 109//30 +f 94//8 106//8 107//8 +f 97//7 109//7 106//7 +f 95//9 107//9 108//9 +f 106//31 105//31 104//31 +f 225//13 201//13 202//13 +f 108//32 224//32 109//32 +f 113//20 125//20 126//20 +f 69//11 117//11 118//11 +f 67//11 116//11 117//11 +f 65//11 115//11 116//11 +f 63//11 114//11 115//11 +f 61//11 113//11 114//11 +f 77//11 121//11 111//11 +f 55//11 111//11 110//11 +f 59//11 112//11 113//11 +f 77//11 75//11 120//11 +f 57//11 110//11 112//11 +f 73//11 119//11 120//11 +f 130//13 128//13 124//13 +f 120//28 132//28 133//28 +f 111//17 123//17 122//17 +f 117//24 129//24 130//24 +f 114//21 126//21 127//21 +f 121//27 133//27 123//27 +f 110//18 122//18 124//18 +f 118//25 130//25 131//25 +f 115//22 127//22 128//22 +f 112//19 124//19 125//19 +f 119//26 131//26 132//26 +f 116//23 128//23 129//23 +f 136//7 140//7 141//7 +f 98//13 135//13 136//13 +f 100//13 137//13 134//13 +f 99//13 134//13 135//13 +f 141//31 145//31 142//31 +f 135//10 139//10 140//10 +f 137//8 141//8 138//8 +f 134//9 138//9 139//9 +f 207//13 145//13 144//13 +f 206//29 139//29 138//29 +f 140//30 144//30 145//30 +f 139//32 143//32 144//32 +f 149//9 153//9 150//9 +f 49//13 149//13 146//13 +f 49//13 45//13 148//13 +f 41//13 147//13 148//13 +f 153//8 152//8 156//8 +f 147//7 151//7 152//7 +f 148//8 152//8 153//8 +f 146//10 150//10 151//10 +f 162//13 161//13 156//13 +f 150//10 154//10 155//10 +f 153//9 162//9 150//9 +f 151//33 155//33 156//33 +f 158//7 159//7 169//7 +f 179//16 178//16 168//16 +f 160//7 161//7 171//7 +f 172//7 162//7 163//7 +f 174//7 164//7 165//7 +f 176//7 166//7 167//7 +f 187//16 186//16 176//16 +f 185//16 184//16 174//16 +f 183//16 182//16 172//16 +f 181//16 180//16 170//16 +f 189//13 188//13 178//13 +f 191//13 190//13 180//13 +f 193//13 192//13 182//13 +f 195//13 194//13 184//13 +f 197//13 196//13 186//13 +f 208//34 220//34 221//34 +f 206//34 218//34 219//34 +f 204//34 216//34 217//34 +f 217//35 216//35 210//35 +f 219//35 218//35 212//35 +f 221//35 220//35 214//35 +f 214//36 215//36 203//36 +f 212//36 213//36 201//36 +f 210//36 211//36 199//36 +f 239//14 238//14 232//14 +f 237//14 236//14 230//14 +f 235//14 234//14 228//14 +f 228//8 222//8 223//8 +f 230//8 224//8 225//8 +f 232//8 226//8 227//8 +f 245//13 244//13 238//13 +f 243//13 242//13 236//13 +f 241//13 240//13 234//13 +f 271//37 273//37 272//37 +f 247//38 249//38 248//38 +f 251//39 249//39 276//39 +f 272//40 261//40 259//40 +f 249//41 251//41 250//41 +f 247//42 274//42 276//42 +f 265//43 267//43 266//43 +f 251//44 253//44 252//44 +f 269//45 271//45 270//45 +f 253//46 255//46 254//46 +f 255//47 257//47 256//47 +f 274//48 247//48 261//48 +f 263//49 265//49 264//49 +f 257//50 259//50 258//50 +f 257//51 268//51 270//51 +f 261//52 247//52 246//52 +f 259//53 261//53 260//53 +f 267//54 269//54 268//54 +f 273//55 275//55 274//55 +f 277//56 263//56 262//56 +f 251//57 262//57 264//57 +f 275//58 277//58 276//58 +f 268//59 257//59 255//59 +f 253//60 264//60 266//60 +f 303//37 305//37 304//37 +f 279//38 281//38 280//38 +f 283//39 281//39 308//39 +f 304//40 293//40 291//40 +f 281//41 283//41 282//41 +f 279//42 306//42 308//42 +f 297//43 299//43 298//43 +f 283//44 285//44 284//44 +f 301//45 303//45 302//45 +f 285//46 287//46 286//46 +f 287//47 289//47 288//47 +f 306//48 279//48 293//48 +f 295//49 297//49 296//49 +f 289//50 291//50 290//50 +f 289//51 300//51 302//51 +f 293//52 279//52 278//52 +f 291//53 293//53 292//53 +f 299//54 301//54 300//54 +f 305//55 307//55 306//55 +f 309//56 295//56 294//56 +f 283//57 294//57 296//57 +f 307//58 309//58 308//58 +f 298//59 300//59 289//59 +f 285//60 296//60 298//60 +f 335//37 337//37 336//37 +f 311//38 313//38 312//38 +f 315//39 313//39 340//39 +f 336//40 325//40 323//40 +f 313//41 315//41 314//41 +f 311//42 338//42 340//42 +f 329//43 331//43 330//43 +f 315//44 317//44 316//44 +f 333//45 335//45 334//45 +f 317//46 319//46 318//46 +f 319//47 321//47 320//47 +f 338//48 311//48 325//48 +f 327//49 329//49 328//49 +f 321//50 323//50 322//50 +f 323//51 321//51 332//51 +f 325//52 311//52 310//52 +f 323//53 325//53 324//53 +f 331//54 333//54 332//54 +f 337//55 339//55 338//55 +f 341//56 327//56 326//56 +f 315//57 326//57 328//57 +f 338//58 339//58 341//58 +f 330//59 332//59 321//59 +f 319//60 317//60 328//60 +f 345//7 344//7 342//7 +f 349//8 348//8 351//8 +f 348//9 355//9 357//9 +f 343//61 342//61 353//61 +f 351//11 348//11 346//11 +f 350//62 345//62 343//62 +f 349//13 350//13 352//13 +f 344//63 351//63 353//63 +f 352//10 353//10 346//10 +f 350//64 351//64 344//64 +f 357//65 361//65 360//65 +f 347//9 356//9 354//9 +f 349//9 354//9 355//9 +f 346//9 357//9 356//9 +f 360//9 361//9 359//9 +f 354//66 358//66 359//66 +f 355//67 359//67 361//67 +f 356//68 360//68 358//68 +f 362//9 364//9 365//9 +f 371//8 368//8 369//8 +f 377//7 375//7 368//7 +f 373//69 362//69 363//69 +f 366//11 368//11 371//11 +f 363//70 365//70 370//70 +f 372//13 370//13 369//13 +f 373//71 371//71 364//71 +f 366//10 373//10 372//10 +f 364//72 371//72 370//72 +f 380//73 381//73 377//73 +f 374//7 376//7 367//7 +f 375//7 374//7 369//7 +f 376//7 377//7 366//7 +f 379//7 381//7 380//7 +f 379//74 378//74 374//74 +f 381//75 379//75 375//75 +f 378//76 380//76 376//76 +f 388//9 382//9 383//9 +f 388//8 393//8 391//8 +f 385//7 387//7 386//7 +f 389//13 383//13 387//13 +f 384//11 386//11 382//11 +f 383//8 382//8 386//8 +f 393//11 397//11 395//11 +f 385//8 390//8 392//8 +f 384//8 391//8 390//8 +f 389//8 392//8 393//8 +f 395//10 397//10 396//10 +f 390//13 394//13 396//13 +f 392//9 396//9 397//9 +f 391//7 395//7 394//7 +f 404//9 398//9 399//9 +f 404//8 409//8 407//8 +f 401//7 403//7 402//7 +f 405//13 399//13 403//13 +f 400//11 402//11 398//11 +f 399//8 398//8 402//8 +f 409//11 413//11 411//11 +f 401//8 406//8 408//8 +f 400//8 407//8 406//8 +f 405//8 408//8 409//8 +f 411//10 413//10 412//10 +f 406//13 410//13 412//13 +f 408//9 412//9 413//9 +f 407//7 411//7 410//7 +f 415//9 414//9 420//9 +f 423//10 425//10 420//10 +f 418//7 419//7 417//7 +f 419//13 415//13 421//13 +f 414//11 418//11 416//11 +f 418//10 414//10 415//10 +f 427//11 429//11 425//11 +f 424//10 422//10 417//10 +f 422//10 423//10 416//10 +f 425//10 424//10 421//10 +f 428//8 429//8 427//8 +f 428//13 426//13 422//13 +f 429//9 428//9 424//9 +f 426//7 427//7 423//7 +f 431//9 430//9 436//9 +f 439//10 441//10 436//10 +f 434//7 435//7 433//7 +f 435//13 431//13 437//13 +f 430//11 434//11 432//11 +f 434//10 430//10 431//10 +f 443//11 445//11 441//11 +f 440//10 438//10 433//10 +f 438//10 439//10 432//10 +f 441//10 440//10 437//10 +f 444//8 445//8 443//8 +f 444//13 442//13 438//13 +f 445//9 444//9 440//9 +f 442//7 443//7 439//7 +f 447//8 446//8 448//8 +f 450//10 451//10 449//10 +f 453//8 452//8 454//8 +f 456//10 457//10 455//10 +f 34//7 36//7 33//7 +f 36//8 40//8 35//8 +f 40//9 38//9 39//9 +f 38//10 34//10 37//10 +f 33//11 35//11 37//11 +f 41//12 34//12 48//12 +f 38//12 44//12 48//12 +f 46//13 42//13 88//13 +f 43//14 40//14 46//14 +f 36//14 42//14 46//14 +f 44//15 38//15 47//15 +f 40//15 43//15 47//15 +f 42//16 36//16 45//16 +f 34//16 41//16 45//16 +f 41//13 48//13 147//13 +f 53//7 49//7 80//7 +f 48//7 52//7 80//7 +f 43//13 46//13 83//13 +f 51//9 44//9 78//9 +f 47//9 50//9 78//9 +f 50//8 47//8 79//8 +f 49//8 53//8 79//8 +f 52//10 48//10 81//10 +f 44//10 51//10 81//10 +f 54//17 55//17 56//17 +f 56//18 57//18 58//18 +f 58//19 59//19 60//19 +f 60//20 61//20 62//20 +f 62//21 63//21 64//21 +f 64//22 65//22 66//22 +f 66//23 67//23 68//23 +f 68//24 69//24 70//24 +f 70//25 71//25 72//25 +f 72//26 73//26 74//26 +f 73//11 71//11 119//11 +f 76//27 77//27 54//27 +f 74//28 75//28 76//28 +f 66//13 81//13 64//13 +f 52//13 81//13 68//13 +f 72//13 80//13 70//13 +f 72//13 74//13 80//13 +f 54//13 79//13 76//13 +f 54//13 56//13 79//13 +f 51//13 78//13 62//13 +f 60//13 78//13 58//13 +f 85//10 84//10 93//10 +f 47//13 43//13 84//13 +f 46//13 49//13 82//13 +f 49//13 47//13 85//13 +f 86//10 89//10 101//10 +f 45//13 49//13 86//13 +f 49//13 46//13 89//13 +f 42//13 45//13 87//13 +f 90//13 93//13 94//13 +f 83//8 82//8 91//8 +f 82//7 85//7 90//7 +f 84//9 83//9 92//9 +f 97//10 96//10 109//10 +f 92//13 91//13 96//13 +f 93//13 92//13 97//13 +f 91//13 90//13 95//13 +f 88//8 87//8 99//8 +f 89//9 88//9 98//9 +f 87//7 86//7 100//7 +f 100//13 101//13 137//13 +f 108//29 107//29 103//29 +f 105//30 106//30 198//30 +f 109//30 102//30 203//30 +f 203//30 202//30 109//30 +f 201//30 200//30 106//30 +f 199//30 198//30 106//30 +f 106//30 200//30 199//30 +f 202//30 201//30 109//30 +f 95//8 94//8 107//8 +f 94//7 97//7 106//7 +f 96//9 95//9 108//9 +f 107//31 106//31 104//31 +f 104//13 105//13 198//13 +f 198//13 199//13 104//13 +f 200//13 201//13 224//13 +f 202//13 203//13 226//13 +f 102//13 227//13 203//13 +f 226//13 225//13 202//13 +f 224//13 223//13 104//13 +f 222//13 103//13 104//13 +f 104//13 199//13 200//13 +f 201//13 225//13 224//13 +f 227//13 226//13 203//13 +f 223//13 222//13 104//13 +f 104//13 200//13 224//13 +f 102//32 109//32 227//32 +f 108//32 103//32 222//32 +f 222//32 223//32 108//32 +f 224//32 225//32 109//32 +f 226//32 227//32 109//32 +f 108//32 223//32 224//32 +f 226//32 109//32 225//32 +f 114//20 113//20 126//20 +f 71//11 69//11 118//11 +f 69//11 67//11 117//11 +f 67//11 65//11 116//11 +f 65//11 63//11 115//11 +f 63//11 61//11 114//11 +f 55//11 77//11 111//11 +f 57//11 55//11 110//11 +f 61//11 59//11 113//11 +f 121//11 77//11 120//11 +f 59//11 57//11 112//11 +f 75//11 73//11 120//11 +f 124//13 122//13 132//13 +f 123//13 133//13 132//13 +f 132//13 131//13 130//13 +f 130//13 129//13 128//13 +f 128//13 127//13 126//13 +f 126//13 125//13 124//13 +f 122//13 123//13 132//13 +f 132//13 130//13 124//13 +f 128//13 126//13 124//13 +f 121//28 120//28 133//28 +f 110//17 111//17 122//17 +f 118//24 117//24 130//24 +f 115//21 114//21 127//21 +f 111//27 121//27 123//27 +f 112//18 110//18 124//18 +f 119//25 118//25 131//25 +f 116//22 115//22 128//22 +f 113//19 112//19 125//19 +f 120//26 119//26 132//26 +f 117//23 116//23 129//23 +f 137//7 136//7 141//7 +f 101//13 98//13 136//13 +f 99//13 100//13 134//13 +f 98//13 99//13 135//13 +f 138//31 141//31 142//31 +f 136//10 135//10 140//10 +f 134//8 137//8 138//8 +f 135//9 134//9 139//9 +f 144//13 143//13 209//13 +f 209//13 208//13 144//13 +f 207//13 206//13 145//13 +f 205//13 204//13 145//13 +f 142//13 145//13 204//13 +f 144//13 208//13 207//13 +f 206//13 205//13 145//13 +f 143//29 139//29 209//29 +f 138//29 142//29 204//29 +f 204//29 205//29 138//29 +f 206//29 207//29 139//29 +f 208//29 209//29 139//29 +f 139//29 207//29 208//29 +f 205//29 206//29 138//29 +f 141//30 140//30 145//30 +f 140//32 139//32 144//32 +f 146//9 149//9 150//9 +f 48//13 49//13 146//13 +f 149//13 49//13 148//13 +f 45//13 41//13 148//13 +f 157//8 153//8 156//8 +f 148//7 147//7 152//7 +f 149//8 148//8 153//8 +f 147//10 146//10 151//10 +f 155//13 154//13 167//13 +f 167//13 166//13 155//13 +f 165//13 164//13 155//13 +f 163//13 162//13 156//13 +f 161//13 160//13 156//13 +f 159//13 158//13 156//13 +f 157//13 156//13 158//13 +f 155//13 166//13 165//13 +f 164//13 163//13 155//13 +f 160//13 159//13 156//13 +f 156//13 155//13 163//13 +f 151//10 150//10 155//10 +f 154//9 150//9 167//9 +f 153//9 157//9 158//9 +f 158//9 159//9 153//9 +f 160//9 161//9 153//9 +f 162//9 163//9 150//9 +f 164//9 165//9 150//9 +f 166//9 167//9 150//9 +f 153//9 159//9 160//9 +f 166//9 150//9 165//9 +f 163//9 164//9 150//9 +f 153//9 161//9 162//9 +f 152//33 151//33 156//33 +f 168//7 158//7 169//7 +f 169//16 179//16 168//16 +f 170//7 160//7 171//7 +f 173//7 172//7 163//7 +f 175//7 174//7 165//7 +f 177//7 176//7 167//7 +f 177//16 187//16 176//16 +f 175//16 185//16 174//16 +f 173//16 183//16 172//16 +f 171//16 181//16 170//16 +f 179//13 189//13 178//13 +f 181//13 191//13 180//13 +f 183//13 193//13 182//13 +f 185//13 195//13 184//13 +f 187//13 197//13 186//13 +f 209//34 208//34 221//34 +f 207//34 206//34 219//34 +f 205//34 204//34 217//34 +f 211//35 217//35 210//35 +f 213//35 219//35 212//35 +f 215//35 221//35 214//35 +f 202//36 214//36 203//36 +f 200//36 212//36 201//36 +f 198//36 210//36 199//36 +f 233//14 239//14 232//14 +f 231//14 237//14 230//14 +f 229//14 235//14 228//14 +f 229//8 228//8 223//8 +f 231//8 230//8 225//8 +f 233//8 232//8 227//8 +f 239//13 245//13 238//13 +f 237//13 243//13 236//13 +f 235//13 241//13 234//13 +f 270//37 271//37 272//37 +f 246//38 247//38 248//38 +f 262//39 251//39 276//39 +f 270//40 272//40 259//40 +f 248//41 249//41 250//41 +f 249//42 247//42 276//42 +f 264//43 265//43 266//43 +f 250//44 251//44 252//44 +f 268//45 269//45 270//45 +f 252//46 253//46 254//46 +f 254//47 255//47 256//47 +f 272//48 274//48 261//48 +f 262//49 263//49 264//49 +f 256//50 257//50 258//50 +f 259//51 257//51 270//51 +f 260//52 261//52 246//52 +f 258//53 259//53 260//53 +f 266//54 267//54 268//54 +f 272//55 273//55 274//55 +f 276//56 277//56 262//56 +f 253//57 251//57 264//57 +f 274//58 275//58 276//58 +f 266//59 268//59 255//59 +f 255//60 253//60 266//60 +f 302//37 303//37 304//37 +f 278//38 279//38 280//38 +f 294//39 283//39 308//39 +f 302//40 304//40 291//40 +f 280//41 281//41 282//41 +f 281//42 279//42 308//42 +f 296//43 297//43 298//43 +f 282//44 283//44 284//44 +f 300//45 301//45 302//45 +f 284//46 285//46 286//46 +f 286//47 287//47 288//47 +f 304//48 306//48 293//48 +f 294//49 295//49 296//49 +f 288//50 289//50 290//50 +f 291//51 289//51 302//51 +f 292//52 293//52 278//52 +f 290//53 291//53 292//53 +f 298//54 299//54 300//54 +f 304//55 305//55 306//55 +f 308//56 309//56 294//56 +f 285//57 283//57 296//57 +f 306//58 307//58 308//58 +f 287//59 298//59 289//59 +f 287//60 285//60 298//60 +f 334//37 335//37 336//37 +f 310//38 311//38 312//38 +f 326//39 315//39 340//39 +f 334//40 336//40 323//40 +f 312//41 313//41 314//41 +f 313//42 311//42 340//42 +f 328//43 329//43 330//43 +f 314//44 315//44 316//44 +f 332//45 333//45 334//45 +f 316//46 317//46 318//46 +f 318//47 319//47 320//47 +f 336//48 338//48 325//48 +f 326//49 327//49 328//49 +f 320//50 321//50 322//50 +f 334//51 323//51 332//51 +f 324//52 325//52 310//52 +f 322//53 323//53 324//53 +f 330//54 331//54 332//54 +f 336//55 337//55 338//55 +f 340//56 341//56 326//56 +f 317//57 315//57 328//57 +f 340//58 338//58 341//58 +f 319//59 330//59 321//59 +f 330//60 319//60 328//60 +f 343//7 345//7 342//7 +f 350//8 349//8 351//8 +f 346//9 348//9 357//9 +f 352//61 343//61 353//61 +f 353//11 351//11 346//11 +f 352//62 350//62 343//62 +f 347//13 349//13 352//13 +f 342//63 344//63 353//63 +f 347//10 352//10 346//10 +f 345//64 350//64 344//64 +f 356//65 357//65 360//65 +f 349//9 347//9 354//9 +f 348//9 349//9 355//9 +f 347//9 346//9 356//9 +f 358//9 360//9 359//9 +f 355//66 354//66 359//66 +f 357//67 355//67 361//67 +f 354//68 356//68 358//68 +f 363//9 362//9 365//9 +f 370//8 371//8 369//8 +f 366//7 377//7 368//7 +f 372//69 373//69 363//69 +f 373//11 366//11 371//11 +f 372//70 363//70 370//70 +f 367//13 372//13 369//13 +f 362//71 373//71 364//71 +f 367//10 366//10 372//10 +f 365//72 364//72 370//72 +f 376//73 380//73 377//73 +f 369//7 374//7 367//7 +f 368//7 375//7 369//7 +f 367//7 376//7 366//7 +f 378//7 379//7 380//7 +f 375//74 379//74 374//74 +f 377//75 381//75 375//75 +f 374//76 378//76 376//76 +f 389//9 388//9 383//9 +f 384//8 388//8 391//8 +f 384//7 385//7 386//7 +f 385//13 389//13 387//13 +f 388//11 384//11 382//11 +f 387//8 383//8 386//8 +f 391//11 393//11 395//11 +f 389//8 385//8 392//8 +f 385//8 384//8 390//8 +f 388//8 389//8 393//8 +f 394//10 395//10 396//10 +f 392//13 390//13 396//13 +f 393//9 392//9 397//9 +f 390//7 391//7 394//7 +f 405//9 404//9 399//9 +f 400//8 404//8 407//8 +f 400//7 401//7 402//7 +f 401//13 405//13 403//13 +f 404//11 400//11 398//11 +f 403//8 399//8 402//8 +f 407//11 409//11 411//11 +f 405//8 401//8 408//8 +f 401//8 400//8 406//8 +f 404//8 405//8 409//8 +f 410//10 411//10 412//10 +f 408//13 406//13 412//13 +f 409//9 408//9 413//9 +f 406//7 407//7 410//7 +f 421//9 415//9 420//9 +f 416//10 423//10 420//10 +f 416//7 418//7 417//7 +f 417//13 419//13 421//13 +f 420//11 414//11 416//11 +f 419//10 418//10 415//10 +f 423//11 427//11 425//11 +f 421//10 424//10 417//10 +f 417//10 422//10 416//10 +f 420//10 425//10 421//10 +f 426//8 428//8 427//8 +f 424//13 428//13 422//13 +f 425//9 429//9 424//9 +f 422//7 426//7 423//7 +f 437//9 431//9 436//9 +f 432//10 439//10 436//10 +f 432//7 434//7 433//7 +f 433//13 435//13 437//13 +f 436//11 430//11 432//11 +f 435//10 434//10 431//10 +f 439//11 443//11 441//11 +f 437//10 440//10 433//10 +f 433//10 438//10 432//10 +f 436//10 441//10 437//10 +f 442//8 444//8 443//8 +f 440//13 444//13 438//13 +f 441//9 445//9 440//9 +f 438//7 442//7 439//7 diff --git a/assets/hbm/sounds/block/assemblerOperate.ogg b/assets/hbm/sounds/block/assemblerOperate.ogg new file mode 100644 index 000000000..77eae7c21 Binary files /dev/null and b/assets/hbm/sounds/block/assemblerOperate.ogg differ diff --git a/assets/hbm/sounds/block/chemplantOperate.ogg b/assets/hbm/sounds/block/chemplantOperate.ogg new file mode 100644 index 000000000..b8425337a Binary files /dev/null and b/assets/hbm/sounds/block/chemplantOperate.ogg differ diff --git a/assets/hbm/sounds/block/dieselOperate.ogg b/assets/hbm/sounds/block/dieselOperate.ogg new file mode 100644 index 000000000..f721271e8 Binary files /dev/null and b/assets/hbm/sounds/block/dieselOperate.ogg differ diff --git a/assets/hbm/sounds/block/igeneratorOperate.ogg b/assets/hbm/sounds/block/igeneratorOperate.ogg new file mode 100644 index 000000000..5b73b4232 Binary files /dev/null and b/assets/hbm/sounds/block/igeneratorOperate.ogg differ diff --git a/assets/hbm/textures/items/upgrade_afterburn_1.png b/assets/hbm/textures/items/upgrade_afterburn_1.png new file mode 100644 index 000000000..358e64921 Binary files /dev/null and b/assets/hbm/textures/items/upgrade_afterburn_1.png differ diff --git a/assets/hbm/textures/items/upgrade_afterburn_2.png b/assets/hbm/textures/items/upgrade_afterburn_2.png new file mode 100644 index 000000000..cc38d72e0 Binary files /dev/null and b/assets/hbm/textures/items/upgrade_afterburn_2.png differ diff --git a/assets/hbm/textures/items/upgrade_afterburn_3.png b/assets/hbm/textures/items/upgrade_afterburn_3.png new file mode 100644 index 000000000..8ca7f97c9 Binary files /dev/null and b/assets/hbm/textures/items/upgrade_afterburn_3.png differ diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 25c5cf451..99969d4dd 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -15,8 +15,6 @@ import com.hbm.main.MainRegistry; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; -import net.minecraft.block.Block.SoundType; -import net.minecraft.block.Block.SoundType; import net.minecraft.block.BlockFalling; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -356,6 +354,9 @@ public class ModBlocks { public static Block machine_assembler; public static final int guiID_machine_assembler = 48; + public static Block machine_chemplant; + public static final int guiID_machine_chemplant = 49; + public static Block launch_pad; public static final int guiID_launch_pad = 19; @@ -400,6 +401,8 @@ public class ModBlocks { public static Block dummy_port_drill; public static Block dummy_block_assembler; public static Block dummy_port_assembler; + public static Block dummy_block_chemplant; + public static Block dummy_port_chemplant; private static void initializeBlock() { @@ -668,6 +671,7 @@ public class ModBlocks { machine_drill = new MachineMiningDrill(Material.iron).setBlockName("machine_drill").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_drill"); drill_pipe = new BlockNoDrop(Material.iron).setBlockName("drill_pipe").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":drill_pipe"); machine_assembler = new MachineAssembler(Material.iron).setBlockName("machine_assembler").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_assembler"); + machine_chemplant = new MachineChemplant(Material.iron).setBlockName("machine_chemplant").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock).setBlockTextureName(RefStrings.MODID + ":machine_chemplant"); machine_schrabidium_transmutator = new MachineSchrabidiumTransmutator(Material.iron).setBlockName("machine_schrabidium_transmutator").setHardness(5.0F).setResistance(100.0F).setCreativeTab(MainRegistry.tabBlock); @@ -709,6 +713,8 @@ public class ModBlocks { dummy_port_drill = new DummyBlockDrill(Material.iron).setBlockName("dummy_port_drill").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_assembler = new DummyBlockAssembler(Material.iron).setBlockName("dummy_block_assembler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_port_assembler = new DummyBlockAssembler(Material.iron).setBlockName("dummy_port_assembler").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_block_chemplant = new DummyBlockChemplant(Material.iron).setBlockName("dummy_block_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_port_chemplant = new DummyBlockChemplant(Material.iron).setBlockName("dummy_port_chemplant").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); } private static void registerBlock() { @@ -907,6 +913,7 @@ public class ModBlocks { GameRegistry.registerBlock(machine_electric_furnace_off, machine_electric_furnace_off.getUnlocalizedName()); GameRegistry.registerBlock(machine_electric_furnace_on, machine_electric_furnace_on.getUnlocalizedName()); GameRegistry.registerBlock(machine_assembler, machine_assembler.getUnlocalizedName()); + GameRegistry.registerBlock(machine_chemplant, machine_chemplant.getUnlocalizedName()); GameRegistry.registerBlock(machine_shredder, machine_shredder.getUnlocalizedName()); GameRegistry.registerBlock(machine_deuterium, machine_deuterium.getUnlocalizedName()); GameRegistry.registerBlock(machine_well, machine_well.getUnlocalizedName()); @@ -1003,6 +1010,8 @@ public class ModBlocks { GameRegistry.registerBlock(dummy_port_drill, dummy_port_drill.getUnlocalizedName()); GameRegistry.registerBlock(dummy_block_assembler, dummy_block_assembler.getUnlocalizedName()); GameRegistry.registerBlock(dummy_port_assembler, dummy_port_assembler.getUnlocalizedName()); + GameRegistry.registerBlock(dummy_block_chemplant, dummy_block_chemplant.getUnlocalizedName()); + GameRegistry.registerBlock(dummy_port_chemplant, dummy_port_chemplant.getUnlocalizedName()); //Other Technical Blocks GameRegistry.registerBlock(oil_pipe, oil_pipe.getUnlocalizedName()); diff --git a/com/hbm/blocks/bomb/BlockCrashedBomb.java b/com/hbm/blocks/bomb/BlockCrashedBomb.java index c4ffd9867..e3c6a0c56 100644 --- a/com/hbm/blocks/bomb/BlockCrashedBomb.java +++ b/com/hbm/blocks/bomb/BlockCrashedBomb.java @@ -1,27 +1,19 @@ package com.hbm.blocks.bomb; -import java.util.HashMap; -import java.util.Map; import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.explosion.ExplosionParticleB; import com.hbm.interfaces.IBomb; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityCrashedBomb; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -80,6 +72,7 @@ public class BlockCrashedBomb extends BlockContainer implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { if (!world.isRemote) { diff --git a/com/hbm/blocks/bomb/BombFlameWar.java b/com/hbm/blocks/bomb/BombFlameWar.java index 81df2e37b..3b4229e25 100644 --- a/com/hbm/blocks/bomb/BombFlameWar.java +++ b/com/hbm/blocks/bomb/BombFlameWar.java @@ -5,7 +5,6 @@ import com.hbm.interfaces.IBomb; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import net.minecraft.world.World; public class BombFlameWar extends Block implements IBomb { @@ -28,6 +27,7 @@ public class BombFlameWar extends Block implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { ExplosionChaos.explode(world, x, y, z, 15); ExplosionChaos.spawnExplosion(world, x, y, z, 75); diff --git a/com/hbm/blocks/bomb/BombFloat.java b/com/hbm/blocks/bomb/BombFloat.java index 78d76ea94..fbd0a1768 100644 --- a/com/hbm/blocks/bomb/BombFloat.java +++ b/com/hbm/blocks/bomb/BombFloat.java @@ -1,7 +1,6 @@ package com.hbm.blocks.bomb; import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionThermo; import com.hbm.interfaces.IBomb; import com.hbm.lib.RefStrings; @@ -50,6 +49,7 @@ public class BombFloat extends Block implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { world.setBlock(x, y, z, Blocks.air); ExplosionChaos.floater(world, x, y, z, 15, 50); diff --git a/com/hbm/blocks/bomb/BombMulti.java b/com/hbm/blocks/bomb/BombMulti.java index caf72d9d5..870b45c13 100644 --- a/com/hbm/blocks/bomb/BombMulti.java +++ b/com/hbm/blocks/bomb/BombMulti.java @@ -10,7 +10,6 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -314,12 +313,14 @@ public class BombMulti extends BlockContainer implements IBomb { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8*f, 1.0F); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float f = 0.0625F; this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8*f, 1.0F); return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } + @Override public void explode(World world, int x, int y, int z) { TileEntityBombMulti entity = (TileEntityBombMulti) world.getTileEntity(x, y, z); if(/*entity.getExplosionType() != 0*/entity.isLoaded()) diff --git a/com/hbm/blocks/bomb/BombThermo.java b/com/hbm/blocks/bomb/BombThermo.java index 2ae57d8bb..4f217f4df 100644 --- a/com/hbm/blocks/bomb/BombThermo.java +++ b/com/hbm/blocks/bomb/BombThermo.java @@ -75,6 +75,7 @@ public class BombThermo extends Block implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { world.setBlock(x, y, z, Blocks.air); if(this == ModBlocks.therm_endo) diff --git a/com/hbm/blocks/bomb/CheaterVirus.java b/com/hbm/blocks/bomb/CheaterVirus.java index 919df8952..9ff3c09f4 100644 --- a/com/hbm/blocks/bomb/CheaterVirus.java +++ b/com/hbm/blocks/bomb/CheaterVirus.java @@ -3,20 +3,11 @@ package com.hbm.blocks.bomb; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.explosion.ExplosionChaos; -import com.hbm.lib.Library; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityCow; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; diff --git a/com/hbm/blocks/bomb/CheaterVirusSeed.java b/com/hbm/blocks/bomb/CheaterVirusSeed.java index 7099a4f6f..20d2a6b01 100644 --- a/com/hbm/blocks/bomb/CheaterVirusSeed.java +++ b/com/hbm/blocks/bomb/CheaterVirusSeed.java @@ -3,8 +3,6 @@ package com.hbm.blocks.bomb; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.explosion.ExplosionChaos; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/com/hbm/blocks/bomb/CrystalPulsar.java b/com/hbm/blocks/bomb/CrystalPulsar.java index afc327d22..b93a4cbe8 100644 --- a/com/hbm/blocks/bomb/CrystalPulsar.java +++ b/com/hbm/blocks/bomb/CrystalPulsar.java @@ -5,7 +5,6 @@ import com.hbm.explosion.ExplosionChaos; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import net.minecraft.world.World; public class CrystalPulsar extends Block { diff --git a/com/hbm/blocks/bomb/DetCord.java b/com/hbm/blocks/bomb/DetCord.java index 68fa06002..800f6efbd 100644 --- a/com/hbm/blocks/bomb/DetCord.java +++ b/com/hbm/blocks/bomb/DetCord.java @@ -3,7 +3,6 @@ package com.hbm.blocks.bomb; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.interfaces.IBomb; @@ -41,6 +40,7 @@ public class DetCord extends Block implements IBomb { return null; } + @Override public void explode(World world, int x, int y, int z) { if(!world.isRemote) { diff --git a/com/hbm/blocks/bomb/LaunchPad.java b/com/hbm/blocks/bomb/LaunchPad.java index 5c3cf52a1..7ee6daf74 100644 --- a/com/hbm/blocks/bomb/LaunchPad.java +++ b/com/hbm/blocks/bomb/LaunchPad.java @@ -187,6 +187,7 @@ public class LaunchPad extends BlockContainer implements IBomb { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float f = 0.0625F; this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8*f, 1.0F); @@ -200,7 +201,8 @@ public class LaunchPad extends BlockContainer implements IBomb { return Item.getItemFromBlock(ModBlocks.launch_pad); } - public void explode(World p_149695_1_, int x, int y, int z) + @Override + public void explode(World p_149695_1_, int x, int y, int z) { TileEntityLaunchPad entity = (TileEntityLaunchPad) p_149695_1_.getTileEntity(x, y, z); //if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/bomb/NukeBoy.java b/com/hbm/blocks/bomb/NukeBoy.java index 4e4fc1f41..0f1c31593 100644 --- a/com/hbm/blocks/bomb/NukeBoy.java +++ b/com/hbm/blocks/bomb/NukeBoy.java @@ -207,6 +207,7 @@ public class NukeBoy extends BlockContainer implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { TileEntityNukeBoy entity = (TileEntityNukeBoy) world.getTileEntity(x, y, z); // if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/bomb/NukeCustom.java b/com/hbm/blocks/bomb/NukeCustom.java index b3dbebde9..e71e22da1 100644 --- a/com/hbm/blocks/bomb/NukeCustom.java +++ b/com/hbm/blocks/bomb/NukeCustom.java @@ -8,7 +8,6 @@ import com.hbm.entity.effect.EntityNukeCloudBig; import com.hbm.entity.effect.EntityNukeCloudNoShroom; import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.grenade.EntityGrenadeZOMG; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.logic.EntityNukeExplosionPlus; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; @@ -16,14 +15,12 @@ import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; import com.hbm.interfaces.IBomb; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityNukeBoy; import com.hbm.tileentity.TileEntityNukeCustom; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -68,12 +65,12 @@ public class NukeCustom extends BlockContainer implements IBomb { ItemStack itemstack = tileentityfurnace.getStackInSlot(i1); if (itemstack != null) { - float f = this.field_149933_a.nextFloat() * 0.8F + 0.1F; - float f1 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; - float f2 = this.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f = NukeCustom.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f1 = NukeCustom.field_149933_a.nextFloat() * 0.8F + 0.1F; + float f2 = NukeCustom.field_149933_a.nextFloat() * 0.8F + 0.1F; while (itemstack.stackSize > 0) { - int j1 = this.field_149933_a.nextInt(21) + 10; + int j1 = NukeCustom.field_149933_a.nextInt(21) + 10; if (j1 > itemstack.stackSize) { j1 = itemstack.stackSize; @@ -90,9 +87,9 @@ public class NukeCustom extends BlockContainer implements IBomb { } float f3 = 0.05F; - entityitem.motionX = (float) this.field_149933_a.nextGaussian() * f3; - entityitem.motionY = (float) this.field_149933_a.nextGaussian() * f3 + 0.2F; - entityitem.motionZ = (float) this.field_149933_a.nextGaussian() * f3; + entityitem.motionX = (float) NukeCustom.field_149933_a.nextGaussian() * f3; + entityitem.motionY = (float) NukeCustom.field_149933_a.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float) NukeCustom.field_149933_a.nextGaussian() * f3; p_149749_1_.spawnEntityInWorld(entityitem); } } @@ -376,6 +373,7 @@ public class NukeCustom extends BlockContainer implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { TileEntityNukeCustom entity = (TileEntityNukeCustom) world.getTileEntity(x, y, z); { diff --git a/com/hbm/blocks/bomb/NukeFleija.java b/com/hbm/blocks/bomb/NukeFleija.java index d0fe4d415..3dee3616c 100644 --- a/com/hbm/blocks/bomb/NukeFleija.java +++ b/com/hbm/blocks/bomb/NukeFleija.java @@ -200,6 +200,7 @@ public class NukeFleija extends BlockContainer implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { TileEntityNukeFleija entity = (TileEntityNukeFleija) world.getTileEntity(x, y, z); //if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/bomb/NukeGadget.java b/com/hbm/blocks/bomb/NukeGadget.java index 3aa8356bc..5b3d0d560 100644 --- a/com/hbm/blocks/bomb/NukeGadget.java +++ b/com/hbm/blocks/bomb/NukeGadget.java @@ -356,6 +356,7 @@ public class NukeGadget extends BlockContainer implements IBomb { * z, Blocks.fire); } } */ + @Override public void explode(World world, int x, int y, int z) { TileEntityNukeGadget entity = (TileEntityNukeGadget) world.getTileEntity(x, y, z); // if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/bomb/NukeMan.java b/com/hbm/blocks/bomb/NukeMan.java index 4ca64378e..5ea69ad56 100644 --- a/com/hbm/blocks/bomb/NukeMan.java +++ b/com/hbm/blocks/bomb/NukeMan.java @@ -467,6 +467,7 @@ public class NukeMan extends BlockContainer implements IBomb { } }*/ + @Override public void explode(World world, int x, int y, int z) { TileEntityNukeMan entity = (TileEntityNukeMan) world.getTileEntity(x, y, z); //if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/bomb/NukeMike.java b/com/hbm/blocks/bomb/NukeMike.java index c1c5a0e75..dce4b50e5 100644 --- a/com/hbm/blocks/bomb/NukeMike.java +++ b/com/hbm/blocks/bomb/NukeMike.java @@ -211,6 +211,7 @@ public class NukeMike extends BlockContainer implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { TileEntityNukeMike entity = (TileEntityNukeMike) world.getTileEntity(x, y, z); // if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/bomb/NukePrototype.java b/com/hbm/blocks/bomb/NukePrototype.java index 0fa7bdec3..382caf9fa 100644 --- a/com/hbm/blocks/bomb/NukePrototype.java +++ b/com/hbm/blocks/bomb/NukePrototype.java @@ -211,6 +211,7 @@ public class NukePrototype extends BlockContainer implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { TileEntityNukePrototype entity = (TileEntityNukePrototype) world.getTileEntity(x, y, z); //if (world.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/bomb/NukeTsar.java b/com/hbm/blocks/bomb/NukeTsar.java index ed04f65af..da5ad9a70 100644 --- a/com/hbm/blocks/bomb/NukeTsar.java +++ b/com/hbm/blocks/bomb/NukeTsar.java @@ -202,6 +202,7 @@ public class NukeTsar extends BlockContainer implements IBomb { } } + @Override public void explode(World world, int x, int y, int z) { TileEntityNukeTsar entity = (TileEntityNukeTsar) world.getTileEntity(x, y, z); //if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) diff --git a/com/hbm/blocks/fluid/AcidBlock.java b/com/hbm/blocks/fluid/AcidBlock.java index cdb789bc9..27519278b 100644 --- a/com/hbm/blocks/fluid/AcidBlock.java +++ b/com/hbm/blocks/fluid/AcidBlock.java @@ -3,27 +3,15 @@ package com.hbm.blocks.fluid; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.mob.EntityNuclearCreeper; -import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityCreeper; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityVillager; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -49,11 +37,13 @@ public class AcidBlock extends BlockFluidClassic { displacements.put(this, false); } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { return (side == 0 || side == 1) ? stillIcon : flowingIcon; } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { stillIcon = register.registerIcon(RefStrings.MODID + ":acid_still"); @@ -78,11 +68,13 @@ public class AcidBlock extends BlockFluidClassic { return super.displaceIfPossible(world, x, y, z); } + @Override public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { entity.setInWeb(); entity.attackEntityFrom(ModDamageSource.acid, 10000F); } + @Override public void updateTick(World world, int x, int y, int z, Random rand) { super.updateTick(world, x, y, z, rand); @@ -113,6 +105,7 @@ public class AcidBlock extends BlockFluidClassic { } } + @Override public int tickRate(World p_149738_1_) { return 5; } diff --git a/com/hbm/blocks/fluid/AcidFluid.java b/com/hbm/blocks/fluid/AcidFluid.java index f8f72aea5..6b8d576c4 100644 --- a/com/hbm/blocks/fluid/AcidFluid.java +++ b/com/hbm/blocks/fluid/AcidFluid.java @@ -11,16 +11,19 @@ public class AcidFluid extends Fluid { super("acid_fluid"); } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon() { return getStillIcon(); } + @Override @SideOnly(Side.CLIENT) public IIcon getStillIcon() { return AcidBlock.stillIcon; } + @Override @SideOnly(Side.CLIENT) public IIcon getFlowingIcon() { return AcidBlock.flowingIcon; diff --git a/com/hbm/blocks/fluid/MudBlock.java b/com/hbm/blocks/fluid/MudBlock.java index 70410a8e4..6e1b931f3 100644 --- a/com/hbm/blocks/fluid/MudBlock.java +++ b/com/hbm/blocks/fluid/MudBlock.java @@ -7,8 +7,6 @@ import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -22,8 +20,6 @@ import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -49,11 +45,13 @@ public class MudBlock extends BlockFluidClassic { displacements.put(this, false); } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { return (side == 0 || side == 1) ? stillIcon : flowingIcon; } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { stillIcon = register.registerIcon(RefStrings.MODID + ":mud_still"); @@ -78,6 +76,7 @@ public class MudBlock extends BlockFluidClassic { return super.displaceIfPossible(world, x, y, z); } + @Override public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { entity.setInWeb(); // if(entity instanceof EntityLivingBase) @@ -111,6 +110,7 @@ public class MudBlock extends BlockFluidClassic { } } + @Override public void updateTick(World world, int x, int y, int z, Random rand) { super.updateTick(world, x, y, z, rand); @@ -212,6 +212,7 @@ public class MudBlock extends BlockFluidClassic { } } + @Override public int tickRate(World p_149738_1_) { return 15; } diff --git a/com/hbm/blocks/fluid/MudFluid.java b/com/hbm/blocks/fluid/MudFluid.java index 78e5ac920..2a66cfae2 100644 --- a/com/hbm/blocks/fluid/MudFluid.java +++ b/com/hbm/blocks/fluid/MudFluid.java @@ -11,16 +11,19 @@ public class MudFluid extends Fluid { super("mud_fluid"); } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon() { return getStillIcon(); } + @Override @SideOnly(Side.CLIENT) public IIcon getStillIcon() { return MudBlock.stillIcon; } + @Override @SideOnly(Side.CLIENT) public IIcon getFlowingIcon() { return MudBlock.flowingIcon; diff --git a/com/hbm/blocks/fluid/ToxicBlock.java b/com/hbm/blocks/fluid/ToxicBlock.java index aba1a2f1a..f7eae3d1d 100644 --- a/com/hbm/blocks/fluid/ToxicBlock.java +++ b/com/hbm/blocks/fluid/ToxicBlock.java @@ -7,8 +7,6 @@ import com.hbm.entity.mob.EntityNuclearCreeper; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -21,9 +19,6 @@ import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -49,11 +44,13 @@ public class ToxicBlock extends BlockFluidClassic { displacements.put(this, false); } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { return (side == 0 || side == 1) ? stillIcon : flowingIcon; } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { stillIcon = register.registerIcon(RefStrings.MODID + ":toxic_still"); @@ -78,6 +75,7 @@ public class ToxicBlock extends BlockFluidClassic { return super.displaceIfPossible(world, x, y, z); } + @Override public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) { entity.setInWeb(); // if(entity instanceof EntityLivingBase) @@ -139,6 +137,7 @@ public class ToxicBlock extends BlockFluidClassic { return false; } + @Override public int tickRate(World p_149738_1_) { return 15; } diff --git a/com/hbm/blocks/fluid/ToxicFluid.java b/com/hbm/blocks/fluid/ToxicFluid.java index 2d0f83ebf..1124b16ff 100644 --- a/com/hbm/blocks/fluid/ToxicFluid.java +++ b/com/hbm/blocks/fluid/ToxicFluid.java @@ -11,16 +11,19 @@ public class ToxicFluid extends Fluid { super("toxic_fluid"); } + @Override @SideOnly(Side.CLIENT) public IIcon getIcon() { return getStillIcon(); } + @Override @SideOnly(Side.CLIENT) public IIcon getStillIcon() { return ToxicBlock.stillIcon; } + @Override @SideOnly(Side.CLIENT) public IIcon getFlowingIcon() { return ToxicBlock.flowingIcon; diff --git a/com/hbm/blocks/generic/BlockCrate.java b/com/hbm/blocks/generic/BlockCrate.java index f25394e11..8acc5aec3 100644 --- a/com/hbm/blocks/generic/BlockCrate.java +++ b/com/hbm/blocks/generic/BlockCrate.java @@ -6,14 +6,12 @@ import java.util.Random; import com.hbm.items.ModItems; -import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; @@ -23,13 +21,15 @@ public class BlockCrate extends BlockFalling { super(p_i45394_1_); } - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { return null; } - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) { if(player.getHeldItem() != null && player.getHeldItem().getItem().equals(ModItems.crowbar)) { dropItems(world, x, y, z); @@ -50,32 +50,32 @@ public class BlockCrate extends BlockFalling { Random rand = new Random(); List list1 = new ArrayList(); - list1 = this.addToListWithWeight(list1, ModItems.syringe_metal_stimpak, 10); - list1 = this.addToListWithWeight(list1, ModItems.syringe_antidote, 5); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver_iron, 9); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver, 7); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver_gold, 4); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver_lead, 6); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver_schrabidium, 1); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver_cursed, 5); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver_nightmare, 3); - list1 = this.addToListWithWeight(list1, ModItems.clip_revolver_nightmare2, 2); - list1 = this.addToListWithWeight(list1, ModItems.clip_rpg, 5); - list1 = this.addToListWithWeight(list1, ModItems.clip_fatman, 3); - list1 = this.addToListWithWeight(list1, ModItems.clip_mirv, 1); - list1 = this.addToListWithWeight(list1, ModItems.clip_bf, 0); - list1 = this.addToListWithWeight(list1, ModItems.clip_mp40, 7); - list1 = this.addToListWithWeight(list1, ModItems.clip_uboinik, 7); - list1 = this.addToListWithWeight(list1, ModItems.clip_osipr, 7); - list1 = this.addToListWithWeight(list1, ModItems.clip_immolator, 4); - list1 = this.addToListWithWeight(list1, ModItems.clip_cryolator, 4); - list1 = this.addToListWithWeight(list1, ModItems.clip_mp, 3); - list1 = this.addToListWithWeight(list1, ModItems.clip_xvl1456, 5); - list1 = this.addToListWithWeight(list1, ModItems.clip_emp, 3); - list1 = this.addToListWithWeight(list1, ModItems.grenade_generic, 8); - list1 = this.addToListWithWeight(list1, ModItems.grenade_strong, 6); - list1 = this.addToListWithWeight(list1, ModItems.grenade_mk2, 4); - list1 = this.addToListWithWeight(list1, ModItems.grenade_flare, 4); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.syringe_metal_stimpak, 10); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.syringe_antidote, 5); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_iron, 9); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver, 7); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_gold, 4); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_lead, 6); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_schrabidium, 1); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_cursed, 5); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_nightmare, 3); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_revolver_nightmare2, 2); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_rpg, 5); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_fatman, 3); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_mirv, 1); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_bf, 0); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_mp40, 7); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_uboinik, 7); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_osipr, 7); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_immolator, 4); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_cryolator, 4); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_mp, 3); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_xvl1456, 5); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.clip_emp, 3); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.grenade_generic, 8); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.grenade_strong, 6); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.grenade_mk2, 4); + list1 = BlockCrate.addToListWithWeight(list1, ModItems.grenade_flare, 4); List list = new ArrayList(); diff --git a/com/hbm/blocks/generic/BlockMarker.java b/com/hbm/blocks/generic/BlockMarker.java index 2bd3626af..98defc517 100644 --- a/com/hbm/blocks/generic/BlockMarker.java +++ b/com/hbm/blocks/generic/BlockMarker.java @@ -1,21 +1,9 @@ package com.hbm.blocks.generic; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.WEST; - import java.util.Random; -import com.hbm.blocks.ModBlocks; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityCoreAdvanced; -import com.hbm.tileentity.TileEntityCoreTitanium; import com.hbm.tileentity.TileEntityStructureMarker; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -41,22 +29,26 @@ public class BlockMarker extends BlockContainer { return new TileEntityStructureMarker(); } - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { return null; } - public boolean isOpaqueCube() + @Override + public boolean isOpaqueCube() { return false; } - public boolean renderAsNormalBlock() + @Override + public boolean renderAsNormalBlock() { return false; } - public int getRenderType() + @Override + public int getRenderType() { return 2; } @@ -74,7 +66,8 @@ public class BlockMarker extends BlockContainer { } } - public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) + @Override + public boolean canPlaceBlockAt(World p_149742_1_, int p_149742_2_, int p_149742_3_, int p_149742_4_) { return func_150107_m(p_149742_1_, p_149742_2_, p_149742_3_ - 1, p_149742_4_); } @@ -101,7 +94,8 @@ public class BlockMarker extends BlockContainer { } } - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) + @Override + public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { super.updateTick(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_, p_149674_5_); @@ -111,7 +105,8 @@ public class BlockMarker extends BlockContainer { } } - public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) + @Override + public void onNeighborBlockChange(World p_149695_1_, int p_149695_2_, int p_149695_3_, int p_149695_4_, Block p_149695_5_) { this.func_150108_b(p_149695_1_, p_149695_2_, p_149695_3_, p_149695_4_, p_149695_5_); } @@ -163,7 +158,8 @@ public class BlockMarker extends BlockContainer { } } - public MovingObjectPosition collisionRayTrace(World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_, Vec3 p_149731_5_, Vec3 p_149731_6_) + @Override + public MovingObjectPosition collisionRayTrace(World p_149731_1_, int p_149731_2_, int p_149731_3_, int p_149731_4_, Vec3 p_149731_5_, Vec3 p_149731_6_) { int l = p_149731_1_.getBlockMetadata(p_149731_2_, p_149731_3_, p_149731_4_) & 7; float f = 0.15F; diff --git a/com/hbm/blocks/generic/BlockOre.java b/com/hbm/blocks/generic/BlockOre.java index 3197e843f..31a1a8654 100644 --- a/com/hbm/blocks/generic/BlockOre.java +++ b/com/hbm/blocks/generic/BlockOre.java @@ -20,7 +20,6 @@ import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.potion.Potion; diff --git a/com/hbm/blocks/generic/BlockPlasma.java b/com/hbm/blocks/generic/BlockPlasma.java index e4dde1db9..5c3c84928 100644 --- a/com/hbm/blocks/generic/BlockPlasma.java +++ b/com/hbm/blocks/generic/BlockPlasma.java @@ -2,8 +2,6 @@ package com.hbm.blocks.generic; import java.util.Random; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -19,24 +17,28 @@ public class BlockPlasma extends Block { this.setTickRandomly(true); } - public void updateTick(World world, int x, int y, int z, Random rand) + @Override + public void updateTick(World world, int x, int y, int z, Random rand) { if (world.getGameRules().getGameRuleBooleanValue("doFireTick")) world.setBlock(x, y, z, Blocks.air); } - public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) { return null; } - public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_) + @Override + public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_) { p_149670_5_.setFire(10); p_149670_5_.setInWeb(); } - public boolean isOpaqueCube() + @Override + public boolean isOpaqueCube() { return false; } @@ -47,7 +49,8 @@ public class BlockPlasma extends Block { return null; } - public boolean renderAsNormalBlock() + @Override + public boolean renderAsNormalBlock() { return false; } diff --git a/com/hbm/blocks/generic/DecoBlock.java b/com/hbm/blocks/generic/DecoBlock.java index 0af862944..8e55ee611 100644 --- a/com/hbm/blocks/generic/DecoBlock.java +++ b/com/hbm/blocks/generic/DecoBlock.java @@ -124,6 +124,7 @@ public class DecoBlock extends BlockContainer { //this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { int te = world.getBlockMetadata(x, y, z); diff --git a/com/hbm/blocks/generic/DecoBlockAlt.java b/com/hbm/blocks/generic/DecoBlockAlt.java index 4d8c60485..36d28b354 100644 --- a/com/hbm/blocks/generic/DecoBlockAlt.java +++ b/com/hbm/blocks/generic/DecoBlockAlt.java @@ -165,6 +165,7 @@ public class DecoBlockAlt extends BlockContainer { this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8*f, 1.0F); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float f = 0.0625F; this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 8*f, 1.0F); diff --git a/com/hbm/blocks/generic/RedBarrel.java b/com/hbm/blocks/generic/RedBarrel.java index cb2e96d67..5659b1bc1 100644 --- a/com/hbm/blocks/generic/RedBarrel.java +++ b/com/hbm/blocks/generic/RedBarrel.java @@ -81,6 +81,7 @@ public class RedBarrel extends BlockContainer { this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float f = 0.0625F; this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f); diff --git a/com/hbm/blocks/generic/YellowBarrel.java b/com/hbm/blocks/generic/YellowBarrel.java index 038889caa..7c9d2b3d6 100644 --- a/com/hbm/blocks/generic/YellowBarrel.java +++ b/com/hbm/blocks/generic/YellowBarrel.java @@ -77,6 +77,7 @@ public class YellowBarrel extends BlockContainer { this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f); } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { float f = 0.0625F; this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f); diff --git a/com/hbm/blocks/machine/BlockCable.java b/com/hbm/blocks/machine/BlockCable.java index 4d8ce1977..19ff3d025 100644 --- a/com/hbm/blocks/machine/BlockCable.java +++ b/com/hbm/blocks/machine/BlockCable.java @@ -1,8 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.tileentity.TileEntityCable; -import com.hbm.tileentity.TileEntityOilDuct; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; @@ -19,6 +17,7 @@ public class BlockCable extends BlockContainer { this.useNeighborBrightness = true; } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityCable) { TileEntityCable cable = (TileEntityCable)world.getTileEntity(x, y, z); @@ -39,6 +38,7 @@ public class BlockCable extends BlockContainer { return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } + @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityCable) { TileEntityCable cable = (TileEntityCable)world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/BlockFluidDuct.java b/com/hbm/blocks/machine/BlockFluidDuct.java index a639d2bbb..32df0e48e 100644 --- a/com/hbm/blocks/machine/BlockFluidDuct.java +++ b/com/hbm/blocks/machine/BlockFluidDuct.java @@ -1,8 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.tileentity.TileEntityFluidDuct; -import com.hbm.tileentity.TileEntityGasDuct; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; @@ -19,6 +17,7 @@ public class BlockFluidDuct extends BlockContainer { this.useNeighborBrightness = true; } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) { TileEntityFluidDuct cable = (TileEntityFluidDuct)world.getTileEntity(x, y, z); @@ -39,6 +38,7 @@ public class BlockFluidDuct extends BlockContainer { return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } + @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) { TileEntityFluidDuct cable = (TileEntityFluidDuct)world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/BlockGasDuct.java b/com/hbm/blocks/machine/BlockGasDuct.java index 86a2e962b..50aa4189c 100644 --- a/com/hbm/blocks/machine/BlockGasDuct.java +++ b/com/hbm/blocks/machine/BlockGasDuct.java @@ -1,8 +1,6 @@ package com.hbm.blocks.machine; import com.hbm.tileentity.TileEntityGasDuct; -import com.hbm.tileentity.TileEntityOilDuct; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; @@ -19,6 +17,7 @@ public class BlockGasDuct extends BlockContainer { this.useNeighborBrightness = true; } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityGasDuct) { TileEntityGasDuct cable = (TileEntityGasDuct)world.getTileEntity(x, y, z); @@ -39,6 +38,7 @@ public class BlockGasDuct extends BlockContainer { return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } + @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityGasDuct) { TileEntityGasDuct cable = (TileEntityGasDuct)world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/BlockOilDuct.java b/com/hbm/blocks/machine/BlockOilDuct.java index 10e78dc90..7751942ff 100644 --- a/com/hbm/blocks/machine/BlockOilDuct.java +++ b/com/hbm/blocks/machine/BlockOilDuct.java @@ -18,6 +18,7 @@ public class BlockOilDuct extends BlockContainer { this.useNeighborBrightness = true; } + @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityOilDuct) { TileEntityOilDuct cable = (TileEntityOilDuct)world.getTileEntity(x, y, z); @@ -38,6 +39,7 @@ public class BlockOilDuct extends BlockContainer { return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ); } + @Override public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { if(world.getTileEntity(x, y, z) instanceof TileEntityOilDuct) { TileEntityOilDuct cable = (TileEntityOilDuct)world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/BlockSeal.java b/com/hbm/blocks/machine/BlockSeal.java index f420ae38e..55590cf98 100644 --- a/com/hbm/blocks/machine/BlockSeal.java +++ b/com/hbm/blocks/machine/BlockSeal.java @@ -5,13 +5,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IBomb; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityCoreAdvanced; -import com.hbm.tileentity.TileEntityCoreTitanium; import com.hbm.tileentity.TileEntityHatch; -import com.hbm.tileentity.TileEntityMachineBattery; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -23,7 +17,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -125,13 +118,13 @@ public class BlockSeal extends Block implements IBomb { return true; } else if(!player.isSneaking()) { - int i = this.getFrameSize(world, x, y, z); + int i = BlockSeal.getFrameSize(world, x, y, z); if(i != 0) - if(this.isSealClosed(world, x, y, z, i)) - this.openSeal(world, x, y, z, i); + if(BlockSeal.isSealClosed(world, x, y, z, i)) + BlockSeal.openSeal(world, x, y, z, i); else - this.closeSeal(world, x, y, z, i); + BlockSeal.closeSeal(world, x, y, z, i); return true; } else { @@ -269,13 +262,13 @@ public class BlockSeal extends Block implements IBomb { @Override public void explode(World world, int x, int y, int z) { - int i = this.getFrameSize(world, x, y, z); + int i = BlockSeal.getFrameSize(world, x, y, z); if(i != 0) - if(this.isSealClosed(world, x, y, z, i)) - this.openSeal(world, x, y, z, i); + if(BlockSeal.isSealClosed(world, x, y, z, i)) + BlockSeal.openSeal(world, x, y, z, i); else - this.closeSeal(world, x, y, z, i); + BlockSeal.closeSeal(world, x, y, z, i); } @@ -288,13 +281,13 @@ public class BlockSeal extends Block implements IBomb { if(meta < 4) { world.setBlockMetadataWithNotify(x, y, z, meta + 4, 2); - int i = this.getFrameSize(world, x, y, z); + int i = BlockSeal.getFrameSize(world, x, y, z); if(i != 0) - if(this.isSealClosed(world, x, y, z, i)) - this.openSeal(world, x, y, z, i); + if(BlockSeal.isSealClosed(world, x, y, z, i)) + BlockSeal.openSeal(world, x, y, z, i); else - this.closeSeal(world, x, y, z, i); + BlockSeal.closeSeal(world, x, y, z, i); } } else diff --git a/com/hbm/blocks/machine/DummyBlockAssembler.java b/com/hbm/blocks/machine/DummyBlockAssembler.java index c64c16688..b9639fbae 100644 --- a/com/hbm/blocks/machine/DummyBlockAssembler.java +++ b/com/hbm/blocks/machine/DummyBlockAssembler.java @@ -7,10 +7,6 @@ import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineCentrifuge; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -36,7 +31,8 @@ public class DummyBlockAssembler extends BlockContainer implements IDummy { return new TileEntityDummy(); } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { if(!safeBreak) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/DummyBlockCentrifuge.java b/com/hbm/blocks/machine/DummyBlockCentrifuge.java index cc0863272..2a0a60307 100644 --- a/com/hbm/blocks/machine/DummyBlockCentrifuge.java +++ b/com/hbm/blocks/machine/DummyBlockCentrifuge.java @@ -6,10 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineCentrifuge; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -35,7 +31,8 @@ public class DummyBlockCentrifuge extends BlockContainer implements IDummy { return new TileEntityDummy(); } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { if(!safeBreak) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/DummyBlockChemplant.java b/com/hbm/blocks/machine/DummyBlockChemplant.java new file mode 100644 index 000000000..2a5a31e50 --- /dev/null +++ b/com/hbm/blocks/machine/DummyBlockChemplant.java @@ -0,0 +1,105 @@ +package com.hbm.blocks.machine; + +import java.util.Random; + +import com.hbm.blocks.ModBlocks; +import com.hbm.interfaces.IDummy; +import com.hbm.main.MainRegistry; +import com.hbm.tileentity.TileEntityDummy; +import com.hbm.tileentity.TileEntityMachineChemplant; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class DummyBlockChemplant extends BlockContainer implements IDummy { + + public static boolean safeBreak = false; + + public DummyBlockChemplant(Material p_i45386_1_) { + super(p_i45386_1_); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityDummy(); + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) + { + if(!safeBreak) { + TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TileEntityDummy) { + int a = ((TileEntityDummy)te).targetX; + int b = ((TileEntityDummy)te).targetY; + int c = ((TileEntityDummy)te).targetZ; + + //world.getBlock(a, b, c).breakBlock(world, a, b, c, block, i); + if(!world.isRemote) + world.func_147480_a(a, b, c, true); + } + } + world.removeTileEntity(x, y, z); + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) + { + return null; + } + + @Override + @SideOnly(Side.CLIENT) + public Item getItem(World world, int x, int y, int z) + { + return Item.getItemFromBlock(ModBlocks.machine_chemplant); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { + if(world.isRemote) + { + return true; + } else if(!player.isSneaking()) + { + TileEntity te = world.getTileEntity(x, y, z); + if(te != null && te instanceof TileEntityDummy) { + int a = ((TileEntityDummy)te).targetX; + int b = ((TileEntityDummy)te).targetY; + int c = ((TileEntityDummy)te).targetZ; + + TileEntityMachineChemplant entity = (TileEntityMachineChemplant) world.getTileEntity(a, b, c); + if(entity != null) + { + FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_machine_chemplant, world, a, b, c); + } + } + return true; + } else { + return false; + } + } + +} diff --git a/com/hbm/blocks/machine/DummyBlockCyclotron.java b/com/hbm/blocks/machine/DummyBlockCyclotron.java index b6619aafd..eb2e7349f 100644 --- a/com/hbm/blocks/machine/DummyBlockCyclotron.java +++ b/com/hbm/blocks/machine/DummyBlockCyclotron.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineCyclotron; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; @@ -33,7 +32,8 @@ public class DummyBlockCyclotron extends BlockContainer implements IDummy { return new TileEntityDummy(); } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { if(!safeBreak) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/DummyBlockDrill.java b/com/hbm/blocks/machine/DummyBlockDrill.java index d16574e5b..790727396 100644 --- a/com/hbm/blocks/machine/DummyBlockDrill.java +++ b/com/hbm/blocks/machine/DummyBlockDrill.java @@ -6,11 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityMachineCentrifuge; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -36,7 +31,8 @@ public class DummyBlockDrill extends BlockContainer implements IDummy { return new TileEntityDummy(); } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { if(!safeBreak) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/DummyBlockFlare.java b/com/hbm/blocks/machine/DummyBlockFlare.java index 79ebbf5f2..d82ce81a3 100644 --- a/com/hbm/blocks/machine/DummyBlockFlare.java +++ b/com/hbm/blocks/machine/DummyBlockFlare.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineCyclotron; import com.hbm.tileentity.TileEntityMachineGasFlare; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; @@ -33,7 +32,8 @@ public class DummyBlockFlare extends BlockContainer implements IDummy { return new TileEntityDummy(); } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { if(!safeBreak) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/DummyBlockIGenerator.java b/com/hbm/blocks/machine/DummyBlockIGenerator.java index 78d749690..0a5b9fa85 100644 --- a/com/hbm/blocks/machine/DummyBlockIGenerator.java +++ b/com/hbm/blocks/machine/DummyBlockIGenerator.java @@ -7,8 +7,6 @@ import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -16,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -34,7 +31,8 @@ public class DummyBlockIGenerator extends BlockContainer implements IDummy { return new TileEntityDummy(); } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { if(!safeBreak) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/DummyBlockWell.java b/com/hbm/blocks/machine/DummyBlockWell.java index 27815c749..ccef818f5 100644 --- a/com/hbm/blocks/machine/DummyBlockWell.java +++ b/com/hbm/blocks/machine/DummyBlockWell.java @@ -6,10 +6,7 @@ import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityMachineCyclotron; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -34,7 +31,8 @@ public class DummyBlockWell extends BlockContainer implements IDummy { return new TileEntityDummy(); } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { if(!safeBreak) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/com/hbm/blocks/machine/FWatzCore.java b/com/hbm/blocks/machine/FWatzCore.java index 4bc0ea81e..d861028a1 100644 --- a/com/hbm/blocks/machine/FWatzCore.java +++ b/com/hbm/blocks/machine/FWatzCore.java @@ -1,13 +1,8 @@ package com.hbm.blocks.machine; -import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityFWatzCore; -import com.hbm.tileentity.TileEntityMachineBattery; - -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/com/hbm/blocks/machine/FWatzHatch.java b/com/hbm/blocks/machine/FWatzHatch.java index 8d8ed5bb7..be7e03215 100644 --- a/com/hbm/blocks/machine/FWatzHatch.java +++ b/com/hbm/blocks/machine/FWatzHatch.java @@ -6,8 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityFWatzCore; -import com.hbm.tileentity.TileEntityFusionMultiblock; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/GasDuctSolid.java b/com/hbm/blocks/machine/GasDuctSolid.java index cd87ecc85..3304609fa 100644 --- a/com/hbm/blocks/machine/GasDuctSolid.java +++ b/com/hbm/blocks/machine/GasDuctSolid.java @@ -1,13 +1,6 @@ package com.hbm.blocks.machine; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.calc.UnionOfTileEntitiesAndBooleansForOil; import com.hbm.tileentity.TileEntityGasDuctSolid; -import com.hbm.tileentity.TileEntityOilDuctSolid; -import com.hbm.tileentity.TileEntityWireCoated; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/MachineAssembler.java b/com/hbm/blocks/machine/MachineAssembler.java index ae67559ce..90ac834f4 100644 --- a/com/hbm/blocks/machine/MachineAssembler.java +++ b/com/hbm/blocks/machine/MachineAssembler.java @@ -7,10 +7,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityNukeGadget; - -import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; diff --git a/com/hbm/blocks/machine/MachineCMBFactory.java b/com/hbm/blocks/machine/MachineCMBFactory.java index 96415756e..51b578fc8 100644 --- a/com/hbm/blocks/machine/MachineCMBFactory.java +++ b/com/hbm/blocks/machine/MachineCMBFactory.java @@ -6,8 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityMachineCMBFactory; -import com.hbm.tileentity.TileEntityMachineDiesel; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/com/hbm/blocks/machine/MachineCentrifuge.java b/com/hbm/blocks/machine/MachineCentrifuge.java index 72ec201d2..90bfc5b11 100644 --- a/com/hbm/blocks/machine/MachineCentrifuge.java +++ b/com/hbm/blocks/machine/MachineCentrifuge.java @@ -7,7 +7,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityMachineCentrifuge; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineChemplant.java b/com/hbm/blocks/machine/MachineChemplant.java new file mode 100644 index 000000000..cd15e2c7a --- /dev/null +++ b/com/hbm/blocks/machine/MachineChemplant.java @@ -0,0 +1,236 @@ +package com.hbm.blocks.machine; + +import java.util.Random; + +import com.hbm.blocks.ModBlocks; +import com.hbm.handler.MultiblockHandler; +import com.hbm.interfaces.IMultiblock; +import com.hbm.tileentity.TileEntityDummy; +import com.hbm.tileentity.TileEntityMachineChemplant; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class MachineChemplant extends BlockContainer implements IMultiblock { + + public MachineChemplant(Material p_i45386_1_) { + super(p_i45386_1_); + } + + @Override + public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { + return new TileEntityMachineChemplant(); + + } + + @Override + public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { + return Item.getItemFromBlock(ModBlocks.machine_chemplant); + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) { + int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; + + if (i == 0) { + world.setBlockMetadataWithNotify(x, y, z, 5, 2); + if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.assemblerDimensionEast)) { + MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.assemblerDimensionEast, ModBlocks.dummy_block_chemplant); + + // + DummyBlockChemplant.safeBreak = true; + world.setBlock(x - 1, y, z, ModBlocks.dummy_port_chemplant); + TileEntity te = world.getTileEntity(x - 1, y, z); + if(te instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x - 1, y, z + 1, ModBlocks.dummy_port_chemplant); + TileEntity te2 = world.getTileEntity(x - 1, y, z + 1); + if(te2 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te2; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x + 2, y, z, ModBlocks.dummy_port_chemplant); + TileEntity te3 = world.getTileEntity(x + 2, y, z); + if(te3 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te3; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x + 2, y, z + 1, ModBlocks.dummy_port_chemplant); + TileEntity te4 = world.getTileEntity(x + 2, y, z + 1); + if(te4 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te4; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + DummyBlockChemplant.safeBreak = false; + // + + } else + world.func_147480_a(x, y, z, true); + } + if (i == 1) { + world.setBlockMetadataWithNotify(x, y, z, 3, 2); + if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.assemblerDimensionSouth)) { + MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.assemblerDimensionSouth, ModBlocks.dummy_block_chemplant); + + // + DummyBlockChemplant.safeBreak = true; + world.setBlock(x, y, z - 1, ModBlocks.dummy_port_chemplant); + TileEntity te = world.getTileEntity(x, y, z - 1); + if(te instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x - 1, y, z - 1, ModBlocks.dummy_port_chemplant); + TileEntity te2 = world.getTileEntity(x - 1, y, z - 1); + if(te2 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te2; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x, y, z + 2, ModBlocks.dummy_port_chemplant); + TileEntity te3 = world.getTileEntity(x, y, z + 2); + if(te3 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te3; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x - 1, y, z + 2, ModBlocks.dummy_port_chemplant); + TileEntity te4 = world.getTileEntity(x - 1, y, z + 2); + if(te4 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te4; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + DummyBlockChemplant.safeBreak = false; + // + + } else + world.func_147480_a(x, y, z, true); + } + if (i == 2) { + world.setBlockMetadataWithNotify(x, y, z, 4, 2); + if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.assemblerDimensionWest)) { + MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.assemblerDimensionWest, ModBlocks.dummy_block_chemplant); + + // + DummyBlockChemplant.safeBreak = true; + world.setBlock(x + 1, y, z, ModBlocks.dummy_port_chemplant); + TileEntity te = world.getTileEntity(x + 1, y, z); + if(te instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x + 1, y, z - 1, ModBlocks.dummy_port_chemplant); + TileEntity te2 = world.getTileEntity(x + 1, y, z - 1); + if(te2 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te2; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x - 2, y, z, ModBlocks.dummy_port_chemplant); + TileEntity te3 = world.getTileEntity(x - 2, y, z); + if(te3 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te3; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x - 2, y, z - 1, ModBlocks.dummy_port_chemplant); + TileEntity te4 = world.getTileEntity(x - 2, y, z - 1); + if(te4 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te4; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + DummyBlockChemplant.safeBreak = false; + // + + } else + world.func_147480_a(x, y, z, true); + } + if (i == 3) { + world.setBlockMetadataWithNotify(x, y, z, 2, 2); + if(MultiblockHandler.checkSpace(world, x, y, z, MultiblockHandler.assemblerDimensionNorth)) { + MultiblockHandler.fillUp(world, x, y, z, MultiblockHandler.assemblerDimensionNorth, ModBlocks.dummy_block_chemplant); + + // + DummyBlockChemplant.safeBreak = true; + world.setBlock(x, y, z + 1, ModBlocks.dummy_port_chemplant); + TileEntity te = world.getTileEntity(x, y, z + 1); + if(te instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x + 1, y, z + 1, ModBlocks.dummy_port_chemplant); + TileEntity te2 = world.getTileEntity(x + 1, y, z + 1); + if(te2 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te2; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x, y, z - 2, ModBlocks.dummy_port_chemplant); + TileEntity te3 = world.getTileEntity(x, y, z - 2); + if(te3 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te3; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + world.setBlock(x + 1, y, z - 2, ModBlocks.dummy_port_chemplant); + TileEntity te4 = world.getTileEntity(x + 1, y, z - 2); + if(te4 instanceof TileEntityDummy) { + TileEntityDummy dummy = (TileEntityDummy)te4; + dummy.targetX = x; + dummy.targetY = y; + dummy.targetZ = z; + } + DummyBlockChemplant.safeBreak = false; + // + + } else + world.func_147480_a(x, y, z, true); + } + } +} diff --git a/com/hbm/blocks/machine/MachineCyclotron.java b/com/hbm/blocks/machine/MachineCyclotron.java index 422e39e4e..f8ad6276f 100644 --- a/com/hbm/blocks/machine/MachineCyclotron.java +++ b/com/hbm/blocks/machine/MachineCyclotron.java @@ -3,33 +3,22 @@ package com.hbm.blocks.machine; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; -import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityMachineCyclotron; -import com.hbm.tileentity.TileEntityMachineGenerator; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.Explosion; import net.minecraft.world.World; public class MachineCyclotron extends BlockContainer implements IMultiblock { diff --git a/com/hbm/blocks/machine/MachineGasFlare.java b/com/hbm/blocks/machine/MachineGasFlare.java index 935d21070..0e0f1066a 100644 --- a/com/hbm/blocks/machine/MachineGasFlare.java +++ b/com/hbm/blocks/machine/MachineGasFlare.java @@ -8,8 +8,6 @@ import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityMachineGasFlare; -import com.hbm.tileentity.TileEntityMachineOilWell; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachineIGenerator.java b/com/hbm/blocks/machine/MachineIGenerator.java index 887d667ea..76371c227 100644 --- a/com/hbm/blocks/machine/MachineIGenerator.java +++ b/com/hbm/blocks/machine/MachineIGenerator.java @@ -7,8 +7,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityNukeGadget; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -179,7 +177,8 @@ public class MachineIGenerator extends BlockContainer implements IMultiblock { return true; } - public void breakBlock(World world, int x, int y, int z, Block block, int i) + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int i) { /*MultiblockHandler.EnumDirection dir = MultiblockHandler.IntToEnum(world.getBlockMetadata(x, y, z)); diff --git a/com/hbm/blocks/machine/MachineMiningDrill.java b/com/hbm/blocks/machine/MachineMiningDrill.java index aae8b8467..751220592 100644 --- a/com/hbm/blocks/machine/MachineMiningDrill.java +++ b/com/hbm/blocks/machine/MachineMiningDrill.java @@ -6,7 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineMiningDrill; import net.minecraft.block.BlockContainer; diff --git a/com/hbm/blocks/machine/MachineOilWell.java b/com/hbm/blocks/machine/MachineOilWell.java index 22ef880e6..89cf9491e 100644 --- a/com/hbm/blocks/machine/MachineOilWell.java +++ b/com/hbm/blocks/machine/MachineOilWell.java @@ -7,7 +7,6 @@ import com.hbm.handler.MultiblockHandler; import com.hbm.interfaces.IMultiblock; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityDummy; -import com.hbm.tileentity.TileEntityMachineCyclotron; import com.hbm.tileentity.TileEntityMachineOilWell; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineRTG.java b/com/hbm/blocks/machine/MachineRTG.java index 6b8e2ce6f..95dc65344 100644 --- a/com/hbm/blocks/machine/MachineRTG.java +++ b/com/hbm/blocks/machine/MachineRTG.java @@ -6,8 +6,6 @@ import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; import com.hbm.tileentity.TileEntityMachineRTG; -import com.hbm.tileentity.TileEntityRtgFurnace; - import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -17,7 +15,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/MachineRefinery.java b/com/hbm/blocks/machine/MachineRefinery.java index 02ccf434e..9f9c3a92f 100644 --- a/com/hbm/blocks/machine/MachineRefinery.java +++ b/com/hbm/blocks/machine/MachineRefinery.java @@ -5,8 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineCMBFactory; -import com.hbm.tileentity.TileEntityMachineDiesel; import com.hbm.tileentity.TileEntityMachineRefinery; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineReiXMainframe.java b/com/hbm/blocks/machine/MachineReiXMainframe.java index 2a5ba1927..6f410281d 100644 --- a/com/hbm/blocks/machine/MachineReiXMainframe.java +++ b/com/hbm/blocks/machine/MachineReiXMainframe.java @@ -5,7 +5,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineReactor; import com.hbm.tileentity.TileEntityReiXMainframe; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; diff --git a/com/hbm/blocks/machine/MachineTeleporter.java b/com/hbm/blocks/machine/MachineTeleporter.java index 5d469880f..5ea223d23 100644 --- a/com/hbm/blocks/machine/MachineTeleporter.java +++ b/com/hbm/blocks/machine/MachineTeleporter.java @@ -6,22 +6,16 @@ import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.main.MainRegistry; -import com.hbm.tileentity.TileEntityMachineCMBFactory; import com.hbm.tileentity.TileEntityMachineTeleporter; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; diff --git a/com/hbm/blocks/machine/OilDuctSolid.java b/com/hbm/blocks/machine/OilDuctSolid.java index fd3cba325..beabd09e0 100644 --- a/com/hbm/blocks/machine/OilDuctSolid.java +++ b/com/hbm/blocks/machine/OilDuctSolid.java @@ -1,12 +1,6 @@ package com.hbm.blocks.machine; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.calc.UnionOfTileEntitiesAndBooleansForOil; import com.hbm.tileentity.TileEntityOilDuctSolid; -import com.hbm.tileentity.TileEntityWireCoated; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/machine/RailBooster.java b/com/hbm/blocks/machine/RailBooster.java index 20048a0a3..33caf9141 100644 --- a/com/hbm/blocks/machine/RailBooster.java +++ b/com/hbm/blocks/machine/RailBooster.java @@ -1,15 +1,11 @@ package com.hbm.blocks.machine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.BlockRailBase; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.util.IIcon; import net.minecraft.world.World; public class RailBooster extends RailHighspeed { + @Override public void onMinecartPass(World world, EntityMinecart cart, int y, int x, int z) { cart.motionX *= 1.15F; cart.motionY *= 1.15F; diff --git a/com/hbm/blocks/machine/RailHighspeed.java b/com/hbm/blocks/machine/RailHighspeed.java index f48a06ca3..012cbaf4a 100644 --- a/com/hbm/blocks/machine/RailHighspeed.java +++ b/com/hbm/blocks/machine/RailHighspeed.java @@ -1,10 +1,7 @@ package com.hbm.blocks.machine; -import com.hbm.lib.RefStrings; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityMinecart; @@ -24,20 +21,23 @@ public class RailHighspeed extends BlockRailBase { /** * Gets the block's texture. Args: side, meta */ - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public IIcon getIcon(int p_149691_1_, int p_149691_2_) { return p_149691_2_ >= 6 ? this.icon : this.blockIcon; } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister p_149651_1_) { super.registerBlockIcons(p_149651_1_); this.icon = p_149651_1_.registerIcon(this.getTextureName()); } - public float getRailMaxSpeed(World world, EntityMinecart cart, int y, int x, int z) + @Override + public float getRailMaxSpeed(World world, EntityMinecart cart, int y, int x, int z) { return 1.0f; } diff --git a/com/hbm/blocks/machine/ReactorCore.java b/com/hbm/blocks/machine/ReactorCore.java index 1c6c29ddd..426eb7c3c 100644 --- a/com/hbm/blocks/machine/ReactorCore.java +++ b/com/hbm/blocks/machine/ReactorCore.java @@ -2,14 +2,12 @@ package com.hbm.blocks.machine; import java.util.Random; -import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.tileentity.TileEntityReactorMultiblock; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/blocks/test/TestEventTester.java b/com/hbm/blocks/test/TestEventTester.java index e8cd93c1b..dbc7ff9b6 100644 --- a/com/hbm/blocks/test/TestEventTester.java +++ b/com/hbm/blocks/test/TestEventTester.java @@ -7,11 +7,6 @@ import java.util.Map; import java.util.Random; import com.hbm.entity.effect.EntityBlackHole; -import com.hbm.entity.effect.EntityFalloutRain; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionParticle; import com.hbm.main.MainRegistry; import net.minecraft.block.Block; @@ -19,7 +14,6 @@ import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; diff --git a/com/hbm/calc/UnionOfTileEntitiesAndBooleans.java b/com/hbm/calc/UnionOfTileEntitiesAndBooleans.java index a7892648b..1264563bb 100644 --- a/com/hbm/calc/UnionOfTileEntitiesAndBooleans.java +++ b/com/hbm/calc/UnionOfTileEntitiesAndBooleans.java @@ -2,8 +2,6 @@ package com.hbm.calc; import com.hbm.interfaces.ISource; -import net.minecraft.tileentity.TileEntity; - public class UnionOfTileEntitiesAndBooleans { public UnionOfTileEntitiesAndBooleans(ISource tileentity, boolean bool) diff --git a/com/hbm/calc/UnionOfTileEntitiesAndBooleansForGas.java b/com/hbm/calc/UnionOfTileEntitiesAndBooleansForGas.java index 51a757afa..8b17826f5 100644 --- a/com/hbm/calc/UnionOfTileEntitiesAndBooleansForGas.java +++ b/com/hbm/calc/UnionOfTileEntitiesAndBooleansForGas.java @@ -1,7 +1,6 @@ package com.hbm.calc; import com.hbm.interfaces.IGasSource; -import com.hbm.interfaces.IOilSource; public class UnionOfTileEntitiesAndBooleansForGas { diff --git a/com/hbm/calc/UnionOfTileEntitiesAndBooleansForOil.java b/com/hbm/calc/UnionOfTileEntitiesAndBooleansForOil.java index 9b712f25e..57d7ab4d5 100644 --- a/com/hbm/calc/UnionOfTileEntitiesAndBooleansForOil.java +++ b/com/hbm/calc/UnionOfTileEntitiesAndBooleansForOil.java @@ -1,9 +1,6 @@ package com.hbm.calc; import com.hbm.interfaces.IOilSource; -import com.hbm.interfaces.ISource; - -import net.minecraft.tileentity.TileEntity; public class UnionOfTileEntitiesAndBooleansForOil { diff --git a/com/hbm/creativetabs/MachineTab.java b/com/hbm/creativetabs/MachineTab.java index 8efd87229..96f16a24a 100644 --- a/com/hbm/creativetabs/MachineTab.java +++ b/com/hbm/creativetabs/MachineTab.java @@ -1,6 +1,5 @@ package com.hbm.creativetabs; -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import net.minecraft.creativetab.CreativeTabs; diff --git a/com/hbm/creativetabs/NukeTab.java b/com/hbm/creativetabs/NukeTab.java index 4a6cee3cb..dc7af22cb 100644 --- a/com/hbm/creativetabs/NukeTab.java +++ b/com/hbm/creativetabs/NukeTab.java @@ -1,8 +1,6 @@ package com.hbm.creativetabs; import com.hbm.blocks.ModBlocks; -import com.hbm.lib.RefStrings; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; diff --git a/com/hbm/entity/effect/EntityBlackHole.java b/com/hbm/entity/effect/EntityBlackHole.java index b2b9dbfdd..d16ef1b79 100644 --- a/com/hbm/entity/effect/EntityBlackHole.java +++ b/com/hbm/entity/effect/EntityBlackHole.java @@ -96,7 +96,7 @@ public class EntityBlackHole extends Entity { @Override protected void entityInit() { - this.dataWatcher.addObject(16, (float) 0.5F); + this.dataWatcher.addObject(16, 0.5F); } @Override diff --git a/com/hbm/entity/effect/EntityCloudFleija.java b/com/hbm/entity/effect/EntityCloudFleija.java index 477a77d53..5962681a1 100644 --- a/com/hbm/entity/effect/EntityCloudFleija.java +++ b/com/hbm/entity/effect/EntityCloudFleija.java @@ -24,7 +24,7 @@ public class EntityCloudFleija extends Entity { @Override protected void entityInit() { - this.dataWatcher.addObject(16, Integer.valueOf((int) 0)); + this.dataWatcher.addObject(16, Integer.valueOf(0)); } @Override diff --git a/com/hbm/entity/effect/EntityEMPBlast.java b/com/hbm/entity/effect/EntityEMPBlast.java index 59880f14e..0503bde5d 100644 --- a/com/hbm/entity/effect/EntityEMPBlast.java +++ b/com/hbm/entity/effect/EntityEMPBlast.java @@ -3,7 +3,6 @@ package com.hbm.entity.effect; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; -import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -24,7 +23,7 @@ public class EntityEMPBlast extends Entity { @Override protected void entityInit() { - this.dataWatcher.addObject(16, Integer.valueOf((int) 0)); + this.dataWatcher.addObject(16, Integer.valueOf(0)); } @Override diff --git a/com/hbm/entity/effect/EntityFalloutRain.java b/com/hbm/entity/effect/EntityFalloutRain.java index 37c3b00d9..828f1bfde 100644 --- a/com/hbm/entity/effect/EntityFalloutRain.java +++ b/com/hbm/entity/effect/EntityFalloutRain.java @@ -1,9 +1,6 @@ package com.hbm.entity.effect; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; -import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -43,7 +40,7 @@ public class EntityFalloutRain extends Entity { @Override protected void entityInit() { - this.dataWatcher.addObject(16, Integer.valueOf((int) 0)); + this.dataWatcher.addObject(16, Integer.valueOf(0)); } @Override @@ -59,7 +56,7 @@ public class EntityFalloutRain extends Entity { public void setScale(int i) { - this.dataWatcher.updateObject(16, Integer.valueOf((int) i)); + this.dataWatcher.updateObject(16, Integer.valueOf(i)); } public int getScale() { diff --git a/com/hbm/entity/effect/EntityNukeCloudSmall.java b/com/hbm/entity/effect/EntityNukeCloudSmall.java index 2343366b6..675421796 100644 --- a/com/hbm/entity/effect/EntityNukeCloudSmall.java +++ b/com/hbm/entity/effect/EntityNukeCloudSmall.java @@ -1,7 +1,5 @@ package com.hbm.entity.effect; -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; diff --git a/com/hbm/entity/grenade/EntityGrenadeASchrab.java b/com/hbm/entity/grenade/EntityGrenadeASchrab.java index 13a300afc..748218214 100644 --- a/com/hbm/entity/grenade/EntityGrenadeASchrab.java +++ b/com/hbm/entity/grenade/EntityGrenadeASchrab.java @@ -2,16 +2,9 @@ package com.hbm.entity.grenade; import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.explosion.ExplosionChaos; import com.hbm.main.MainRegistry; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeASchrab extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeBase.java b/com/hbm/entity/grenade/EntityGrenadeBase.java index 84ec9f648..abc80e78c 100644 --- a/com/hbm/entity/grenade/EntityGrenadeBase.java +++ b/com/hbm/entity/grenade/EntityGrenadeBase.java @@ -1,15 +1,7 @@ package com.hbm.entity.grenade; -import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.explosion.ExplosionChaos; -import com.hbm.main.MainRegistry; - -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; diff --git a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java index af8e4b8ad..a602b3c89 100644 --- a/com/hbm/entity/grenade/EntityGrenadeBlackHole.java +++ b/com/hbm/entity/grenade/EntityGrenadeBlackHole.java @@ -1,14 +1,9 @@ package com.hbm.entity.grenade; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import com.hbm.entity.effect.EntityBlackHole; -import com.hbm.explosion.ExplosionChaos; public class EntityGrenadeBlackHole extends EntityGrenadeBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeCluster.java b/com/hbm/entity/grenade/EntityGrenadeCluster.java index 8070b377e..83a4be97e 100644 --- a/com/hbm/entity/grenade/EntityGrenadeCluster.java +++ b/com/hbm/entity/grenade/EntityGrenadeCluster.java @@ -1,10 +1,6 @@ package com.hbm.entity.grenade; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import com.hbm.explosion.ExplosionChaos; diff --git a/com/hbm/entity/grenade/EntityGrenadeElectric.java b/com/hbm/entity/grenade/EntityGrenadeElectric.java index 39b634de8..09096a2b8 100644 --- a/com/hbm/entity/grenade/EntityGrenadeElectric.java +++ b/com/hbm/entity/grenade/EntityGrenadeElectric.java @@ -2,10 +2,6 @@ package com.hbm.entity.grenade; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeElectric extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeFire.java b/com/hbm/entity/grenade/EntityGrenadeFire.java index 8ebddf519..b8b6c7681 100644 --- a/com/hbm/entity/grenade/EntityGrenadeFire.java +++ b/com/hbm/entity/grenade/EntityGrenadeFire.java @@ -2,10 +2,6 @@ package com.hbm.entity.grenade; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import com.hbm.explosion.ExplosionChaos; diff --git a/com/hbm/entity/grenade/EntityGrenadeFrag.java b/com/hbm/entity/grenade/EntityGrenadeFrag.java index df4bb9030..ff38b5bd2 100644 --- a/com/hbm/entity/grenade/EntityGrenadeFrag.java +++ b/com/hbm/entity/grenade/EntityGrenadeFrag.java @@ -2,10 +2,6 @@ package com.hbm.entity.grenade; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import com.hbm.explosion.ExplosionChaos; diff --git a/com/hbm/entity/grenade/EntityGrenadeGas.java b/com/hbm/entity/grenade/EntityGrenadeGas.java index a0c2e7558..6a179aeb8 100644 --- a/com/hbm/entity/grenade/EntityGrenadeGas.java +++ b/com/hbm/entity/grenade/EntityGrenadeGas.java @@ -1,16 +1,10 @@ package com.hbm.entity.grenade; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import java.util.Random; -import com.hbm.entity.particle.EntityGasFX; -import com.hbm.entity.particle.EntityOilSpillFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; diff --git a/com/hbm/entity/grenade/EntityGrenadeGeneric.java b/com/hbm/entity/grenade/EntityGrenadeGeneric.java index 0f7321e74..fd55fa956 100644 --- a/com/hbm/entity/grenade/EntityGrenadeGeneric.java +++ b/com/hbm/entity/grenade/EntityGrenadeGeneric.java @@ -1,10 +1,6 @@ package com.hbm.entity.grenade; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeGeneric extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeLemon.java b/com/hbm/entity/grenade/EntityGrenadeLemon.java index 0d6ac70f5..7f7ba0b6e 100644 --- a/com/hbm/entity/grenade/EntityGrenadeLemon.java +++ b/com/hbm/entity/grenade/EntityGrenadeLemon.java @@ -1,14 +1,7 @@ package com.hbm.entity.grenade; -import com.hbm.explosion.ExplosionNukeGeneric; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeLemon extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeMk2.java b/com/hbm/entity/grenade/EntityGrenadeMk2.java index 50329e333..9f2f32f73 100644 --- a/com/hbm/entity/grenade/EntityGrenadeMk2.java +++ b/com/hbm/entity/grenade/EntityGrenadeMk2.java @@ -2,13 +2,7 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionLarge; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeMk2 extends EntityGrenadeBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeNuclear.java b/com/hbm/entity/grenade/EntityGrenadeNuclear.java index 4c32cc17e..bf27f8264 100644 --- a/com/hbm/entity/grenade/EntityGrenadeNuclear.java +++ b/com/hbm/entity/grenade/EntityGrenadeNuclear.java @@ -5,14 +5,7 @@ import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; import com.hbm.main.MainRegistry; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeNuclear extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeNuke.java b/com/hbm/entity/grenade/EntityGrenadeNuke.java index c342ce26e..d0b33b1b0 100644 --- a/com/hbm/entity/grenade/EntityGrenadeNuke.java +++ b/com/hbm/entity/grenade/EntityGrenadeNuke.java @@ -1,10 +1,6 @@ package com.hbm.entity.grenade; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeNuke extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadePlasma.java b/com/hbm/entity/grenade/EntityGrenadePlasma.java index 6dc1cb79c..fbdc995d4 100644 --- a/com/hbm/entity/grenade/EntityGrenadePlasma.java +++ b/com/hbm/entity/grenade/EntityGrenadePlasma.java @@ -1,15 +1,7 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionNukeGeneric; - -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadePlasma extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadePoison.java b/com/hbm/entity/grenade/EntityGrenadePoison.java index 292ef522d..dc169ae4d 100644 --- a/com/hbm/entity/grenade/EntityGrenadePoison.java +++ b/com/hbm/entity/grenade/EntityGrenadePoison.java @@ -3,10 +3,6 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionNukeGeneric; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadePoison extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadePulse.java b/com/hbm/entity/grenade/EntityGrenadePulse.java index 76c77960a..ba95dce93 100644 --- a/com/hbm/entity/grenade/EntityGrenadePulse.java +++ b/com/hbm/entity/grenade/EntityGrenadePulse.java @@ -2,13 +2,7 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionChaos; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadePulse extends EntityGrenadeBase { diff --git a/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java b/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java index 02aa66109..f0aa46ec3 100644 --- a/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java +++ b/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java @@ -3,10 +3,6 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionChaos; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeSchrabidium extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeShrapnel.java b/com/hbm/entity/grenade/EntityGrenadeShrapnel.java index 7d854d281..b362ba526 100644 --- a/com/hbm/entity/grenade/EntityGrenadeShrapnel.java +++ b/com/hbm/entity/grenade/EntityGrenadeShrapnel.java @@ -2,13 +2,8 @@ package com.hbm.entity.grenade; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; public class EntityGrenadeShrapnel extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeStrong.java b/com/hbm/entity/grenade/EntityGrenadeStrong.java index c5d63ecf7..aa0d84c54 100644 --- a/com/hbm/entity/grenade/EntityGrenadeStrong.java +++ b/com/hbm/entity/grenade/EntityGrenadeStrong.java @@ -3,10 +3,6 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionLarge; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeStrong extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeTau.java b/com/hbm/entity/grenade/EntityGrenadeTau.java index 0bf002ea3..75b1ebbef 100644 --- a/com/hbm/entity/grenade/EntityGrenadeTau.java +++ b/com/hbm/entity/grenade/EntityGrenadeTau.java @@ -2,13 +2,7 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionChaos; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeTau extends EntityGrenadeBase diff --git a/com/hbm/entity/grenade/EntityGrenadeZOMG.java b/com/hbm/entity/grenade/EntityGrenadeZOMG.java index 544a49ac2..edb195bf8 100644 --- a/com/hbm/entity/grenade/EntityGrenadeZOMG.java +++ b/com/hbm/entity/grenade/EntityGrenadeZOMG.java @@ -2,13 +2,7 @@ package com.hbm.entity.grenade; import com.hbm.explosion.ExplosionChaos; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; public class EntityGrenadeZOMG extends EntityGrenadeBase diff --git a/com/hbm/entity/item/EntityMinecartModBase.java b/com/hbm/entity/item/EntityMinecartModBase.java index cb73500f8..e7db12f59 100644 --- a/com/hbm/entity/item/EntityMinecartModBase.java +++ b/com/hbm/entity/item/EntityMinecartModBase.java @@ -111,12 +111,14 @@ public abstract class EntityMinecartModBase extends EntityMinecart * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to * prevent them from trampling crops */ - protected boolean canTriggerWalking() + @Override + protected boolean canTriggerWalking() { return false; } - protected void entityInit() + @Override + protected void entityInit() { this.dataWatcher.addObject(17, new Integer(0)); this.dataWatcher.addObject(18, new Integer(1)); @@ -132,7 +134,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Returns a boundingBox used to collide the entity with other entities and blocks. This enables the entity to be * pushable on contact, like boats or minecarts. */ - public AxisAlignedBB getCollisionBox(Entity p_70114_1_) + @Override + public AxisAlignedBB getCollisionBox(Entity p_70114_1_) { if (getCollisionHandler() != null) { @@ -144,7 +147,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * returns the bounding box for this entity */ - public AxisAlignedBB getBoundingBox() + @Override + public AxisAlignedBB getBoundingBox() { if (getCollisionHandler() != null) { @@ -156,7 +160,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Returns true if this entity should push and be pushed by other entities when colliding. */ - public boolean canBePushed() + @Override + public boolean canBePushed() { return canBePushed; } @@ -176,15 +181,17 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Returns the Y offset from the entity's position for any entity riding this one. */ - public double getMountedYOffset() + @Override + public double getMountedYOffset() { - return (double)this.height * 0.0D - 0.30000001192092896D; + return this.height * 0.0D - 0.30000001192092896D; } /** * Called when the entity is attacked. */ - public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) + @Override + public boolean attackEntityFrom(DamageSource p_70097_1_, float p_70097_2_) { if (!this.worldObj.isRemote && !this.isDead) { @@ -226,7 +233,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart } } - public void killMinecart(DamageSource p_94095_1_) + @Override + public void killMinecart(DamageSource p_94095_1_) { this.setDead(); ItemStack itemstack = new ItemStack(Items.minecart, 1); @@ -242,7 +250,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Setups the entity to do the hurt animation. Only used by packets in multiplayer. */ - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void performHurtAnimation() { this.setRollingDirection(-this.getRollingDirection()); @@ -253,7 +262,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Returns true if other Entities should be prevented from moving through this Entity. */ - public boolean canBeCollidedWith() + @Override + public boolean canBeCollidedWith() { return !this.isDead; } @@ -261,7 +271,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Will get destroyed next tick. */ - public void setDead() + @Override + public void setDead() { super.setDead(); } @@ -269,7 +280,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Called to update the entity's position/logic. */ - public void onUpdate() + @Override + public void onUpdate() { if (this.getRollingAmplitude() > 0) { @@ -359,12 +371,12 @@ public abstract class EntityMinecartModBase extends EntityMinecart { if (this.turnProgress > 0) { - double d6 = this.posX + (this.minecartX - this.posX) / (double)this.turnProgress; - double d7 = this.posY + (this.minecartY - this.posY) / (double)this.turnProgress; - double d1 = this.posZ + (this.minecartZ - this.posZ) / (double)this.turnProgress; - double d3 = MathHelper.wrapAngleTo180_double(this.minecartYaw - (double)this.rotationYaw); - this.rotationYaw = (float)((double)this.rotationYaw + d3 / (double)this.turnProgress); - this.rotationPitch = (float)((double)this.rotationPitch + (this.minecartPitch - (double)this.rotationPitch) / (double)this.turnProgress); + double d6 = this.posX + (this.minecartX - this.posX) / this.turnProgress; + double d7 = this.posY + (this.minecartY - this.posY) / this.turnProgress; + double d1 = this.posZ + (this.minecartZ - this.posZ) / this.turnProgress; + double d3 = MathHelper.wrapAngleTo180_double(this.minecartYaw - this.rotationYaw); + this.rotationYaw = (float)(this.rotationYaw + d3 / this.turnProgress); + this.rotationPitch = (float)(this.rotationPitch + (this.minecartPitch - this.rotationPitch) / this.turnProgress); --this.turnProgress; this.setPosition(d6, d7, d1); this.setRotation(this.rotationYaw, this.rotationPitch); @@ -425,7 +437,7 @@ public abstract class EntityMinecartModBase extends EntityMinecart } } - double d5 = (double)MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); + double d5 = MathHelper.wrapAngleTo180_float(this.rotationYaw - this.prevRotationYaw); if (d5 < -170.0D || d5 >= 170.0D) { @@ -477,9 +489,11 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Called every tick the minecart is on an activator rail. Args: x, y, z, is the rail receiving power */ - public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_) {} + @Override + public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_) {} - protected void func_94088_b(double p_94088_1_) + @Override + protected void func_94088_b(double p_94088_1_) { if (this.motionX < -p_94088_1_) { @@ -529,11 +543,12 @@ public abstract class EntityMinecartModBase extends EntityMinecart } } - protected void func_145821_a(int p_145821_1_, int p_145821_2_, int p_145821_3_, double p_145821_4_, double p_145821_6_, Block p_145821_8_, int p_145821_9_) + @Override + protected void func_145821_a(int p_145821_1_, int p_145821_2_, int p_145821_3_, double p_145821_4_, double p_145821_6_, Block p_145821_8_, int p_145821_9_) { this.fallDistance = 0.0F; Vec3 vec3 = this.func_70489_a(this.posX, this.posY, this.posZ); - this.posY = (double)p_145821_2_; + this.posY = p_145821_2_; boolean flag = false; boolean flag1 = false; @@ -550,7 +565,7 @@ public abstract class EntityMinecartModBase extends EntityMinecart if (p_145821_9_ >= 2 && p_145821_9_ <= 5) { - this.posY = (double)(p_145821_2_ + 1); + this.posY = p_145821_2_ + 1; } if (p_145821_9_ == 2) @@ -574,8 +589,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart } int[][] aint = matrix[p_145821_9_]; - double d2 = (double)(aint[1][0] - aint[0][0]); - double d3 = (double)(aint[1][2] - aint[0][2]); + double d2 = aint[1][0] - aint[0][0]; + double d3 = aint[1][2] - aint[0][2]; double d4 = Math.sqrt(d2 * d2 + d3 * d3); double d5 = this.motionX * d2 + this.motionZ * d3; @@ -601,12 +616,12 @@ public abstract class EntityMinecartModBase extends EntityMinecart if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityLivingBase) { - d7 = (double)((EntityLivingBase)this.riddenByEntity).moveForward; + d7 = ((EntityLivingBase)this.riddenByEntity).moveForward; if (d7 > 0.0D) { - d8 = -Math.sin((double)(this.riddenByEntity.rotationYaw * (float)Math.PI / 180.0F)); - d9 = Math.cos((double)(this.riddenByEntity.rotationYaw * (float)Math.PI / 180.0F)); + d8 = -Math.sin(this.riddenByEntity.rotationYaw * (float)Math.PI / 180.0F); + d9 = Math.cos(this.riddenByEntity.rotationYaw * (float)Math.PI / 180.0F); d10 = this.motionX * this.motionX + this.motionZ * this.motionZ; if (d10 < 0.01D) @@ -637,10 +652,10 @@ public abstract class EntityMinecartModBase extends EntityMinecart } d7 = 0.0D; - d8 = (double)p_145821_1_ + 0.5D + (double)aint[0][0] * 0.5D; - d9 = (double)p_145821_3_ + 0.5D + (double)aint[0][2] * 0.5D; - d10 = (double)p_145821_1_ + 0.5D + (double)aint[1][0] * 0.5D; - double d11 = (double)p_145821_3_ + 0.5D + (double)aint[1][2] * 0.5D; + d8 = p_145821_1_ + 0.5D + aint[0][0] * 0.5D; + d9 = p_145821_3_ + 0.5D + aint[0][2] * 0.5D; + d10 = p_145821_1_ + 0.5D + aint[1][0] * 0.5D; + double d11 = p_145821_3_ + 0.5D + aint[1][2] * 0.5D; d2 = d10 - d8; d3 = d11 - d9; double d12; @@ -648,13 +663,13 @@ public abstract class EntityMinecartModBase extends EntityMinecart if (d2 == 0.0D) { - this.posX = (double)p_145821_1_ + 0.5D; - d7 = this.posZ - (double)p_145821_3_; + this.posX = p_145821_1_ + 0.5D; + d7 = this.posZ - p_145821_3_; } else if (d3 == 0.0D) { - this.posZ = (double)p_145821_3_ + 0.5D; - d7 = this.posX - (double)p_145821_1_; + this.posZ = p_145821_3_ + 0.5D; + d7 = this.posX - p_145821_1_; } else { @@ -665,17 +680,17 @@ public abstract class EntityMinecartModBase extends EntityMinecart this.posX = d8 + d2 * d7; this.posZ = d9 + d3 * d7; - this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ); + this.setPosition(this.posX, this.posY + this.yOffset, this.posZ); moveMinecartOnRail(p_145821_1_, p_145821_2_, p_145821_3_, p_145821_4_); if (aint[0][1] != 0 && MathHelper.floor_double(this.posX) - p_145821_1_ == aint[0][0] && MathHelper.floor_double(this.posZ) - p_145821_3_ == aint[0][2]) { - this.setPosition(this.posX, this.posY + (double)aint[0][1], this.posZ); + this.setPosition(this.posX, this.posY + aint[0][1], this.posZ); } else if (aint[1][1] != 0 && MathHelper.floor_double(this.posX) - p_145821_1_ == aint[1][0] && MathHelper.floor_double(this.posZ) - p_145821_3_ == aint[1][2]) { - this.setPosition(this.posX, this.posY + (double)aint[1][1], this.posZ); + this.setPosition(this.posX, this.posY + aint[1][1], this.posZ); } this.applyDrag(); @@ -701,8 +716,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart if (j1 != p_145821_1_ || i1 != p_145821_3_) { d6 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.motionX = d6 * (double)(j1 - p_145821_1_); - this.motionZ = d6 * (double)(i1 - p_145821_3_); + this.motionX = d6 * (j1 - p_145821_1_); + this.motionZ = d6 * (i1 - p_145821_3_); } if(shouldDoRailFunctions()) @@ -745,7 +760,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart } } - protected void applyDrag() + @Override + protected void applyDrag() { if (this.riddenByEntity != null) { @@ -761,7 +777,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart } } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public Vec3 func_70495_a(double p_70495_1_, double p_70495_3_, double p_70495_5_, double p_70495_7_) { @@ -788,16 +805,16 @@ public abstract class EntityMinecartModBase extends EntityMinecart { int l = ((BlockRailBase)block).getBasicRailMetadata(worldObj, this, i, j, k); - p_70495_3_ = (double)j; + p_70495_3_ = j; if (l >= 2 && l <= 5) { - p_70495_3_ = (double)(j + 1); + p_70495_3_ = j + 1; } int[][] aint = matrix[l]; - double d4 = (double)(aint[1][0] - aint[0][0]); - double d5 = (double)(aint[1][2] - aint[0][2]); + double d4 = aint[1][0] - aint[0][0]; + double d5 = aint[1][2] - aint[0][2]; double d6 = Math.sqrt(d4 * d4 + d5 * d5); d4 /= d6; d5 /= d6; @@ -806,18 +823,19 @@ public abstract class EntityMinecartModBase extends EntityMinecart if (aint[0][1] != 0 && MathHelper.floor_double(p_70495_1_) - i == aint[0][0] && MathHelper.floor_double(p_70495_5_) - k == aint[0][2]) { - p_70495_3_ += (double)aint[0][1]; + p_70495_3_ += aint[0][1]; } else if (aint[1][1] != 0 && MathHelper.floor_double(p_70495_1_) - i == aint[1][0] && MathHelper.floor_double(p_70495_5_) - k == aint[1][2]) { - p_70495_3_ += (double)aint[1][1]; + p_70495_3_ += aint[1][1]; } return this.func_70489_a(p_70495_1_, p_70495_3_, p_70495_5_); } } - public Vec3 func_70489_a(double p_70489_1_, double p_70489_3_, double p_70489_5_) + @Override + public Vec3 func_70489_a(double p_70489_1_, double p_70489_3_, double p_70489_5_) { int i = MathHelper.floor_double(p_70489_1_); int j = MathHelper.floor_double(p_70489_3_); @@ -833,34 +851,34 @@ public abstract class EntityMinecartModBase extends EntityMinecart if (BlockRailBase.func_150051_a(block)) { int l = ((BlockRailBase)block).getBasicRailMetadata(worldObj, this, i, j, k); - p_70489_3_ = (double)j; + p_70489_3_ = j; if (l >= 2 && l <= 5) { - p_70489_3_ = (double)(j + 1); + p_70489_3_ = j + 1; } int[][] aint = matrix[l]; double d3 = 0.0D; - double d4 = (double)i + 0.5D + (double)aint[0][0] * 0.5D; - double d5 = (double)j + 0.5D + (double)aint[0][1] * 0.5D; - double d6 = (double)k + 0.5D + (double)aint[0][2] * 0.5D; - double d7 = (double)i + 0.5D + (double)aint[1][0] * 0.5D; - double d8 = (double)j + 0.5D + (double)aint[1][1] * 0.5D; - double d9 = (double)k + 0.5D + (double)aint[1][2] * 0.5D; + double d4 = i + 0.5D + aint[0][0] * 0.5D; + double d5 = j + 0.5D + aint[0][1] * 0.5D; + double d6 = k + 0.5D + aint[0][2] * 0.5D; + double d7 = i + 0.5D + aint[1][0] * 0.5D; + double d8 = j + 0.5D + aint[1][1] * 0.5D; + double d9 = k + 0.5D + aint[1][2] * 0.5D; double d10 = d7 - d4; double d11 = (d8 - d5) * 2.0D; double d12 = d9 - d6; if (d10 == 0.0D) { - p_70489_1_ = (double)i + 0.5D; - d3 = p_70489_5_ - (double)k; + p_70489_1_ = i + 0.5D; + d3 = p_70489_5_ - k; } else if (d12 == 0.0D) { - p_70489_5_ = (double)k + 0.5D; - d3 = p_70489_1_ - (double)i; + p_70489_5_ = k + 0.5D; + d3 = p_70489_1_ - i; } else { @@ -894,7 +912,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(NBTTagCompound p_70037_1_) + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { if (p_70037_1_.getBoolean("CustomDisplayTile")) { @@ -912,7 +931,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(NBTTagCompound p_70014_1_) + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { if (this.hasDisplayTile()) { @@ -928,7 +948,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart } } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public float getShadowSize() { return 0.0F; @@ -937,7 +958,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Applies a velocity to each of the entities pushing them away from each other. Args: entity */ - public void applyEntityCollision(Entity p_70108_1_) + @Override + public void applyEntityCollision(Entity p_70108_1_) { MinecraftForge.EVENT_BUS.post(new MinecartCollisionEvent(this, p_70108_1_)); if (getCollisionHandler() != null) @@ -960,7 +982,7 @@ public abstract class EntityMinecartModBase extends EntityMinecart if (d2 >= 9.999999747378752E-5D) { - d2 = (double)MathHelper.sqrt_double(d2); + d2 = MathHelper.sqrt_double(d2); d0 /= d2; d1 /= d2; double d3 = 1.0D / d2; @@ -974,8 +996,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart d1 *= d3; d0 *= 0.10000000149011612D; d1 *= 0.10000000149011612D; - d0 *= (double)(1.0F - this.entityCollisionReduction); - d1 *= (double)(1.0F - this.entityCollisionReduction); + d0 *= 1.0F - this.entityCollisionReduction; + d1 *= 1.0F - this.entityCollisionReduction; d0 *= 0.5D; d1 *= 0.5D; @@ -984,7 +1006,7 @@ public abstract class EntityMinecartModBase extends EntityMinecart double d4 = p_70108_1_.posX - this.posX; double d5 = p_70108_1_.posZ - this.posZ; Vec3 vec3 = Vec3.createVectorHelper(d4, 0.0D, d5).normalize(); - Vec3 vec31 = Vec3.createVectorHelper((double)MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F), 0.0D, (double)MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F)).normalize(); + Vec3 vec31 = Vec3.createVectorHelper(MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F), 0.0D, MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F)).normalize(); double d6 = Math.abs(vec3.dotProduct(vec31)); if (d6 < 0.800000011920929D) @@ -1037,14 +1059,15 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Sets the position and rotation. Only difference from the other one is no bounding on the rotation. Args: posX, * posY, posZ, yaw, pitch */ - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void setPositionAndRotation2(double p_70056_1_, double p_70056_3_, double p_70056_5_, float p_70056_7_, float p_70056_8_, int p_70056_9_) { this.minecartX = p_70056_1_; this.minecartY = p_70056_3_; this.minecartZ = p_70056_5_; - this.minecartYaw = (double)p_70056_7_; - this.minecartPitch = (double)p_70056_8_; + this.minecartYaw = p_70056_7_; + this.minecartPitch = p_70056_8_; this.turnProgress = p_70056_9_ + 2; this.motionX = this.velocityX; this.motionY = this.velocityY; @@ -1055,7 +1078,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Sets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over * 40. */ - public void setDamage(float p_70492_1_) + @Override + public void setDamage(float p_70492_1_) { this.dataWatcher.updateObject(19, Float.valueOf(p_70492_1_)); } @@ -1063,7 +1087,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Sets the velocity to the args. Args: x, y, z */ - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) { this.velocityX = this.motionX = p_70016_1_; @@ -1075,7 +1100,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Gets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over * 40. */ - public float getDamage() + @Override + public float getDamage() { return this.dataWatcher.getWatchableObjectFloat(19); } @@ -1083,7 +1109,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Sets the rolling amplitude the cart rolls while being attacked. */ - public void setRollingAmplitude(int p_70497_1_) + @Override + public void setRollingAmplitude(int p_70497_1_) { this.dataWatcher.updateObject(17, Integer.valueOf(p_70497_1_)); } @@ -1091,7 +1118,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Gets the rolling amplitude the cart rolls while being attacked. */ - public int getRollingAmplitude() + @Override + public int getRollingAmplitude() { return this.dataWatcher.getWatchableObjectInt(17); } @@ -1099,7 +1127,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Sets the rolling direction the cart rolls while being attacked. Can be 1 or -1. */ - public void setRollingDirection(int p_70494_1_) + @Override + public void setRollingDirection(int p_70494_1_) { this.dataWatcher.updateObject(18, Integer.valueOf(p_70494_1_)); } @@ -1107,14 +1136,17 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Gets the rolling direction the cart rolls while being attacked. Can be 1 or -1. */ - public int getRollingDirection() + @Override + public int getRollingDirection() { return this.dataWatcher.getWatchableObjectInt(18); } - public abstract int getMinecartType(); + @Override + public abstract int getMinecartType(); - public Block func_145820_n() + @Override + public Block func_145820_n() { if (!this.hasDisplayTile()) { @@ -1127,55 +1159,65 @@ public abstract class EntityMinecartModBase extends EntityMinecart } } - public Block func_145817_o() + @Override + public Block func_145817_o() { return Blocks.air; } - public int getDisplayTileData() + @Override + public int getDisplayTileData() { return !this.hasDisplayTile() ? this.getDefaultDisplayTileData() : this.getDataWatcher().getWatchableObjectInt(20) >> 16; } - public int getDefaultDisplayTileData() + @Override + public int getDefaultDisplayTileData() { return 0; } - public int getDisplayTileOffset() + @Override + public int getDisplayTileOffset() { return !this.hasDisplayTile() ? this.getDefaultDisplayTileOffset() : this.getDataWatcher().getWatchableObjectInt(21); } - public int getDefaultDisplayTileOffset() + @Override + public int getDefaultDisplayTileOffset() { return 6; } - public void func_145819_k(int p_145819_1_) + @Override + public void func_145819_k(int p_145819_1_) { this.getDataWatcher().updateObject(20, Integer.valueOf(p_145819_1_ & 65535 | this.getDisplayTileData() << 16)); this.setHasDisplayTile(true); } - public void setDisplayTileData(int p_94092_1_) + @Override + public void setDisplayTileData(int p_94092_1_) { this.getDataWatcher().updateObject(20, Integer.valueOf(Block.getIdFromBlock(this.func_145820_n()) & 65535 | p_94092_1_ << 16)); this.setHasDisplayTile(true); } - public void setDisplayTileOffset(int p_94086_1_) + @Override + public void setDisplayTileOffset(int p_94086_1_) { this.getDataWatcher().updateObject(21, Integer.valueOf(p_94086_1_)); this.setHasDisplayTile(true); } - public boolean hasDisplayTile() + @Override + public boolean hasDisplayTile() { return this.getDataWatcher().getWatchableObjectByte(22) == 1; } - public void setHasDisplayTile(boolean p_94096_1_) + @Override + public void setHasDisplayTile(boolean p_94096_1_) { this.getDataWatcher().updateObject(22, Byte.valueOf((byte)(p_94096_1_ ? 1 : 0))); } @@ -1183,7 +1225,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Sets the minecart's name. */ - public void setMinecartName(String p_96094_1_) + @Override + public void setMinecartName(String p_96094_1_) { this.entityName = p_96094_1_; } @@ -1191,7 +1234,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Gets the name of this command sender (usually username, but possibly "Rcon") */ - public String getCommandSenderName() + @Override + public String getCommandSenderName() { return this.entityName != null ? this.entityName : super.getCommandSenderName(); } @@ -1199,12 +1243,14 @@ public abstract class EntityMinecartModBase extends EntityMinecart /** * Returns if the inventory is named */ - public boolean hasCustomInventoryName() + @Override + public boolean hasCustomInventoryName() { return this.entityName != null; } - public String func_95999_t() + @Override + public String func_95999_t() { return this.entityName; } @@ -1213,7 +1259,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Moved to allow overrides. * This code handles minecart movement and speed capping when on a rail. */ - public void moveMinecartOnRail(int x, int y, int z, double par4){ + @Override + public void moveMinecartOnRail(int x, int y, int z, double par4){ double d12 = this.motionX; double d13 = this.motionZ; @@ -1272,7 +1319,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * but is not necessary the item the cart drops when destroyed. * @return An ItemStack that can be used to place the cart. */ - public ItemStack getCartItem() { + @Override + public ItemStack getCartItem() { return new ItemStack(Items.minecart); } @@ -1282,7 +1330,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * This function is mainly used to gracefully detach a minecart from a rail. * @return True if the minecart can use rails. */ - public boolean canUseRail() + @Override + public boolean canUseRail() { return canUseRail; } @@ -1292,7 +1341,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * This function is mainly used to gracefully detach a minecart from a rail. * @param use Whether the minecart can currently use rails. */ - public void setCanUseRail(boolean use) + @Override + public void setCanUseRail(boolean use) { canUseRail = use; } @@ -1301,7 +1351,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Return false if this cart should not call onMinecartPass() and should ignore Powered Rails. * @return True if this cart should call onMinecartPass(). */ - public boolean shouldDoRailFunctions() + @Override + public boolean shouldDoRailFunctions() { return true; } @@ -1310,7 +1361,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Returns true if this cart is self propelled. * @return True if powered. */ - public boolean isPoweredCart() + @Override + public boolean isPoweredCart() { return getMinecartType()== 2; } @@ -1319,7 +1371,8 @@ public abstract class EntityMinecartModBase extends EntityMinecart * Returns true if this cart can be ridden by an Entity. * @return True if this cart can be ridden. */ - public boolean canBeRidden() + @Override + public boolean canBeRidden() { return false; } @@ -1337,42 +1390,50 @@ public abstract class EntityMinecartModBase extends EntityMinecart * * @return Carts max speed. */ - public float getMaxCartSpeedOnRail() + @Override + public float getMaxCartSpeedOnRail() { return 1.2f; } - public float getMaxSpeedAirLateral() + @Override + public float getMaxSpeedAirLateral() { return maxSpeedAirLateral; } - public void setMaxSpeedAirLateral(float value) + @Override + public void setMaxSpeedAirLateral(float value) { maxSpeedAirLateral = value; } - public float getMaxSpeedAirVertical() + @Override + public float getMaxSpeedAirVertical() { return maxSpeedAirVertical; } - public void setMaxSpeedAirVertical(float value) + @Override + public void setMaxSpeedAirVertical(float value) { maxSpeedAirVertical = value; } - public double getDragAir() + @Override + public double getDragAir() { return dragAir; } - public void setDragAir(double value) + @Override + public void setDragAir(double value) { dragAir = value; } - public double getSlopeAdjustment() + @Override + public double getSlopeAdjustment() { return 0.0078125D; } diff --git a/com/hbm/entity/item/EntityMinecartTest.java b/com/hbm/entity/item/EntityMinecartTest.java index ebfaf7560..bdca79aed 100644 --- a/com/hbm/entity/item/EntityMinecartTest.java +++ b/com/hbm/entity/item/EntityMinecartTest.java @@ -6,8 +6,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.entity.item.EntityMinecartTNT; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -30,12 +28,14 @@ public class EntityMinecartTest extends EntityMinecartModBase super(p_i1728_1_, p_i1728_2_, p_i1728_4_, p_i1728_6_); } - public int getMinecartType() + @Override + public int getMinecartType() { return 9; } - public Block func_145817_o() + @Override + public Block func_145817_o() { return ModBlocks.crate; } @@ -43,7 +43,8 @@ public class EntityMinecartTest extends EntityMinecartModBase /** * Called to update the entity's position/logic. */ - public void onUpdate() + @Override + public void onUpdate() { super.onUpdate(); @@ -70,7 +71,8 @@ public class EntityMinecartTest extends EntityMinecartModBase System.out.println(this.rotationYaw); } - public void killMinecart(DamageSource p_94095_1_) + @Override + public void killMinecart(DamageSource p_94095_1_) { super.killMinecart(p_94095_1_); double d0 = this.motionX * this.motionX + this.motionZ * this.motionZ; @@ -108,12 +110,13 @@ public class EntityMinecartTest extends EntityMinecartModBase /** * Called when the mob is falling. Calculates and applies fall damage. */ - protected void fall(float p_70069_1_) + @Override + protected void fall(float p_70069_1_) { if (p_70069_1_ >= 3.0F) { float f1 = p_70069_1_ / 10.0F; - this.explodeCart((double)(f1 * f1)); + this.explodeCart(f1 * f1); } super.fall(p_70069_1_); @@ -122,7 +125,8 @@ public class EntityMinecartTest extends EntityMinecartModBase /** * Called every tick the minecart is on an activator rail. Args: x, y, z, is the rail receiving power */ - public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_) + @Override + public void onActivatorRailPass(int p_96095_1_, int p_96095_2_, int p_96095_3_, boolean p_96095_4_) { if (p_96095_4_ && this.minecartTNTFuse < 0) { @@ -130,7 +134,8 @@ public class EntityMinecartTest extends EntityMinecartModBase } } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void handleHealthUpdate(byte p_70103_1_) { if (p_70103_1_ == 10) @@ -171,12 +176,14 @@ public class EntityMinecartTest extends EntityMinecartModBase return this.minecartTNTFuse > -1; } - public float func_145772_a(Explosion p_145772_1_, World p_145772_2_, int p_145772_3_, int p_145772_4_, int p_145772_5_, Block p_145772_6_) + @Override + public float func_145772_a(Explosion p_145772_1_, World p_145772_2_, int p_145772_3_, int p_145772_4_, int p_145772_5_, Block p_145772_6_) { return this.isIgnited() && (BlockRailBase.func_150051_a(p_145772_6_) || BlockRailBase.func_150049_b_(p_145772_2_, p_145772_3_, p_145772_4_ + 1, p_145772_5_)) ? 0.0F : super.func_145772_a(p_145772_1_, p_145772_2_, p_145772_3_, p_145772_4_, p_145772_5_, p_145772_6_); } - public boolean func_145774_a(Explosion p_145774_1_, World p_145774_2_, int p_145774_3_, int p_145774_4_, int p_145774_5_, Block p_145774_6_, float p_145774_7_) + @Override + public boolean func_145774_a(Explosion p_145774_1_, World p_145774_2_, int p_145774_3_, int p_145774_4_, int p_145774_5_, Block p_145774_6_, float p_145774_7_) { return this.isIgnited() && (BlockRailBase.func_150051_a(p_145774_6_) || BlockRailBase.func_150049_b_(p_145774_2_, p_145774_3_, p_145774_4_ + 1, p_145774_5_)) ? false : super.func_145774_a(p_145774_1_, p_145774_2_, p_145774_3_, p_145774_4_, p_145774_5_, p_145774_6_, p_145774_7_); } @@ -184,7 +191,8 @@ public class EntityMinecartTest extends EntityMinecartModBase /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - protected void readEntityFromNBT(NBTTagCompound p_70037_1_) + @Override + protected void readEntityFromNBT(NBTTagCompound p_70037_1_) { super.readEntityFromNBT(p_70037_1_); @@ -197,7 +205,8 @@ public class EntityMinecartTest extends EntityMinecartModBase /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - protected void writeEntityToNBT(NBTTagCompound p_70014_1_) + @Override + protected void writeEntityToNBT(NBTTagCompound p_70014_1_) { super.writeEntityToNBT(p_70014_1_); p_70014_1_.setInteger("TNTFuse", this.minecartTNTFuse); diff --git a/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java b/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java index e8746093a..91e92ce55 100644 --- a/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java +++ b/com/hbm/entity/logic/EntityNukeExplosionAdvanced.java @@ -1,13 +1,7 @@ package com.hbm.entity.logic; -import java.util.HashSet; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import com.hbm.entity.effect.EntityFalloutRain; diff --git a/com/hbm/entity/logic/EntityNukeExplosionPlus.java b/com/hbm/entity/logic/EntityNukeExplosionPlus.java index e22db5b46..7c0089cf2 100644 --- a/com/hbm/entity/logic/EntityNukeExplosionPlus.java +++ b/com/hbm/entity/logic/EntityNukeExplosionPlus.java @@ -38,7 +38,7 @@ public class EntityNukeExplosionPlus extends Entity { if(this.waste) { exp = new ExplosionNukeAdvanced((int)this.posX, (int)this.posY, (int)this.posZ, this.worldObj, this.destructionRange, this.coefficient, 0); - wst = new ExplosionNukeAdvanced((int)this.posX, (int)this.posY, (int)this.posZ, this.worldObj, (int)(this.wasteRange), this.coefficient, 2); + wst = new ExplosionNukeAdvanced((int)this.posX, (int)this.posY, (int)this.posZ, this.worldObj, (this.wasteRange), this.coefficient, 2); vap = new ExplosionNukeAdvanced((int)this.posX, (int)this.posY, (int)this.posZ, this.worldObj, (int)(this.wasteRange * 1.5), this.coefficient, 1); } else { expl = new ExplosionFleija((int)this.posX, (int)this.posY, (int)this.posZ, this.worldObj, this.destructionRange, this.coefficient, this.coefficient2); @@ -76,11 +76,11 @@ public class EntityNukeExplosionPlus extends Entity { ExplosionNukeGeneric.dealDamage(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, this.destructionRange * 2); } else { if (!did2 && waste) { - EntityFalloutRain fallout = new EntityFalloutRain(this.worldObj, (int)(this.wasteRange) * 10); + EntityFalloutRain fallout = new EntityFalloutRain(this.worldObj, (this.wasteRange) * 10); fallout.posX = this.posX; fallout.posY = this.posY; fallout.posZ = this.posZ; - fallout.setScale((int)(this.wasteRange)); + fallout.setScale((this.wasteRange)); this.worldObj.spawnEntityInWorld(fallout); diff --git a/com/hbm/entity/missile/EntityMissileAntiBallistic.java b/com/hbm/entity/missile/EntityMissileAntiBallistic.java index 311a67bef..d2dc92202 100644 --- a/com/hbm/entity/missile/EntityMissileAntiBallistic.java +++ b/com/hbm/entity/missile/EntityMissileAntiBallistic.java @@ -2,7 +2,6 @@ package com.hbm.entity.missile; import com.hbm.calc.EasyLocation; import com.hbm.entity.particle.EntityDSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import net.minecraft.entity.Entity; diff --git a/com/hbm/entity/missile/EntityMissileIncendiary.java b/com/hbm/entity/missile/EntityMissileIncendiary.java index 11f9e9700..696195a42 100644 --- a/com/hbm/entity/missile/EntityMissileIncendiary.java +++ b/com/hbm/entity/missile/EntityMissileIncendiary.java @@ -5,7 +5,6 @@ import com.hbm.explosion.ExplosionLarge; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java b/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java index 1e2ba44f9..83a68036a 100644 --- a/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java +++ b/com/hbm/entity/missile/EntityMissileIncendiaryStrong.java @@ -4,7 +4,6 @@ import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; -import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/com/hbm/entity/missile/EntityMissileInferno.java b/com/hbm/entity/missile/EntityMissileInferno.java index 489797b66..d06bb610f 100644 --- a/com/hbm/entity/missile/EntityMissileInferno.java +++ b/com/hbm/entity/missile/EntityMissileInferno.java @@ -4,7 +4,6 @@ import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; -import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/com/hbm/entity/mob/EntityCyberCrab.java b/com/hbm/entity/mob/EntityCyberCrab.java index 9affe9028..2b4c43a36 100644 --- a/com/hbm/entity/mob/EntityCyberCrab.java +++ b/com/hbm/entity/mob/EntityCyberCrab.java @@ -1,59 +1,19 @@ package com.hbm.entity.mob; -import java.util.HashSet; -import java.util.List; - -import com.hbm.entity.effect.EntityNukeCloudSmall; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.explosion.ExplosionParticle; -import com.hbm.explosion.ExplosionParticleB; -import com.hbm.items.ModItems; -import com.hbm.lib.Library; -import com.hbm.lib.ModDamageSource; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IRangedAttackMob; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAIArrowAttack; -import net.minecraft.entity.ai.EntityAIAttackOnCollide; -import net.minecraft.entity.ai.EntityAIAvoidEntity; -import net.minecraft.entity.ai.EntityAIControlledByPlayer; -import net.minecraft.entity.ai.EntityAIFollowParent; -import net.minecraft.entity.ai.EntityAIHurtByTarget; -import net.minecraft.entity.ai.EntityAILookIdle; -import net.minecraft.entity.ai.EntityAIMate; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.ai.EntityAIPanic; -import net.minecraft.entity.ai.EntityAISwimming; -import net.minecraft.entity.ai.EntityAITempt; import net.minecraft.entity.ai.EntityAIWander; -import net.minecraft.entity.ai.EntityAIWatchClosest; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityMob; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityCow; -import net.minecraft.entity.passive.EntityMooshroom; -import net.minecraft.entity.passive.EntityOcelot; -import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class EntityCyberCrab extends EntityMob implements IRangedAttackMob { diff --git a/com/hbm/entity/mob/EntityHunterChopper.java b/com/hbm/entity/mob/EntityHunterChopper.java index b79686f63..508ce43cb 100644 --- a/com/hbm/entity/mob/EntityHunterChopper.java +++ b/com/hbm/entity/mob/EntityHunterChopper.java @@ -6,24 +6,14 @@ import com.hbm.entity.projectile.EntityChopperMine; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityFlying; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.EntityAILookIdle; -import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityLargeFireball; -import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.stats.AchievementList; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; @@ -59,6 +49,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp /** * Called when the entity is attacked. */ + @Override public boolean attackEntityFrom(DamageSource source, float amount) { if (this.isEntityInvulnerable() || !(source == ModDamageSource.nuclearBlast || source == ModDamageSource.blackhole || source.isExplosion() || ModDamageSource.getIsTau(source) || ModDamageSource.getIsSubatomic(source) || ModDamageSource.getIsDischarge(source))) { return false; @@ -91,19 +82,22 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp return super.attackEntityFrom(source, amount); } + @Override protected void entityInit() { super.entityInit(); this.dataWatcher.addObject(16, Byte.valueOf((byte) 0)); - this.dataWatcher.addObject(21, Float.valueOf((float) 0)); - this.dataWatcher.addObject(22, Float.valueOf((float) 0)); + this.dataWatcher.addObject(21, Float.valueOf(0)); + this.dataWatcher.addObject(22, Float.valueOf(0)); this.dataWatcher.addObject(23, Byte.valueOf((byte) 0)); } + @Override protected void applyEntityAttributes() { super.applyEntityAttributes(); this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(750.0D); } + @Override protected void updateEntityActionState() { if (!this.worldObj.isRemote && this.worldObj.difficultySetting == EnumDifficulty.PEACEFUL) { this.setDead(); @@ -120,13 +114,13 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp if (d3 < 1.0D || d3 > 3600.0D) { if (this.targetedEntity != null) { - this.waypointX = targetedEntity.posX + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); - this.waypointZ = targetedEntity.posZ + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); + this.waypointX = targetedEntity.posX + (this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F; + this.waypointZ = targetedEntity.posZ + (this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F; this.waypointY = this.worldObj.getHeightValue((int) waypointX, (int) waypointZ) + 10 + rand.nextInt(15); } else { - this.waypointX = this.posX + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); - this.waypointZ = this.posZ + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); + this.waypointX = this.posX + (this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F; + this.waypointZ = this.posZ + (this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F; this.waypointY = this.worldObj.getHeightValue((int) waypointX, (int) waypointZ) + 10 + rand.nextInt(15); } @@ -134,15 +128,15 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp if (this.courseChangeCooldown-- <= 0) { this.courseChangeCooldown += this.rand.nextInt(5) + 2; - d3 = (double) MathHelper.sqrt_double(d3); + d3 = MathHelper.sqrt_double(d3); if (this.isCourseTraversable(this.waypointX, this.waypointY, this.waypointZ, d3)) { this.motionX += d0 / d3 * 0.1D; this.motionY += d1 / d3 * 0.1D; this.motionZ += d2 / d3 * 0.1D; } else { - this.waypointX = this.posX + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); - this.waypointZ = this.posZ + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F); + this.waypointX = this.posX + (this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F; + this.waypointZ = this.posZ + (this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F; this.waypointY = this.worldObj.getHeightValue((int) waypointX, (int) waypointZ) + 10 + rand.nextInt(15); } @@ -172,7 +166,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp double yStart = this.posY - 0.5; double zStart = this.posZ + vec3.zCoord * d8; double d5 = this.targetedEntity.posX - xStart; - double d6 = this.targetedEntity.boundingBox.minY + (double) (this.targetedEntity.height / 2.0F) + double d6 = this.targetedEntity.boundingBox.minY + this.targetedEntity.height / 2.0F - yStart; double d7 = this.targetedEntity.posZ - zStart; @@ -298,7 +292,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp double yStart = this.posY - 0.5; double zStart = this.posZ + vec3.zCoord * d8; double d5 = this.targetedEntity.posX - xStart; - double d6 = this.targetedEntity.boundingBox.minY + (double) (this.targetedEntity.height / 2.0F) - yStart; + double d6 = this.targetedEntity.boundingBox.minY + this.targetedEntity.height / 2.0F - yStart; double d7 = this.targetedEntity.posZ - zStart; } @@ -320,7 +314,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp double d6 = (this.waypointZ - this.posZ) / p_70790_7_; AxisAlignedBB axisalignedbb = this.boundingBox.copy(); - for (int i = 1; (double) i < p_70790_7_; ++i) { + for (int i = 1; i < p_70790_7_; ++i) { axisalignedbb.offset(d4, d5, d6); if (!this.worldObj.getCollidingBoundingBoxes(this, axisalignedbb).isEmpty()) { @@ -331,10 +325,12 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp return true; } + @Override protected String getHurtSound() { return null; } + @Override protected String getDeathSound() { return null; } @@ -367,6 +363,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp /** * Returns the volume for the sounds this mob makes. */ + @Override protected float getSoundVolume() { return 10.0F; } @@ -375,6 +372,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp * Checks if the entity's current position is a valid location to spawn this * entity. */ + @Override public boolean getCanSpawnHere() { return this.rand.nextInt(20) == 0 && super.getCanSpawnHere() && this.worldObj.difficultySetting != EnumDifficulty.PEACEFUL; @@ -383,6 +381,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp /** * Will return how many at most can spawn in a chunk at once. */ + @Override public int getMaxSpawnedInChunk() { return 1; } @@ -390,6 +389,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp /** * (abstract) Protected helper method to write subclass entity data to NBT. */ + @Override public void writeEntityToNBT(NBTTagCompound p_70014_1_) { super.writeEntityToNBT(p_70014_1_); } @@ -397,6 +397,7 @@ public class EntityHunterChopper extends EntityFlying implements IMob, IBossDisp /** * (abstract) Protected helper method to read subclass entity data from NBT. */ + @Override public void readEntityFromNBT(NBTTagCompound p_70037_1_) { super.readEntityFromNBT(p_70037_1_); } diff --git a/com/hbm/entity/mob/EntityNuclearCreeper.java b/com/hbm/entity/mob/EntityNuclearCreeper.java index d55a95a3a..1db8f7417 100644 --- a/com/hbm/entity/mob/EntityNuclearCreeper.java +++ b/com/hbm/entity/mob/EntityNuclearCreeper.java @@ -28,7 +28,6 @@ import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.passive.EntityOcelot; import net.minecraft.entity.passive.EntityVillager; diff --git a/com/hbm/entity/particle/EntityDSmokeFX.java b/com/hbm/entity/particle/EntityDSmokeFX.java index 533e11f64..63b17cc45 100644 --- a/com/hbm/entity/particle/EntityDSmokeFX.java +++ b/com/hbm/entity/particle/EntityDSmokeFX.java @@ -1,10 +1,5 @@ package com.hbm.entity.particle; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class EntityDSmokeFX extends EntityModFX diff --git a/com/hbm/entity/particle/EntityModFX.java b/com/hbm/entity/particle/EntityModFX.java index ca05c0db0..345cc113d 100644 --- a/com/hbm/entity/particle/EntityModFX.java +++ b/com/hbm/entity/particle/EntityModFX.java @@ -60,21 +60,21 @@ public class EntityModFX extends Entity public EntityModFX(World p_i1219_1_, double p_i1219_2_, double p_i1219_4_, double p_i1219_6_, double p_i1219_8_, double p_i1219_10_, double p_i1219_12_) { this(p_i1219_1_, p_i1219_2_, p_i1219_4_, p_i1219_6_); - this.motionX = p_i1219_8_ + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); - this.motionY = p_i1219_10_ + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); - this.motionZ = p_i1219_12_ + (double)((float)(Math.random() * 2.0D - 1.0D) * 0.4F); + this.motionX = p_i1219_8_ + (float)(Math.random() * 2.0D - 1.0D) * 0.4F; + this.motionY = p_i1219_10_ + (float)(Math.random() * 2.0D - 1.0D) * 0.4F; + this.motionZ = p_i1219_12_ + (float)(Math.random() * 2.0D - 1.0D) * 0.4F; float f = (float)(Math.random() + Math.random() + 1.0D) * 0.15F; float f1 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - this.motionX = this.motionX / (double)f1 * (double)f * 0.4000000059604645D; - this.motionY = this.motionY / (double)f1 * (double)f * 0.4000000059604645D + 0.10000000149011612D; - this.motionZ = this.motionZ / (double)f1 * (double)f * 0.4000000059604645D; + this.motionX = this.motionX / f1 * f * 0.4000000059604645D; + this.motionY = this.motionY / f1 * f * 0.4000000059604645D + 0.10000000149011612D; + this.motionZ = this.motionZ / f1 * f * 0.4000000059604645D; } public EntityModFX multiplyVelocity(float p_70543_1_) { - this.motionX *= (double)p_70543_1_; - this.motionY = (this.motionY - 0.10000000149011612D) * (double)p_70543_1_ + 0.10000000149011612D; - this.motionZ *= (double)p_70543_1_; + this.motionX *= p_70543_1_; + this.motionY = (this.motionY - 0.10000000149011612D) * p_70543_1_ + 0.10000000149011612D; + this.motionZ *= p_70543_1_; return this; } @@ -119,17 +119,20 @@ public class EntityModFX extends Entity * returns if this entity triggers Block.onEntityWalking on the blocks they walk on. used for spiders and wolves to * prevent them from trampling crops */ - protected boolean canTriggerWalking() + @Override + protected boolean canTriggerWalking() { return false; } - protected void entityInit() {} + @Override + protected void entityInit() {} /** * Called to update the entity's position/logic. */ - public void onUpdate() + @Override + public void onUpdate() { this.prevPosX = this.posX; this.prevPosY = this.posY; @@ -140,7 +143,7 @@ public class EntityModFX extends Entity // this.setDead(); //} - this.motionY -= 0.04D * (double)this.particleGravity; + this.motionY -= 0.04D * this.particleGravity; this.moveEntity(this.motionX, this.motionY, this.motionZ); this.motionX *= 0.9800000190734863D; this.motionY *= 0.9800000190734863D; @@ -155,9 +158,9 @@ public class EntityModFX extends Entity public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) { - float f6 = (float)this.particleTextureIndexX / 16.0F; + float f6 = this.particleTextureIndexX / 16.0F; float f7 = f6 + 0.0624375F; - float f8 = (float)this.particleTextureIndexY / 16.0F; + float f8 = this.particleTextureIndexY / 16.0F; float f9 = f8 + 0.0624375F; float f10 = 0.1F * this.particleScale; @@ -169,14 +172,14 @@ public class EntityModFX extends Entity f9 = this.particleIcon.getMaxV(); } - float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)p_70539_2_ - interpPosX); - float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)p_70539_2_ - interpPosY); - float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)p_70539_2_ - interpPosZ); + float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * p_70539_2_ - interpPosX); + float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * p_70539_2_ - interpPosY); + float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * p_70539_2_ - interpPosZ); p_70539_1_.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha); - p_70539_1_.addVertexWithUV((double)(f11 - p_70539_3_ * f10 - p_70539_6_ * f10), (double)(f12 - p_70539_4_ * f10), (double)(f13 - p_70539_5_ * f10 - p_70539_7_ * f10), (double)f7, (double)f9); - p_70539_1_.addVertexWithUV((double)(f11 - p_70539_3_ * f10 + p_70539_6_ * f10), (double)(f12 + p_70539_4_ * f10), (double)(f13 - p_70539_5_ * f10 + p_70539_7_ * f10), (double)f7, (double)f8); - p_70539_1_.addVertexWithUV((double)(f11 + p_70539_3_ * f10 + p_70539_6_ * f10), (double)(f12 + p_70539_4_ * f10), (double)(f13 + p_70539_5_ * f10 + p_70539_7_ * f10), (double)f6, (double)f8); - p_70539_1_.addVertexWithUV((double)(f11 + p_70539_3_ * f10 - p_70539_6_ * f10), (double)(f12 - p_70539_4_ * f10), (double)(f13 + p_70539_5_ * f10 - p_70539_7_ * f10), (double)f6, (double)f9); + p_70539_1_.addVertexWithUV(f11 - p_70539_3_ * f10 - p_70539_6_ * f10, f12 - p_70539_4_ * f10, f13 - p_70539_5_ * f10 - p_70539_7_ * f10, f7, f9); + p_70539_1_.addVertexWithUV(f11 - p_70539_3_ * f10 + p_70539_6_ * f10, f12 + p_70539_4_ * f10, f13 - p_70539_5_ * f10 + p_70539_7_ * f10, f7, f8); + p_70539_1_.addVertexWithUV(f11 + p_70539_3_ * f10 + p_70539_6_ * f10, f12 + p_70539_4_ * f10, f13 + p_70539_5_ * f10 + p_70539_7_ * f10, f6, f8); + p_70539_1_.addVertexWithUV(f11 + p_70539_3_ * f10 - p_70539_6_ * f10, f12 - p_70539_4_ * f10, f13 + p_70539_5_ * f10 - p_70539_7_ * f10, f6, f9); } public int getFXLayer() @@ -187,14 +190,16 @@ public class EntityModFX extends Entity /** * (abstract) Protected helper method to write subclass entity data to NBT. */ - public void writeEntityToNBT(NBTTagCompound p_70014_1_) { + @Override + public void writeEntityToNBT(NBTTagCompound p_70014_1_) { p_70014_1_.setShort("age", (short)this.particleAge); } /** * (abstract) Protected helper method to read subclass entity data from NBT. */ - public void readEntityFromNBT(NBTTagCompound p_70037_1_) { + @Override + public void readEntityFromNBT(NBTTagCompound p_70037_1_) { this.particleAge = p_70037_1_.getShort("age"); } @@ -239,12 +244,14 @@ public class EntityModFX extends Entity /** * If returns false, the item will not inflict any damage against entities. */ - public boolean canAttackWithItem() + @Override + public boolean canAttackWithItem() { return false; } - public String toString() + @Override + public String toString() { return this.getClass().getSimpleName() + ", Pos (" + this.posX + "," + this.posY + "," + this.posZ + "), RGBA (" + this.particleRed + "," + this.particleGreen + "," + this.particleBlue + "," + this.particleAlpha + "), Age " + this.particleAge; } diff --git a/com/hbm/entity/particle/EntityOilSpillFX.java b/com/hbm/entity/particle/EntityOilSpillFX.java index f045b63fe..eae4419dd 100644 --- a/com/hbm/entity/particle/EntityOilSpillFX.java +++ b/com/hbm/entity/particle/EntityOilSpillFX.java @@ -1,10 +1,5 @@ package com.hbm.entity.particle; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class EntityOilSpillFX extends EntityModFX diff --git a/com/hbm/entity/particle/EntitySSmokeFX.java b/com/hbm/entity/particle/EntitySSmokeFX.java index 31d66dfdb..7b93f528d 100644 --- a/com/hbm/entity/particle/EntitySSmokeFX.java +++ b/com/hbm/entity/particle/EntitySSmokeFX.java @@ -2,9 +2,6 @@ package com.hbm.entity.particle; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class EntitySSmokeFX extends EntityModFX diff --git a/com/hbm/entity/particle/EntitySmokeFX.java b/com/hbm/entity/particle/EntitySmokeFX.java index 74242c127..dd4ff0ee5 100644 --- a/com/hbm/entity/particle/EntitySmokeFX.java +++ b/com/hbm/entity/particle/EntitySmokeFX.java @@ -2,9 +2,6 @@ package com.hbm.entity.particle; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; public class EntitySmokeFX extends EntityModFX diff --git a/com/hbm/entity/projectile/EntityBaleflare.java b/com/hbm/entity/projectile/EntityBaleflare.java index 657b938a6..0d4be4f54 100644 --- a/com/hbm/entity/projectile/EntityBaleflare.java +++ b/com/hbm/entity/projectile/EntityBaleflare.java @@ -4,9 +4,7 @@ import java.util.List; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; @@ -20,8 +18,6 @@ import net.minecraft.entity.IProjectile; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -205,7 +201,8 @@ public class EntityBaleflare extends Entity implements IProjectile { /** * Called to update the entity's position/logic. */ - public void onUpdate() + @Override + public void onUpdate() { super.onUpdate(); @@ -213,7 +210,7 @@ public class EntityBaleflare extends Entity implements IProjectile { { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, f) * 180.0D / Math.PI); } Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); @@ -264,9 +261,9 @@ public class EntityBaleflare extends Entity implements IProjectile { else { this.inGround = false; - this.motionX *= (double)(this.rand.nextFloat() * 0.2F); - this.motionY *= (double)(this.rand.nextFloat() * 0.2F); - this.motionZ *= (double)(this.rand.nextFloat() * 0.2F); + this.motionX *= this.rand.nextFloat() * 0.2F; + this.motionY *= this.rand.nextFloat() * 0.2F; + this.motionZ *= this.rand.nextFloat() * 0.2F; this.ticksInGround = 0; this.ticksInAir = 0; } @@ -298,7 +295,7 @@ public class EntityBaleflare extends Entity implements IProjectile { if (entity1.canBeCollidedWith() && (entity1 != this.shootingEntity || this.ticksInAir >= 5)) { f1 = 0.3F; - AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand((double)f1, (double)f1, (double)f1); + AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand(f1, f1, f1); MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3); if (movingobjectposition1 != null) @@ -337,7 +334,7 @@ public class EntityBaleflare extends Entity implements IProjectile { if (movingobjectposition.entityHit != null) { f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - int k = MathHelper.ceiling_double_int((double)f2 * this.damage); + int k = MathHelper.ceiling_double_int(f2 * this.damage); if (this.getIsCritical()) { @@ -360,7 +357,7 @@ public class EntityBaleflare extends Entity implements IProjectile { movingobjectposition.entityHit.setFire(5); } - if (movingobjectposition.entityHit.attackEntityFrom(damagesource, (float)k)) + if (movingobjectposition.entityHit.attackEntityFrom(damagesource, k)) { if (movingobjectposition.entityHit instanceof EntityLivingBase) { @@ -372,7 +369,7 @@ public class EntityBaleflare extends Entity implements IProjectile { if (f4 > 0.0F) { - movingobjectposition.entityHit.addVelocity(this.motionX * (double)this.knockbackStrength * 0.6000000238418579D / (double)f4, 0.1D, this.motionZ * (double)this.knockbackStrength * 0.6000000238418579D / (double)f4); + movingobjectposition.entityHit.addVelocity(this.motionX * this.knockbackStrength * 0.6000000238418579D / f4, 0.1D, this.motionZ * this.knockbackStrength * 0.6000000238418579D / f4); } } @@ -396,13 +393,13 @@ public class EntityBaleflare extends Entity implements IProjectile { this.field_145789_f = movingobjectposition.blockZ; this.field_145790_g = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); this.inData = this.worldObj.getBlockMetadata(this.field_145791_d, this.field_145792_e, this.field_145789_f); - this.motionX = (double)((float)(movingobjectposition.hitVec.xCoord - this.posX)); - this.motionY = (double)((float)(movingobjectposition.hitVec.yCoord - this.posY)); - this.motionZ = (double)((float)(movingobjectposition.hitVec.zCoord - this.posZ)); + this.motionX = ((float)(movingobjectposition.hitVec.xCoord - this.posX)); + this.motionY = ((float)(movingobjectposition.hitVec.yCoord - this.posY)); + this.motionZ = ((float)(movingobjectposition.hitVec.zCoord - this.posZ)); f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionY * this.motionY + this.motionZ * this.motionZ); - this.posX -= this.motionX / (double)f2 * 0.05000000074505806D; - this.posY -= this.motionY / (double)f2 * 0.05000000074505806D; - this.posZ -= this.motionZ / (double)f2 * 0.05000000074505806D; + this.posX -= this.motionX / f2 * 0.05000000074505806D; + this.posY -= this.motionY / f2 * 0.05000000074505806D; + this.posZ -= this.motionZ / f2 * 0.05000000074505806D; this.playSound("random.bowhit", 1.0F, 1.2F / (this.rand.nextFloat() * 0.2F + 0.9F)); this.inGround = true; this.arrowShake = 7; @@ -421,7 +418,7 @@ public class EntityBaleflare extends Entity implements IProjectile { f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } @@ -451,7 +448,7 @@ public class EntityBaleflare extends Entity implements IProjectile { for (int l = 0; l < 4; ++l) { f4 = 0.25F; - this.worldObj.spawnParticle("bubble", this.posX - this.motionX * (double)f4, this.posY - this.motionY * (double)f4, this.posZ - this.motionZ * (double)f4, this.motionX, this.motionY, this.motionZ); + this.worldObj.spawnParticle("bubble", this.posX - this.motionX * f4, this.posY - this.motionY * f4, this.posZ - this.motionZ * f4, this.motionX, this.motionY, this.motionZ); } f3 = 0.8F; @@ -465,10 +462,10 @@ public class EntityBaleflare extends Entity implements IProjectile { // f1 *= 0.25F; // - this.motionX *= (double)f3; - this.motionY *= (double)f3; - this.motionZ *= (double)f3; - this.motionY -= (double)f1; + this.motionX *= f3; + this.motionY *= f3; + this.motionZ *= f3; + this.motionY -= f1; this.setPosition(this.posX, this.posY, this.posZ); this.func_145775_I(); } diff --git a/com/hbm/entity/projectile/EntityBullet.java b/com/hbm/entity/projectile/EntityBullet.java index 48b82b030..063e5fd4e 100644 --- a/com/hbm/entity/projectile/EntityBullet.java +++ b/com/hbm/entity/projectile/EntityBullet.java @@ -30,7 +30,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.DecoBlockAlt; import com.hbm.blocks.generic.RedBarrel; import com.hbm.entity.grenade.EntityGrenadeTau; import com.hbm.entity.mob.EntityNuclearCreeper; @@ -594,14 +593,14 @@ public class EntityBullet extends Entity implements IProjectile { if (this.getIsCritical()) { for (i = 0; i < 8; ++i) { if (!this.getIsTau()) - this.worldObj.spawnParticle("fireworksSpark", this.posX + this.motionX * (double) i / 8.0D, - this.posY + this.motionY * (double) i / 8.0D, - this.posZ + this.motionZ * (double) i / 8.0D, 0, 0, + this.worldObj.spawnParticle("fireworksSpark", this.posX + this.motionX * i / 8.0D, + this.posY + this.motionY * i / 8.0D, + this.posZ + this.motionZ * i / 8.0D, 0, 0, 0/*-this.motionX, -this.motionY + 0.2D, -this.motionZ*/); else - this.worldObj.spawnParticle("reddust", this.posX + this.motionX * (double) i / 8.0D, - this.posY + this.motionY * (double) i / 8.0D, - this.posZ + this.motionZ * (double) i / 8.0D, 0, 0, + this.worldObj.spawnParticle("reddust", this.posX + this.motionX * i / 8.0D, + this.posY + this.motionY * i / 8.0D, + this.posZ + this.motionZ * i / 8.0D, 0, 0, 0/*-this.motionX, -this.motionY + 0.2D, -this.motionZ*/); } } diff --git a/com/hbm/entity/projectile/EntityChopperMine.java b/com/hbm/entity/projectile/EntityChopperMine.java index 475bdcdef..ca43d6c3d 100644 --- a/com/hbm/entity/projectile/EntityChopperMine.java +++ b/com/hbm/entity/projectile/EntityChopperMine.java @@ -2,7 +2,6 @@ package com.hbm.entity.projectile; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.IProjectile; diff --git a/com/hbm/entity/projectile/EntityLN2.java b/com/hbm/entity/projectile/EntityLN2.java index 9e3191c14..3701a33a0 100644 --- a/com/hbm/entity/projectile/EntityLN2.java +++ b/com/hbm/entity/projectile/EntityLN2.java @@ -2,7 +2,6 @@ package com.hbm.entity.projectile; import java.util.List; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionThermo; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; diff --git a/com/hbm/entity/projectile/EntityLaserBeam.java b/com/hbm/entity/projectile/EntityLaserBeam.java index d49f91a33..d02bd3171 100644 --- a/com/hbm/entity/projectile/EntityLaserBeam.java +++ b/com/hbm/entity/projectile/EntityLaserBeam.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.entity.grenade.EntityGrenadeZOMG; import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionThermo; import com.hbm.lib.ModDamageSource; import cpw.mods.fml.relauncher.Side; @@ -13,7 +12,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.monster.EntityEnderman; diff --git a/com/hbm/entity/projectile/EntityMinerBeam.java b/com/hbm/entity/projectile/EntityMinerBeam.java index 957325b01..b932f348c 100644 --- a/com/hbm/entity/projectile/EntityMinerBeam.java +++ b/com/hbm/entity/projectile/EntityMinerBeam.java @@ -3,8 +3,6 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.grenade.EntityGrenadeZOMG; -import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionThermo; import com.hbm.lib.ModDamageSource; import cpw.mods.fml.relauncher.Side; @@ -13,7 +11,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.item.EntityItem; diff --git a/com/hbm/entity/projectile/EntityMiniMIRV.java b/com/hbm/entity/projectile/EntityMiniMIRV.java index 78414c88b..cf5af217b 100644 --- a/com/hbm/entity/projectile/EntityMiniMIRV.java +++ b/com/hbm/entity/projectile/EntityMiniMIRV.java @@ -225,7 +225,7 @@ public class EntityMiniMIRV extends Entity implements IProjectile { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, f) * 180.0D / Math.PI); } Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); @@ -449,7 +449,7 @@ public class EntityMiniMIRV extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } diff --git a/com/hbm/entity/projectile/EntityMiniNuke.java b/com/hbm/entity/projectile/EntityMiniNuke.java index e60412f9d..885fdad9e 100644 --- a/com/hbm/entity/projectile/EntityMiniNuke.java +++ b/com/hbm/entity/projectile/EntityMiniNuke.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; -import com.hbm.items.ModItems; import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; @@ -19,7 +18,6 @@ import net.minecraft.entity.IProjectile; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -214,7 +212,7 @@ public class EntityMiniNuke extends Entity implements IProjectile { float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.prevRotationYaw = this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f) * 180.0D / Math.PI); + this.prevRotationPitch = this.rotationPitch = (float)(Math.atan2(this.motionY, f) * 180.0D / Math.PI); } Block block = this.worldObj.getBlock(this.field_145791_d, this.field_145792_e, this.field_145789_f); @@ -438,7 +436,7 @@ public class EntityMiniNuke extends Entity implements IProjectile f2 = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ); this.rotationYaw = (float)(Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI); - for (this.rotationPitch = (float)(Math.atan2(this.motionY, (double)f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) + for (this.rotationPitch = (float)(Math.atan2(this.motionY, f2) * 180.0D / Math.PI); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { ; } diff --git a/com/hbm/entity/projectile/EntityNightmareBlast.java b/com/hbm/entity/projectile/EntityNightmareBlast.java index cdf0a1c13..ec977eca2 100644 --- a/com/hbm/entity/projectile/EntityNightmareBlast.java +++ b/com/hbm/entity/projectile/EntityNightmareBlast.java @@ -3,8 +3,6 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.grenade.EntityGrenadeZOMG; -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import cpw.mods.fml.relauncher.Side; @@ -19,7 +17,6 @@ import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; @@ -333,7 +330,7 @@ public class EntityNightmareBlast extends Entity implements IProjectile } else { - damagesource = ModDamageSource.generic; + damagesource = DamageSource.generic; } if (this.isBurning() && !(movingobjectposition.entityHit instanceof EntityEnderman)) diff --git a/com/hbm/entity/projectile/EntityOilSpill.java b/com/hbm/entity/projectile/EntityOilSpill.java index 0499d28e8..5e3a1c55c 100644 --- a/com/hbm/entity/projectile/EntityOilSpill.java +++ b/com/hbm/entity/projectile/EntityOilSpill.java @@ -1,20 +1,8 @@ package com.hbm.entity.projectile; -import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.particle.EntityOilSpillFX; -import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.explosion.ExplosionChaos; -import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -30,7 +18,8 @@ public class EntityOilSpill extends EntityThrowable { super(p_i1774_1_, p_i1774_2_); } - public void entityInit() { + @Override + public void entityInit() { } public EntityOilSpill(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) diff --git a/com/hbm/entity/projectile/EntityPlasmaBeam.java b/com/hbm/entity/projectile/EntityPlasmaBeam.java index 8f044e836..20976f4af 100644 --- a/com/hbm/entity/projectile/EntityPlasmaBeam.java +++ b/com/hbm/entity/projectile/EntityPlasmaBeam.java @@ -13,7 +13,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.monster.EntityEnderman; diff --git a/com/hbm/entity/projectile/EntityRainbow.java b/com/hbm/entity/projectile/EntityRainbow.java index 81b571841..267dd367d 100644 --- a/com/hbm/entity/projectile/EntityRainbow.java +++ b/com/hbm/entity/projectile/EntityRainbow.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.entity.grenade.EntityGrenadeZOMG; import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; import cpw.mods.fml.relauncher.Side; @@ -18,7 +17,6 @@ import net.minecraft.entity.IProjectile; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; import net.minecraft.util.AxisAlignedBB; diff --git a/com/hbm/entity/projectile/EntityRubble.java b/com/hbm/entity/projectile/EntityRubble.java index ad418d5df..5941ac5ea 100644 --- a/com/hbm/entity/projectile/EntityRubble.java +++ b/com/hbm/entity/projectile/EntityRubble.java @@ -1,18 +1,9 @@ package com.hbm.entity.projectile; -import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.explosion.ExplosionChaos; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; - import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -28,7 +19,8 @@ public class EntityRubble extends EntityThrowable { super(p_i1774_1_, p_i1774_2_); } - public void entityInit() { + @Override + public void entityInit() { this.dataWatcher.addObject(16, Byte.valueOf((byte)0)); } diff --git a/com/hbm/entity/projectile/EntityShrapnel.java b/com/hbm/entity/projectile/EntityShrapnel.java index e4b143e47..4b451d72e 100644 --- a/com/hbm/entity/projectile/EntityShrapnel.java +++ b/com/hbm/entity/projectile/EntityShrapnel.java @@ -1,19 +1,9 @@ package com.hbm.entity.projectile; -import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.explosion.ExplosionChaos; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; - -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; @@ -29,7 +19,8 @@ public class EntityShrapnel extends EntityThrowable { super(p_i1774_1_, p_i1774_2_); } - public void entityInit() { + @Override + public void entityInit() { this.dataWatcher.addObject(16, Byte.valueOf((byte)0)); } diff --git a/com/hbm/entity/projectile/EntitySparkBeam.java b/com/hbm/entity/projectile/EntitySparkBeam.java index d79eb4d1b..820ce58fb 100644 --- a/com/hbm/entity/projectile/EntitySparkBeam.java +++ b/com/hbm/entity/projectile/EntitySparkBeam.java @@ -3,18 +3,13 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.grenade.EntityGrenadeZOMG; -import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionThermo; -import com.hbm.lib.ModDamageSource; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.monster.EntityEnderman; diff --git a/com/hbm/explosion/ExplosionLarge.java b/com/hbm/explosion/ExplosionLarge.java index 824c216b6..a642eea4a 100644 --- a/com/hbm/explosion/ExplosionLarge.java +++ b/com/hbm/explosion/ExplosionLarge.java @@ -7,7 +7,6 @@ import com.hbm.entity.projectile.EntityOilSpill; import com.hbm.entity.projectile.EntityRubble; import com.hbm.entity.projectile.EntityShrapnel; -import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.world.World; @@ -114,11 +113,11 @@ public class ExplosionLarge { } public static int rubbleFunction(int i) { - return (int)(i/10); + return i/10; } public static int shrapnelFunction(int i) { - return (int)(i/3); + return i/3; } } diff --git a/com/hbm/explosion/ExplosionNukeGeneric.java b/com/hbm/explosion/ExplosionNukeGeneric.java index 60fc217e8..9c0f8477a 100644 --- a/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/com/hbm/explosion/ExplosionNukeGeneric.java @@ -13,7 +13,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; @@ -30,7 +29,6 @@ import com.hbm.entity.missile.EntityMIRV; import com.hbm.entity.projectile.EntityMiniMIRV; import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.interfaces.IConsumer; -import com.hbm.interfaces.IDummy; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; import com.hbm.lib.Library; diff --git a/com/hbm/explosion/ExplosionParticle.java b/com/hbm/explosion/ExplosionParticle.java index 5441056dd..295307469 100644 --- a/com/hbm/explosion/ExplosionParticle.java +++ b/com/hbm/explosion/ExplosionParticle.java @@ -2,7 +2,6 @@ package com.hbm.explosion; import com.hbm.entity.particle.EntitySmokeFX; -import net.minecraft.init.Blocks; import net.minecraft.world.World; public class ExplosionParticle { diff --git a/com/hbm/explosion/ExplosionParticleB.java b/com/hbm/explosion/ExplosionParticleB.java index c2ad1c320..70a44e147 100644 --- a/com/hbm/explosion/ExplosionParticleB.java +++ b/com/hbm/explosion/ExplosionParticleB.java @@ -2,7 +2,6 @@ package com.hbm.explosion; import com.hbm.entity.particle.EntityBSmokeFX; -import net.minecraft.init.Blocks; import net.minecraft.world.World; public class ExplosionParticleB { diff --git a/com/hbm/explosion/ExplosionThermo.java b/com/hbm/explosion/ExplosionThermo.java index 4ec2e799e..a0359d7d8 100644 --- a/com/hbm/explosion/ExplosionThermo.java +++ b/com/hbm/explosion/ExplosionThermo.java @@ -18,7 +18,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; public class ExplosionThermo { diff --git a/com/hbm/handler/AlloyFurnaceRecipeHandler.java b/com/hbm/handler/AlloyFurnaceRecipeHandler.java index 9b11a1331..416001f2d 100644 --- a/com/hbm/handler/AlloyFurnaceRecipeHandler.java +++ b/com/hbm/handler/AlloyFurnaceRecipeHandler.java @@ -5,23 +5,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import java.util.Map.Entry; - import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUITestDiFurnace; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.FurnaceRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.FurnaceRecipeHandler.FuelPair; -import codechicken.nei.recipe.FurnaceRecipeHandler.SmeltingPair; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiFurnace; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { @@ -41,15 +32,18 @@ public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { this.result = new PositionedStack(result, 129, 25); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input1, input2})); } - public PositionedStack getOtherStack() { + @Override + public PositionedStack getOtherStack() { return fuels.get((cycleticks / 48) % fuels.size()).stack; } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result; } } @@ -74,6 +68,7 @@ public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { return GUITestDiFurnace.texture.toString(); } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("alloysmelting")) && getClass() == AlloyFurnaceRecipeHandler.class) { Map recipes = MachineRecipes.instance().getAlloyRecipes(); @@ -85,6 +80,7 @@ public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getAlloyRecipes(); for (Map.Entry recipe : recipes.entrySet()) { @@ -93,6 +89,7 @@ public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("alloysmelting")) && getClass() == AlloyFurnaceRecipeHandler.class) { loadCraftingRecipes("alloysmelting", new Object[0]); @@ -101,6 +98,7 @@ public class AlloyFurnaceRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getAlloyRecipes(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/handler/AssemblerRecipeHandler.java b/com/hbm/handler/AssemblerRecipeHandler.java index b3c6923c5..26a3cf823 100644 --- a/com/hbm/handler/AssemblerRecipeHandler.java +++ b/com/hbm/handler/AssemblerRecipeHandler.java @@ -1,33 +1,19 @@ package com.hbm.handler; import java.awt.Rectangle; -import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; - import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineAssembler; -import com.hbm.inventory.gui.GUIMachineCMBFactory; -import com.hbm.inventory.gui.GUIMachineShredder; -import com.hbm.inventory.gui.GUITestDiFurnace; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.FurnaceRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.FurnaceRecipeHandler.FuelPair; -import codechicken.nei.recipe.FurnaceRecipeHandler.SmeltingPair; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiFurnace; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; public class AssemblerRecipeHandler extends TemplateRecipeHandler { @@ -73,11 +59,13 @@ public class AssemblerRecipeHandler extends TemplateRecipeHandler { this.result = new PositionedStack(result, 138, 24); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input1, input2, input3, input4, input5, input6, input7, input8, input9, input10, input11, input12, template})); } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result; } } @@ -92,6 +80,7 @@ public class AssemblerRecipeHandler extends TemplateRecipeHandler { return RefStrings.MODID + ":textures/gui/gui_nei_assembler.png"; } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("assembly")) && getClass() == AssemblerRecipeHandler.class) { Map recipes = MachineRecipes.instance().getAssemblyRecipes(); @@ -117,6 +106,7 @@ public class AssemblerRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getAssemblyRecipes(); for (Map.Entry recipe : recipes.entrySet()) { @@ -139,6 +129,7 @@ public class AssemblerRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("assembly")) && getClass() == AssemblerRecipeHandler.class) { loadCraftingRecipes("assembly", new Object[0]); @@ -147,6 +138,7 @@ public class AssemblerRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getAssemblyRecipes(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/handler/CMBFurnaceRecipeHandler.java b/com/hbm/handler/CMBFurnaceRecipeHandler.java index 5e37ba3b4..781a9c47d 100644 --- a/com/hbm/handler/CMBFurnaceRecipeHandler.java +++ b/com/hbm/handler/CMBFurnaceRecipeHandler.java @@ -1,32 +1,19 @@ package com.hbm.handler; import java.awt.Rectangle; -import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; - import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineCMBFactory; -import com.hbm.inventory.gui.GUIMachineShredder; -import com.hbm.inventory.gui.GUITestDiFurnace; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.FurnaceRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.FurnaceRecipeHandler.FuelPair; -import codechicken.nei.recipe.FurnaceRecipeHandler.SmeltingPair; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiFurnace; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler { @@ -49,11 +36,13 @@ public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler { this.result = new PositionedStack(result, 129, 24); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input1, input2})); } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result; } } @@ -68,6 +57,7 @@ public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler { return RefStrings.MODID + ":textures/gui/gui_nei_cmb.png"; } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("cmbsmelting")) && getClass() == CMBFurnaceRecipeHandler.class) { Map recipes = MachineRecipes.instance().getCMBRecipes(); @@ -79,6 +69,7 @@ public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getCMBRecipes(); for (Map.Entry recipe : recipes.entrySet()) { @@ -87,6 +78,7 @@ public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("cmbsmelting")) && getClass() == CMBFurnaceRecipeHandler.class) { loadCraftingRecipes("cmbsmelting", new Object[0]); @@ -95,6 +87,7 @@ public class CMBFurnaceRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getCMBRecipes(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/handler/CentrifugeRecipeHandler.java b/com/hbm/handler/CentrifugeRecipeHandler.java index c5f3e426c..071c3dda1 100644 --- a/com/hbm/handler/CentrifugeRecipeHandler.java +++ b/com/hbm/handler/CentrifugeRecipeHandler.java @@ -6,17 +6,11 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.handler.AlloyFurnaceRecipeHandler.Fuel; -import com.hbm.handler.AlloyFurnaceRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineCentrifuge; -import com.hbm.inventory.gui.GUITestDiFurnace; - import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.FurnaceRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -41,11 +35,13 @@ public class CentrifugeRecipeHandler extends TemplateRecipeHandler { this.result4 = new PositionedStack(result4, 147, 42); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input})); } - public List getOtherStacks() { + @Override + public List getOtherStacks() { List stacks = new ArrayList(); stacks.add(fuels.get((cycleticks / 48) % fuels.size()).stack); stacks.add(result2); @@ -54,7 +50,8 @@ public class CentrifugeRecipeHandler extends TemplateRecipeHandler { return stacks; } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result1; } } @@ -95,6 +92,7 @@ public class CentrifugeRecipeHandler extends TemplateRecipeHandler { return super.newInstance(); } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("centrifugeprocessing")) && getClass() == CentrifugeRecipeHandler.class) { Map recipes = MachineRecipes.instance().getCentrifugeRecipes(); @@ -106,6 +104,7 @@ public class CentrifugeRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getCentrifugeRecipes(); for (Map.Entry recipe : recipes.entrySet()) { @@ -114,6 +113,7 @@ public class CentrifugeRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("centrifugeprocessing")) && getClass() == CentrifugeRecipeHandler.class) { loadCraftingRecipes("centrifugeprocessing", new Object[0]); @@ -122,6 +122,7 @@ public class CentrifugeRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getCentrifugeRecipes(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/handler/CyclotronRecipeHandler.java b/com/hbm/handler/CyclotronRecipeHandler.java index 22c6ea4b4..2c48cec85 100644 --- a/com/hbm/handler/CyclotronRecipeHandler.java +++ b/com/hbm/handler/CyclotronRecipeHandler.java @@ -6,23 +6,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.handler.CMBFurnaceRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIMachineCMBFactory; import com.hbm.inventory.gui.GUIMachineCyclotron; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; public class CyclotronRecipeHandler extends TemplateRecipeHandler { @@ -46,11 +37,13 @@ public class CyclotronRecipeHandler extends TemplateRecipeHandler { this.result = new PositionedStack(result, 129, 24); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input1, input2})); } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result; } } @@ -65,6 +58,7 @@ public class CyclotronRecipeHandler extends TemplateRecipeHandler { return RefStrings.MODID + ":textures/gui/gui_nei_cyclotron.png"; } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("cyclotronProcessing")) && getClass() == CyclotronRecipeHandler.class) { Map recipes = MachineRecipes.instance().getCyclotronRecipes(); @@ -76,6 +70,7 @@ public class CyclotronRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getCyclotronRecipes(); for (Map.Entry recipe : recipes.entrySet()) { @@ -84,6 +79,7 @@ public class CyclotronRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("cyclotronProcessing")) && getClass() == CyclotronRecipeHandler.class) { loadCraftingRecipes("cyclotronProcessing", new Object[0]); @@ -92,6 +88,7 @@ public class CyclotronRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getCyclotronRecipes(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index 9d4d1553f..b30d39f09 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -1,7 +1,5 @@ package com.hbm.handler; -import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; - public class FluidTypeHandler { public enum FluidType { diff --git a/com/hbm/handler/MultiblockHandler.java b/com/hbm/handler/MultiblockHandler.java index 4ef8f9063..172be0fed 100644 --- a/com/hbm/handler/MultiblockHandler.java +++ b/com/hbm/handler/MultiblockHandler.java @@ -1,11 +1,9 @@ package com.hbm.handler; -import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IDummy; import com.hbm.tileentity.TileEntityDummy; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/com/hbm/handler/ReactorRecipeHandler.java b/com/hbm/handler/ReactorRecipeHandler.java index 9512d583c..e77ab9cc2 100644 --- a/com/hbm/handler/ReactorRecipeHandler.java +++ b/com/hbm/handler/ReactorRecipeHandler.java @@ -6,23 +6,12 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.hbm.handler.AlloyFurnaceRecipeHandler.Fuel; -import com.hbm.handler.AlloyFurnaceRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineReactor; -import com.hbm.inventory.gui.GUITestDiFurnace; - import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.recipe.FurnaceRecipeHandler; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; public class ReactorRecipeHandler extends TemplateRecipeHandler { @@ -40,15 +29,18 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { this.result = new PositionedStack(result, 111, 24); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input})); } - public PositionedStack getOtherStack() { + @Override + public PositionedStack getOtherStack() { return fuels.get((cycleticks / 48) % fuels.size()).stack; } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result; } } @@ -73,6 +65,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { return GUIMachineReactor.texture.toString(); } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("breeding")) && getClass() == ReactorRecipeHandler.class) { Map recipes = MachineRecipes.instance().getReactorRecipes(); @@ -84,6 +77,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getReactorRecipes(); for (Map.Entry recipe : recipes.entrySet()) { @@ -92,6 +86,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("breeding")) && getClass() == ReactorRecipeHandler.class) { loadCraftingRecipes("breeding", new Object[0]); @@ -100,6 +95,7 @@ public class ReactorRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getReactorRecipes(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/handler/RefineryRecipeHandler.java b/com/hbm/handler/RefineryRecipeHandler.java index 5264f0c92..ff1d5896a 100644 --- a/com/hbm/handler/RefineryRecipeHandler.java +++ b/com/hbm/handler/RefineryRecipeHandler.java @@ -7,20 +7,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.handler.AlloyFurnaceRecipeHandler.Fuel; -import com.hbm.handler.AlloyFurnaceRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.gui.GUIMachineAssembler; -import com.hbm.inventory.gui.GUIMachineCentrifuge; -import com.hbm.inventory.gui.GUITestDiFurnace; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.FurnaceRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; @@ -50,11 +43,13 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { this.result5 = new PositionedStack(result5, 147 - 36, 42); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input})); } - public List getOtherStacks() { + @Override + public List getOtherStacks() { List stacks = new ArrayList(); stacks.add(result2); stacks.add(result3); @@ -63,7 +58,8 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { return stacks; } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result1; } } @@ -88,6 +84,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { return super.newInstance(); } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("refinery")) && getClass() == RefineryRecipeHandler.class) { Map recipes = MachineRecipes.instance().getRefineryRecipe(); @@ -99,6 +96,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getRefineryRecipe(); for (Map.Entry recipe : recipes.entrySet()) { @@ -107,6 +105,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("refinery")) && getClass() == RefineryRecipeHandler.class) { loadCraftingRecipes("refinery", new Object[0]); @@ -115,6 +114,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getRefineryRecipe(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/handler/ShredderRecipeHandler.java b/com/hbm/handler/ShredderRecipeHandler.java index 43e979956..9d7738e0b 100644 --- a/com/hbm/handler/ShredderRecipeHandler.java +++ b/com/hbm/handler/ShredderRecipeHandler.java @@ -1,7 +1,5 @@ package com.hbm.handler; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; - import java.awt.Rectangle; import java.util.ArrayList; import java.util.Arrays; @@ -9,24 +7,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.hbm.handler.ReactorRecipeHandler.Fuel; -import com.hbm.handler.ReactorRecipeHandler.SmeltingSet; import com.hbm.inventory.MachineRecipes; -import com.hbm.inventory.gui.GUIMachineReactor; import com.hbm.inventory.gui.GUIMachineShredder; import com.hbm.lib.RefStrings; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.ICraftingHandler; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRectHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; public class ShredderRecipeHandler extends TemplateRecipeHandler { @@ -49,18 +37,21 @@ public class ShredderRecipeHandler extends TemplateRecipeHandler { this.result = new PositionedStack(result, 83 + 27 + 18 + 1, 5 + 18 + 1); } - public List getIngredients() { + @Override + public List getIngredients() { return getCycledIngredients(cycleticks / 48, Arrays.asList(new PositionedStack[] {input})); } - public List getOtherStacks() { + @Override + public List getOtherStacks() { List stacks = new ArrayList(); stacks.add(fuels.get((cycleticks / 24) % fuels.size()).stack0); stacks.add(fuels.get((cycleticks / 24) % fuels.size()).stack1); return stacks; } - public PositionedStack getResult() { + @Override + public PositionedStack getResult() { return result; } } @@ -87,6 +78,7 @@ public class ShredderRecipeHandler extends TemplateRecipeHandler { return RefStrings.MODID + ":textures/gui/gui_nei_shredder.png"; } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if ((outputId.equals("shredding")) && getClass() == ShredderRecipeHandler.class) { Map recipes = MachineRecipes.instance().getShredderRecipes(); @@ -98,6 +90,7 @@ public class ShredderRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadCraftingRecipes(ItemStack result) { Map recipes = MachineRecipes.instance().getShredderRecipes(); for (Map.Entry recipe : recipes.entrySet()) { @@ -106,6 +99,7 @@ public class ShredderRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(String inputId, Object... ingredients) { if ((inputId.equals("shredding")) && getClass() == ShredderRecipeHandler.class) { loadCraftingRecipes("shredding", new Object[0]); @@ -114,6 +108,7 @@ public class ShredderRecipeHandler extends TemplateRecipeHandler { } } + @Override public void loadUsageRecipes(ItemStack ingredient) { Map recipes = MachineRecipes.instance().getShredderRecipes(); for (Map.Entry recipe : recipes.entrySet()) { diff --git a/com/hbm/inventory/FluidContainer.java b/com/hbm/inventory/FluidContainer.java index dcd3b7663..0e59382fd 100644 --- a/com/hbm/inventory/FluidContainer.java +++ b/com/hbm/inventory/FluidContainer.java @@ -2,7 +2,6 @@ package com.hbm.inventory; import com.hbm.handler.FluidTypeHandler.FluidType; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class FluidContainer { diff --git a/com/hbm/inventory/FluidTank.java b/com/hbm/inventory/FluidTank.java index 81f65b034..198998adb 100644 --- a/com/hbm/inventory/FluidTank.java +++ b/com/hbm/inventory/FluidTank.java @@ -4,10 +4,8 @@ import java.util.Arrays; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.inventory.gui.GuiFluidContainer; -import com.hbm.items.ModItems; import com.hbm.items.tool.ItemFluidIdentifier; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEAssemblerPacket; import com.hbm.packet.TEFluidPacket; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index 9cac2f24e..950a1047f 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -2,19 +2,14 @@ package com.hbm.inventory; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; - import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.items.tool.ItemAssemblyTemplate; import com.hbm.items.tool.ItemAssemblyTemplate.EnumAssemblyTemplate; import com.hbm.main.MainRegistry; -import cpw.mods.fml.common.registry.GameData; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -1396,9 +1391,9 @@ public class MachineRecipes { public Map getShredderRecipes() { Map recipes = new HashMap(); - for(int i = 0; i < this.recipes.size(); i++) { - if(this.recipes.get(i) != null && this.recipes.get(i).output.getItem() != ModItems.scrap) - recipes.put(((ShredderRecipe)this.recipes.get(i)).input, getShredderResult(((ShredderRecipe)this.recipes.get(i)).input)); + for(int i = 0; i < MachineRecipes.recipes.size(); i++) { + if(MachineRecipes.recipes.get(i) != null && MachineRecipes.recipes.get(i).output.getItem() != ModItems.scrap) + recipes.put(MachineRecipes.recipes.get(i).input, getShredderResult(MachineRecipes.recipes.get(i).input)); } return recipes; diff --git a/com/hbm/inventory/container/ContainerConverterHeRf.java b/com/hbm/inventory/container/ContainerConverterHeRf.java index 7bc949a4c..f2861833a 100644 --- a/com/hbm/inventory/container/ContainerConverterHeRf.java +++ b/com/hbm/inventory/container/ContainerConverterHeRf.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.TileEntityConverterHeRf; -import com.hbm.tileentity.TileEntityConverterRfHe; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerConverterRfHe.java b/com/hbm/inventory/container/ContainerConverterRfHe.java index 4f1e1e5d9..3cf76af42 100644 --- a/com/hbm/inventory/container/ContainerConverterRfHe.java +++ b/com/hbm/inventory/container/ContainerConverterRfHe.java @@ -1,13 +1,10 @@ package com.hbm.inventory.container; import com.hbm.tileentity.TileEntityConverterRfHe; -import com.hbm.tileentity.TileEntityReactorMultiblock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class ContainerConverterRfHe extends Container { diff --git a/com/hbm/inventory/container/ContainerCoreAdvanced.java b/com/hbm/inventory/container/ContainerCoreAdvanced.java index 41790ea7e..e744cd365 100644 --- a/com/hbm/inventory/container/ContainerCoreAdvanced.java +++ b/com/hbm/inventory/container/ContainerCoreAdvanced.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityCoreAdvanced; -import com.hbm.tileentity.TileEntityCoreTitanium; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerCoreTitanium.java b/com/hbm/inventory/container/ContainerCoreTitanium.java index 62a4f7a58..18cb91c18 100644 --- a/com/hbm/inventory/container/ContainerCoreTitanium.java +++ b/com/hbm/inventory/container/ContainerCoreTitanium.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityCoreTitanium; -import com.hbm.tileentity.TileEntityMachineGenerator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerDiFurnace.java b/com/hbm/inventory/container/ContainerDiFurnace.java index 5f49e5289..0c74eca2c 100644 --- a/com/hbm/inventory/container/ContainerDiFurnace.java +++ b/com/hbm/inventory/container/ContainerDiFurnace.java @@ -9,8 +9,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.tileentity.TileEntityFurnace; public class ContainerDiFurnace extends Container { diff --git a/com/hbm/inventory/container/ContainerFWatzCore.java b/com/hbm/inventory/container/ContainerFWatzCore.java index b40df7739..e4e96e543 100644 --- a/com/hbm/inventory/container/ContainerFWatzCore.java +++ b/com/hbm/inventory/container/ContainerFWatzCore.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.TileEntityFWatzCore; -import com.hbm.tileentity.TileEntityFusionMultiblock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerFusionMultiblock.java b/com/hbm/inventory/container/ContainerFusionMultiblock.java index 82d1dec92..b0d662744 100644 --- a/com/hbm/inventory/container/ContainerFusionMultiblock.java +++ b/com/hbm/inventory/container/ContainerFusionMultiblock.java @@ -1,8 +1,6 @@ package com.hbm.inventory.container; import com.hbm.tileentity.TileEntityFusionMultiblock; -import com.hbm.tileentity.TileEntityReactorMultiblock; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerIGenerator.java b/com/hbm/inventory/container/ContainerIGenerator.java index a3571f4a4..31ee4ad85 100644 --- a/com/hbm/inventory/container/ContainerIGenerator.java +++ b/com/hbm/inventory/container/ContainerIGenerator.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityReiXMainframe; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineAssembler.java b/com/hbm/inventory/container/ContainerMachineAssembler.java index 68a481521..28de4eb39 100644 --- a/com/hbm/inventory/container/ContainerMachineAssembler.java +++ b/com/hbm/inventory/container/ContainerMachineAssembler.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineMiningDrill; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineCMBFactory.java b/com/hbm/inventory/container/ContainerMachineCMBFactory.java index 6b8d27da0..54338e5ba 100644 --- a/com/hbm/inventory/container/ContainerMachineCMBFactory.java +++ b/com/hbm/inventory/container/ContainerMachineCMBFactory.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityMachineCMBFactory; -import com.hbm.tileentity.TileEntityMachineShredder; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineCyclotron.java b/com/hbm/inventory/container/ContainerMachineCyclotron.java index c552b81da..f3aacb1a6 100644 --- a/com/hbm/inventory/container/ContainerMachineCyclotron.java +++ b/com/hbm/inventory/container/ContainerMachineCyclotron.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityMachineCyclotron; -import com.hbm.tileentity.TileEntityMachineRTG; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineDiesel.java b/com/hbm/inventory/container/ContainerMachineDiesel.java index bb06dd52c..1af4ebd4b 100644 --- a/com/hbm/inventory/container/ContainerMachineDiesel.java +++ b/com/hbm/inventory/container/ContainerMachineDiesel.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineCoal; import com.hbm.tileentity.TileEntityMachineDiesel; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineGasFlare.java b/com/hbm/inventory/container/ContainerMachineGasFlare.java index 8b7c96617..6a12127e3 100644 --- a/com/hbm/inventory/container/ContainerMachineGasFlare.java +++ b/com/hbm/inventory/container/ContainerMachineGasFlare.java @@ -2,8 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityMachineGasFlare; -import com.hbm.tileentity.TileEntityMachineRTG; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineMiningDrill.java b/com/hbm/inventory/container/ContainerMachineMiningDrill.java index c0157100c..74478b857 100644 --- a/com/hbm/inventory/container/ContainerMachineMiningDrill.java +++ b/com/hbm/inventory/container/ContainerMachineMiningDrill.java @@ -1,7 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineDeuterium; import com.hbm.tileentity.TileEntityMachineMiningDrill; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineOilWell.java b/com/hbm/inventory/container/ContainerMachineOilWell.java index d604b92cc..0bb0ac1ae 100644 --- a/com/hbm/inventory/container/ContainerMachineOilWell.java +++ b/com/hbm/inventory/container/ContainerMachineOilWell.java @@ -2,9 +2,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityMachineRTG; -import com.hbm.tileentity.TileEntityMachineUF6Tank; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineRTG.java b/com/hbm/inventory/container/ContainerMachineRTG.java index 6e2295756..80a9a60db 100644 --- a/com/hbm/inventory/container/ContainerMachineRTG.java +++ b/com/hbm/inventory/container/ContainerMachineRTG.java @@ -1,9 +1,6 @@ package com.hbm.inventory.container; -import com.hbm.inventory.SlotMachineOutput; import com.hbm.tileentity.TileEntityMachineRTG; -import com.hbm.tileentity.TileEntityMachineUF6Tank; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/com/hbm/inventory/container/ContainerMachineRefinery.java b/com/hbm/inventory/container/ContainerMachineRefinery.java index 03257cc68..906830015 100644 --- a/com/hbm/inventory/container/ContainerMachineRefinery.java +++ b/com/hbm/inventory/container/ContainerMachineRefinery.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineOilWell; import com.hbm.tileentity.TileEntityMachineRefinery; import net.minecraft.entity.player.EntityPlayer; @@ -74,7 +73,7 @@ public class ContainerMachineRefinery extends Container { public void addCraftingToCrafters(ICrafting crafting) { super.addCraftingToCrafters(crafting); crafting.sendProgressBarUpdate(this, 0, this.testNuke.power); - crafting.sendProgressBarUpdate(this, 1, (int)this.testNuke.oil); + crafting.sendProgressBarUpdate(this, 1, this.testNuke.oil); crafting.sendProgressBarUpdate(this, 2, this.testNuke.fuel); crafting.sendProgressBarUpdate(this, 3, this.testNuke.lubricant); crafting.sendProgressBarUpdate(this, 4, this.testNuke.diesel); @@ -139,7 +138,7 @@ public class ContainerMachineRefinery extends Container { } if(this.oil != this.testNuke.oil) { - par1.sendProgressBarUpdate(this, 1, (int)this.testNuke.oil); + par1.sendProgressBarUpdate(this, 1, this.testNuke.oil); } if(this.fuel != this.testNuke.fuel) { diff --git a/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java b/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java index bddd8badc..829dd9b4f 100644 --- a/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java +++ b/com/hbm/inventory/container/ContainerMachineSchrabidiumTransmutator.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineDeuterium; import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineShredder.java b/com/hbm/inventory/container/ContainerMachineShredder.java index d20dbae8e..176aab6f4 100644 --- a/com/hbm/inventory/container/ContainerMachineShredder.java +++ b/com/hbm/inventory/container/ContainerMachineShredder.java @@ -1,7 +1,6 @@ package com.hbm.inventory.container; import com.hbm.inventory.SlotMachineOutput; -import com.hbm.tileentity.TileEntityMachineDiesel; import com.hbm.tileentity.TileEntityMachineShredder; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerMachineTeleporter.java b/com/hbm/inventory/container/ContainerMachineTeleporter.java index b9d248de3..b26d54a61 100644 --- a/com/hbm/inventory/container/ContainerMachineTeleporter.java +++ b/com/hbm/inventory/container/ContainerMachineTeleporter.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityConverterRfHe; import com.hbm.tileentity.TileEntityMachineTeleporter; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerReactorMultiblock.java b/com/hbm/inventory/container/ContainerReactorMultiblock.java index 9d8e9ba7a..da36ffff0 100644 --- a/com/hbm/inventory/container/ContainerReactorMultiblock.java +++ b/com/hbm/inventory/container/ContainerReactorMultiblock.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityMachineGenerator; import com.hbm.tileentity.TileEntityReactorMultiblock; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerReiXMainframe.java b/com/hbm/inventory/container/ContainerReiXMainframe.java index edcc0a49d..88731dbf9 100644 --- a/com/hbm/inventory/container/ContainerReiXMainframe.java +++ b/com/hbm/inventory/container/ContainerReiXMainframe.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityReactorMultiblock; import com.hbm.tileentity.TileEntityReiXMainframe; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/container/ContainerWatzCore.java b/com/hbm/inventory/container/ContainerWatzCore.java index 41c1c28b3..95913f4e5 100644 --- a/com/hbm/inventory/container/ContainerWatzCore.java +++ b/com/hbm/inventory/container/ContainerWatzCore.java @@ -1,6 +1,5 @@ package com.hbm.inventory.container; -import com.hbm.tileentity.TileEntityFusionMultiblock; import com.hbm.tileentity.TileEntityWatzCore; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/inventory/gui/GUIConverterHeRf.java b/com/hbm/inventory/gui/GUIConverterHeRf.java index e5ea6fa65..0d37336bd 100644 --- a/com/hbm/inventory/gui/GUIConverterHeRf.java +++ b/com/hbm/inventory/gui/GUIConverterHeRf.java @@ -8,7 +8,6 @@ import com.hbm.tileentity.TileEntityConverterHeRf; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUIConverterRfHe.java b/com/hbm/inventory/gui/GUIConverterRfHe.java index 1317febb0..a58661c80 100644 --- a/com/hbm/inventory/gui/GUIConverterRfHe.java +++ b/com/hbm/inventory/gui/GUIConverterRfHe.java @@ -8,7 +8,6 @@ import com.hbm.tileentity.TileEntityConverterRfHe; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUICoreAdvanced.java b/com/hbm/inventory/gui/GUICoreAdvanced.java index 07d802e20..5eb11d7d8 100644 --- a/com/hbm/inventory/gui/GUICoreAdvanced.java +++ b/com/hbm/inventory/gui/GUICoreAdvanced.java @@ -5,8 +5,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCoreAdvanced; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityCoreAdvanced; -import com.hbm.tileentity.TileEntityCoreTitanium; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUICoreTitanium.java b/com/hbm/inventory/gui/GUICoreTitanium.java index b94493ec5..245f30379 100644 --- a/com/hbm/inventory/gui/GUICoreTitanium.java +++ b/com/hbm/inventory/gui/GUICoreTitanium.java @@ -5,13 +5,10 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerCoreTitanium; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityCoreTitanium; -import com.hbm.tileentity.TileEntityMachineGenerator; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; public class GUICoreTitanium extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIFWatzCore.java b/com/hbm/inventory/gui/GUIFWatzCore.java index 20fa560c2..b82cbf780 100644 --- a/com/hbm/inventory/gui/GUIFWatzCore.java +++ b/com/hbm/inventory/gui/GUIFWatzCore.java @@ -5,8 +5,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerFWatzCore; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityFWatzCore; -import com.hbm.tileentity.TileEntityFusionMultiblock; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIFusionMultiblock.java b/com/hbm/inventory/gui/GUIFusionMultiblock.java index 7f8440668..755d65b85 100644 --- a/com/hbm/inventory/gui/GUIFusionMultiblock.java +++ b/com/hbm/inventory/gui/GUIFusionMultiblock.java @@ -5,8 +5,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerFusionMultiblock; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityFusionMultiblock; -import com.hbm.tileentity.TileEntityReactorMultiblock; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIIGenerator.java b/com/hbm/inventory/gui/GUIIGenerator.java index 78817302b..9fccd7203 100644 --- a/com/hbm/inventory/gui/GUIIGenerator.java +++ b/com/hbm/inventory/gui/GUIIGenerator.java @@ -3,11 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerIGenerator; -import com.hbm.inventory.container.ContainerReiXMainframe; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityReiXMainframe; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineAssembler.java b/com/hbm/inventory/gui/GUIMachineAssembler.java index 032a478e4..b299e40dc 100644 --- a/com/hbm/inventory/gui/GUIMachineAssembler.java +++ b/com/hbm/inventory/gui/GUIMachineAssembler.java @@ -3,11 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineAssembler; -import com.hbm.inventory.container.ContainerMachineOilWell; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineOilWell; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineCMBFactory.java b/com/hbm/inventory/gui/GUIMachineCMBFactory.java index 61d2b3abd..54e29cc18 100644 --- a/com/hbm/inventory/gui/GUIMachineCMBFactory.java +++ b/com/hbm/inventory/gui/GUIMachineCMBFactory.java @@ -5,8 +5,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineCMBFactory; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineCMBFactory; -import com.hbm.tileentity.TileEntityMachineShredder; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineCyclotron.java b/com/hbm/inventory/gui/GUIMachineCyclotron.java index 25bd36989..47fc0d768 100644 --- a/com/hbm/inventory/gui/GUIMachineCyclotron.java +++ b/com/hbm/inventory/gui/GUIMachineCyclotron.java @@ -3,11 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineCyclotron; -import com.hbm.inventory.container.ContainerMachineDeuterium; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineCyclotron; -import com.hbm.tileentity.TileEntityMachineDeuterium; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineDiesel.java b/com/hbm/inventory/gui/GUIMachineDiesel.java index a67af3195..f1f99ec4b 100644 --- a/com/hbm/inventory/gui/GUIMachineDiesel.java +++ b/com/hbm/inventory/gui/GUIMachineDiesel.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineCoal; import com.hbm.tileentity.TileEntityMachineDiesel; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineGasFlare.java b/com/hbm/inventory/gui/GUIMachineGasFlare.java index c889a1f8f..a8bfa9b70 100644 --- a/com/hbm/inventory/gui/GUIMachineGasFlare.java +++ b/com/hbm/inventory/gui/GUIMachineGasFlare.java @@ -3,11 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineGasFlare; -import com.hbm.inventory.container.ContainerMachineRTG; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineGasFlare; -import com.hbm.tileentity.TileEntityMachineRTG; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineMiningDrill.java b/com/hbm/inventory/gui/GUIMachineMiningDrill.java index 875661849..5481e89d1 100644 --- a/com/hbm/inventory/gui/GUIMachineMiningDrill.java +++ b/com/hbm/inventory/gui/GUIMachineMiningDrill.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerMachineDiesel; import com.hbm.inventory.container.ContainerMachineMiningDrill; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineDiesel; import com.hbm.tileentity.TileEntityMachineMiningDrill; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineOilWell.java b/com/hbm/inventory/gui/GUIMachineOilWell.java index c6b64de22..eaf74aa03 100644 --- a/com/hbm/inventory/gui/GUIMachineOilWell.java +++ b/com/hbm/inventory/gui/GUIMachineOilWell.java @@ -3,13 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineOilWell; -import com.hbm.inventory.container.ContainerMachineRTG; -import com.hbm.inventory.container.ContainerUF6Tank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineOilWell; -import com.hbm.tileentity.TileEntityMachineRTG; -import com.hbm.tileentity.TileEntityMachineUF6Tank; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineRTG.java b/com/hbm/inventory/gui/GUIMachineRTG.java index 1bf7d986f..3a6729bfb 100644 --- a/com/hbm/inventory/gui/GUIMachineRTG.java +++ b/com/hbm/inventory/gui/GUIMachineRTG.java @@ -3,11 +3,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineRTG; -import com.hbm.inventory.container.ContainerUF6Tank; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineRTG; -import com.hbm.tileentity.TileEntityMachineUF6Tank; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; diff --git a/com/hbm/inventory/gui/GUIMachineRefinery.java b/com/hbm/inventory/gui/GUIMachineRefinery.java index d62b8edbe..0e266a31b 100644 --- a/com/hbm/inventory/gui/GUIMachineRefinery.java +++ b/com/hbm/inventory/gui/GUIMachineRefinery.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerIGenerator; import com.hbm.inventory.container.ContainerMachineRefinery; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineRefinery; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java index dc4564e17..a60cd4c2e 100644 --- a/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java +++ b/com/hbm/inventory/gui/GUIMachineSchrabidiumTransmutator.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineSchrabidiumTransmutator; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineGenerator; import com.hbm.tileentity.TileEntityMachineSchrabidiumTransmutator; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineShredder.java b/com/hbm/inventory/gui/GUIMachineShredder.java index baeeb16a5..cdf03234a 100644 --- a/com/hbm/inventory/gui/GUIMachineShredder.java +++ b/com/hbm/inventory/gui/GUIMachineShredder.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerMachineShredder; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineDiesel; import com.hbm.tileentity.TileEntityMachineShredder; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIMachineTeleporter.java b/com/hbm/inventory/gui/GUIMachineTeleporter.java index a03da7efb..2ea2faf8f 100644 --- a/com/hbm/inventory/gui/GUIMachineTeleporter.java +++ b/com/hbm/inventory/gui/GUIMachineTeleporter.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerConverterRfHe; import com.hbm.inventory.container.ContainerMachineTeleporter; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityConverterRfHe; import com.hbm.tileentity.TileEntityMachineTeleporter; import net.minecraft.client.Minecraft; @@ -34,7 +32,7 @@ public class GUIMachineTeleporter extends GuiContainer { this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); - this.fontRendererObj.drawString("Power: " + diFurnace.power + "HE/" + diFurnace.maxPower + "HE", 10, 20, + this.fontRendererObj.drawString("Power: " + diFurnace.power + "HE/" + TileEntityMachineTeleporter.maxPower + "HE", 10, 20, 4210752); this.fontRendererObj.drawString("Mode: " + (diFurnace.mode ? "Send" : "Receive"), 10, 29, 4210752); if (diFurnace.mode) { diff --git a/com/hbm/inventory/gui/GUIMachineUF6Tank.java b/com/hbm/inventory/gui/GUIMachineUF6Tank.java index da11b70e0..9c55062f3 100644 --- a/com/hbm/inventory/gui/GUIMachineUF6Tank.java +++ b/com/hbm/inventory/gui/GUIMachineUF6Tank.java @@ -7,7 +7,6 @@ import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineUF6Tank; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/inventory/gui/GUINukeCustom.java b/com/hbm/inventory/gui/GUINukeCustom.java index d87883d91..b2c88f370 100644 --- a/com/hbm/inventory/gui/GUINukeCustom.java +++ b/com/hbm/inventory/gui/GUINukeCustom.java @@ -3,8 +3,6 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerNukeCustom; -import com.hbm.inventory.container.ContainerNukeFleija; -import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityNukeCustom; diff --git a/com/hbm/inventory/gui/GUIReactorMultiblock.java b/com/hbm/inventory/gui/GUIReactorMultiblock.java index 99f4c8026..6e203d323 100644 --- a/com/hbm/inventory/gui/GUIReactorMultiblock.java +++ b/com/hbm/inventory/gui/GUIReactorMultiblock.java @@ -4,15 +4,11 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerReactorMultiblock; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineGenerator; import com.hbm.tileentity.TileEntityReactorMultiblock; -import com.hbm.tileentity.TileEntityRtgFurnace; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; public class GUIReactorMultiblock extends GuiContainer { diff --git a/com/hbm/inventory/gui/GUIReiXMainframe.java b/com/hbm/inventory/gui/GUIReiXMainframe.java index 111dd2fed..546b142df 100644 --- a/com/hbm/inventory/gui/GUIReiXMainframe.java +++ b/com/hbm/inventory/gui/GUIReiXMainframe.java @@ -2,10 +2,8 @@ package com.hbm.inventory.gui; import org.lwjgl.opengl.GL11; -import com.hbm.inventory.container.ContainerReactorMultiblock; import com.hbm.inventory.container.ContainerReiXMainframe; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityReactorMultiblock; import com.hbm.tileentity.TileEntityReiXMainframe; import net.minecraft.client.Minecraft; diff --git a/com/hbm/inventory/gui/GUIWatzCore.java b/com/hbm/inventory/gui/GUIWatzCore.java index c03ec43c5..8827a4dff 100644 --- a/com/hbm/inventory/gui/GUIWatzCore.java +++ b/com/hbm/inventory/gui/GUIWatzCore.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.inventory.container.ContainerWatzCore; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityReactorMultiblock; import com.hbm.tileentity.TileEntityWatzCore; import net.minecraft.client.Minecraft; diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index e0a88ae04..6b476cfda 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -17,7 +17,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraft.item.ItemFood; import net.minecraft.item.ItemSoup; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -2263,10 +2262,6 @@ public class ModItems { GameRegistry.registerItem(factory_core_titanium, factory_core_titanium.getUnlocalizedName()); GameRegistry.registerItem(factory_core_advanced, factory_core_advanced.getUnlocalizedName()); - //Machine Templates - GameRegistry.registerItem(fluid_identifier, fluid_identifier.getUnlocalizedName()); - GameRegistry.registerItem(assembly_template, assembly_template.getUnlocalizedName()); - //Machine Upgrades GameRegistry.registerItem(upgrade_template, upgrade_template.getUnlocalizedName()); GameRegistry.registerItem(upgrade_speed_1, upgrade_speed_1.getUnlocalizedName()); @@ -2282,6 +2277,10 @@ public class ModItems { GameRegistry.registerItem(upgrade_fortune_2, upgrade_fortune_2.getUnlocalizedName()); GameRegistry.registerItem(upgrade_fortune_3, upgrade_fortune_3.getUnlocalizedName()); + //Machine Templates + GameRegistry.registerItem(fluid_identifier, fluid_identifier.getUnlocalizedName()); + GameRegistry.registerItem(assembly_template, assembly_template.getUnlocalizedName()); + //Machine Items GameRegistry.registerItem(fuse, fuse.getUnlocalizedName()); GameRegistry.registerItem(redcoil_capacitor, redcoil_capacitor.getUnlocalizedName()); diff --git a/com/hbm/items/bomb/ItemBoy.java b/com/hbm/items/bomb/ItemBoy.java index 8b6d61ceb..4ad96fd3c 100644 --- a/com/hbm/items/bomb/ItemBoy.java +++ b/com/hbm/items/bomb/ItemBoy.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.items.special.ItemRadioactive; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemBoy extends ItemRadioactive { diff --git a/com/hbm/items/bomb/ItemFleija.java b/com/hbm/items/bomb/ItemFleija.java index f152ae616..8b4376e8f 100644 --- a/com/hbm/items/bomb/ItemFleija.java +++ b/com/hbm/items/bomb/ItemFleija.java @@ -7,7 +7,6 @@ import com.hbm.items.special.ItemRadioactive; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemFleija extends ItemRadioactive { diff --git a/com/hbm/items/bomb/ItemGadget.java b/com/hbm/items/bomb/ItemGadget.java index 3724098fc..db4e71028 100644 --- a/com/hbm/items/bomb/ItemGadget.java +++ b/com/hbm/items/bomb/ItemGadget.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.items.special.ItemRadioactive; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemGadget extends ItemRadioactive { diff --git a/com/hbm/items/bomb/ItemManMike.java b/com/hbm/items/bomb/ItemManMike.java index f5db7ee7f..d83ddb257 100644 --- a/com/hbm/items/bomb/ItemManMike.java +++ b/com/hbm/items/bomb/ItemManMike.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.items.special.ItemRadioactive; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemManMike extends ItemRadioactive { diff --git a/com/hbm/items/bomb/ItemMike.java b/com/hbm/items/bomb/ItemMike.java index 3daf2dde0..3581f1ade 100644 --- a/com/hbm/items/bomb/ItemMike.java +++ b/com/hbm/items/bomb/ItemMike.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.items.special.ItemRadioactive; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemMike extends ItemRadioactive { diff --git a/com/hbm/items/bomb/ItemTsar.java b/com/hbm/items/bomb/ItemTsar.java index ad6ddd339..26fd2bac4 100644 --- a/com/hbm/items/bomb/ItemTsar.java +++ b/com/hbm/items/bomb/ItemTsar.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.items.special.ItemRadioactive; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemTsar extends ItemRadioactive { diff --git a/com/hbm/items/food/ItemEnergy.java b/com/hbm/items/food/ItemEnergy.java index 1f18f03f2..546ac2cdf 100644 --- a/com/hbm/items/food/ItemEnergy.java +++ b/com/hbm/items/food/ItemEnergy.java @@ -1,6 +1,5 @@ package com.hbm.items.food; -import java.util.Iterator; import java.util.List; import com.hbm.items.ModItems; @@ -9,11 +8,8 @@ import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityPotion; -import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -21,7 +17,8 @@ import net.minecraft.world.World; public class ItemEnergy extends Item { - public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) + @Override + public ItemStack onEaten(ItemStack p_77654_1_, World p_77654_2_, EntityPlayer p_77654_3_) { if (!p_77654_3_.capabilities.isCreativeMode) { @@ -169,17 +166,20 @@ public class ItemEnergy extends Item { return p_77654_1_; } - public int getMaxItemUseDuration(ItemStack p_77626_1_) + @Override + public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 32; } - public EnumAction getItemUseAction(ItemStack p_77661_1_) + @Override + public EnumAction getItemUseAction(ItemStack p_77661_1_) { return EnumAction.drink; } - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) + @Override + public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart)) if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener)) @@ -189,7 +189,8 @@ public class ItemEnergy extends Item { return p_77659_1_; } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { if(this == ModItems.can_smart) diff --git a/com/hbm/items/food/ItemPill.java b/com/hbm/items/food/ItemPill.java index fd7e82625..e924d4101 100644 --- a/com/hbm/items/food/ItemPill.java +++ b/com/hbm/items/food/ItemPill.java @@ -9,7 +9,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; public class ItemPill extends ItemFood { diff --git a/com/hbm/items/gear/ArmorAsbestos.java b/com/hbm/items/gear/ArmorAsbestos.java index d8fea6e4c..99c700c9e 100644 --- a/com/hbm/items/gear/ArmorAsbestos.java +++ b/com/hbm/items/gear/ArmorAsbestos.java @@ -3,17 +3,12 @@ package com.hbm.items.gear; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import net.minecraftforge.common.ISpecialArmor.ArmorProperties; - import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; diff --git a/com/hbm/items/gear/ArmorAustralium.java b/com/hbm/items/gear/ArmorAustralium.java index f5b1c5313..6b1385e30 100644 --- a/com/hbm/items/gear/ArmorAustralium.java +++ b/com/hbm/items/gear/ArmorAustralium.java @@ -3,26 +3,16 @@ package com.hbm.items.gear; import java.util.List; import java.util.Random; -import com.google.common.collect.Multimap; import com.hbm.items.ModItems; -import com.hbm.lib.Library; import com.hbm.lib.RefStrings; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.DamageSource; import net.minecraft.world.World; -import net.minecraftforge.common.ISpecialArmor; public class ArmorAustralium extends ItemArmor { diff --git a/com/hbm/items/gear/ArmorEuphemium.java b/com/hbm/items/gear/ArmorEuphemium.java index 088cccb8f..b93140e85 100644 --- a/com/hbm/items/gear/ArmorEuphemium.java +++ b/com/hbm/items/gear/ArmorEuphemium.java @@ -75,7 +75,7 @@ public class ArmorEuphemium extends ItemArmor implements ISpecialArmor { @Override public void onArmorTick(World world, EntityPlayer player, ItemStack armor) { - if(player instanceof EntityPlayer && Library.checkArmor((EntityPlayer)player, ModItems.euphemium_helmet, ModItems.euphemium_plate, ModItems.euphemium_legs, ModItems.euphemium_boots)) + if(player instanceof EntityPlayer && Library.checkArmor(player, ModItems.euphemium_helmet, ModItems.euphemium_plate, ModItems.euphemium_legs, ModItems.euphemium_boots)) { player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 5, 127, true)); player.addPotionEffect(new PotionEffect(Potion.resistance.id, 5, 127, true)); diff --git a/com/hbm/items/gear/ArmorT45.java b/com/hbm/items/gear/ArmorT45.java index a7cbcc184..3e0be1f01 100644 --- a/com/hbm/items/gear/ArmorT45.java +++ b/com/hbm/items/gear/ArmorT45.java @@ -22,7 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.item.ItemArmor; @@ -215,10 +214,11 @@ public class ArmorT45 extends ItemArmor implements ISpecialArmor { } } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Armor modifier", (double) 0.5, 0)); + new AttributeModifier(field_111210_e, "Armor modifier", 0.5, 0)); return multimap; } } diff --git a/com/hbm/items/gear/BigSword.java b/com/hbm/items/gear/BigSword.java index 9dba33e4b..91ab922d4 100644 --- a/com/hbm/items/gear/BigSword.java +++ b/com/hbm/items/gear/BigSword.java @@ -1,20 +1,10 @@ package com.hbm.items.gear; -import java.util.Random; - -import com.hbm.entity.projectile.EntityPlasmaBeam; -import com.hbm.lib.Library; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; public class BigSword extends ItemSword { diff --git a/com/hbm/items/gear/WeaponSpecial.java b/com/hbm/items/gear/WeaponSpecial.java index 01cc5e84c..6c43eb06c 100644 --- a/com/hbm/items/gear/WeaponSpecial.java +++ b/com/hbm/items/gear/WeaponSpecial.java @@ -38,7 +38,8 @@ public class WeaponSpecial extends ItemSword { return EnumRarity.common; } - public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase entityPlayer) + @Override + public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase entityPlayer) { World world = entity.worldObj; @@ -78,11 +79,12 @@ public class WeaponSpecial extends ItemSword { return false; } - public Multimap getItemAttributeModifiers() + @Override + public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); if(this == ModItems.schrabidium_hammer) { - multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)-0.5, 1)); + multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", -0.5, 1)); } return multimap; } diff --git a/com/hbm/items/special/ItemAntiCheat.java b/com/hbm/items/special/ItemAntiCheat.java index 7d552afa1..8ba07ff3a 100644 --- a/com/hbm/items/special/ItemAntiCheat.java +++ b/com/hbm/items/special/ItemAntiCheat.java @@ -1,22 +1,16 @@ package com.hbm.items.special; -import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.explosion.ExplosionChaos; import com.hbm.items.ModItems; -import com.hbm.lib.Library; import com.hbm.lib.ModDamageSource; -import com.hbm.main.MainRegistry; - import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class ItemAntiCheat extends ItemCustomLore { - public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { if(stack.getItemDamage() != 34) { diff --git a/com/hbm/items/special/ItemBattery.java b/com/hbm/items/special/ItemBattery.java index c588be370..bd69e0a11 100644 --- a/com/hbm/items/special/ItemBattery.java +++ b/com/hbm/items/special/ItemBattery.java @@ -23,7 +23,7 @@ public class ItemBattery extends Item { { long charge = maxCharge; if(itemstack.hasTagCompound()) - charge = this.getCharge(itemstack); + charge = ItemBattery.getCharge(itemstack); if(itemstack.getItem() != ModItems.fusion_core && itemstack.getItem() != ModItems.factory_core_titanium && itemstack.getItem() != ModItems.factory_core_advanced && itemstack.getItem() != ModItems.energy_core) { diff --git a/com/hbm/items/special/ItemCapacitor.java b/com/hbm/items/special/ItemCapacitor.java index 713c5157f..649a843f9 100644 --- a/com/hbm/items/special/ItemCapacitor.java +++ b/com/hbm/items/special/ItemCapacitor.java @@ -6,11 +6,9 @@ import com.hbm.items.ModItems; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraft.world.WorldSettings.GameType; public class ItemCapacitor extends Item { diff --git a/com/hbm/items/special/ItemCell.java b/com/hbm/items/special/ItemCell.java index fac3e10c8..bcd437010 100644 --- a/com/hbm/items/special/ItemCell.java +++ b/com/hbm/items/special/ItemCell.java @@ -3,9 +3,7 @@ package com.hbm.items.special; import java.util.Random; import com.hbm.blocks.bomb.BlockCrashedBomb; -import com.hbm.blocks.bomb.LaunchPad; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.explosion.ExplosionParticle; import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; diff --git a/com/hbm/items/special/ItemChopper.java b/com/hbm/items/special/ItemChopper.java index 4f5275f23..cce3de67c 100644 --- a/com/hbm/items/special/ItemChopper.java +++ b/com/hbm/items/special/ItemChopper.java @@ -5,7 +5,6 @@ import com.hbm.entity.mob.EntityHunterChopper; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IEntityLivingData; @@ -19,7 +18,8 @@ import net.minecraft.world.World; public class ItemChopper extends Item { - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) + @Override + public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if (p_77648_3_.isRemote) { @@ -38,7 +38,7 @@ public class ItemChopper extends Item { d0 = 0.5D; } - Entity entity = spawnCreature(p_77648_3_, p_77648_1_.getItemDamage(), (double)p_77648_4_ + 0.5D, (double)p_77648_5_ + d0, (double)p_77648_6_ + 0.5D); + Entity entity = spawnCreature(p_77648_3_, p_77648_1_.getItemDamage(), p_77648_4_ + 0.5D, p_77648_5_ + d0, p_77648_6_ + 0.5D); if (entity != null) { @@ -60,7 +60,8 @@ public class ItemChopper extends Item { /** * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer */ - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) + @Override + public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { if (p_77659_2_.isRemote) { @@ -94,7 +95,7 @@ public class ItemChopper extends Item { if (p_77659_2_.getBlock(i, j, k) instanceof BlockLiquid) { - Entity entity = spawnCreature(p_77659_2_, p_77659_1_.getItemDamage(), (double)i, (double)j, (double)k); + Entity entity = spawnCreature(p_77659_2_, p_77659_1_.getItemDamage(), i, j, k); if (entity != null) { diff --git a/com/hbm/items/special/ItemCustomLore.java b/com/hbm/items/special/ItemCustomLore.java index df3e2555b..cae621bd4 100644 --- a/com/hbm/items/special/ItemCustomLore.java +++ b/com/hbm/items/special/ItemCustomLore.java @@ -3,17 +3,11 @@ package com.hbm.items.special; import java.util.List; import com.hbm.items.ModItems; -import com.hbm.lib.ModDamageSource; import com.hbm.main.MainRegistry; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; public class ItemCustomLore extends ItemRadioactive { diff --git a/com/hbm/items/special/ItemDrop.java b/com/hbm/items/special/ItemDrop.java index 290231c01..e47a899f8 100644 --- a/com/hbm/items/special/ItemDrop.java +++ b/com/hbm/items/special/ItemDrop.java @@ -16,6 +16,7 @@ import net.minecraft.item.ItemStack; public class ItemDrop extends Item { + @Override public boolean onEntityItemUpdate(EntityItem entityItem) { if (entityItem != null) { if (entityItem.onGround) { diff --git a/com/hbm/items/special/ItemFuelRod.java b/com/hbm/items/special/ItemFuelRod.java index f7592d8e3..dec390986 100644 --- a/com/hbm/items/special/ItemFuelRod.java +++ b/com/hbm/items/special/ItemFuelRod.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ItemFuelRod extends ItemRadioactive { diff --git a/com/hbm/items/special/ItemModRecord.java b/com/hbm/items/special/ItemModRecord.java index d9dd62dd0..dc1282065 100644 --- a/com/hbm/items/special/ItemModRecord.java +++ b/com/hbm/items/special/ItemModRecord.java @@ -9,8 +9,6 @@ import com.hbm.lib.RefStrings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockJukebox; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -18,7 +16,6 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -34,6 +31,7 @@ public class ItemModRecord extends ItemRecord { modRecords.put(string, this); } + @Override public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if (p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_) == Blocks.jukebox @@ -57,11 +55,13 @@ public class ItemModRecord extends ItemRecord { * allows items to add custom lines of information to the mouseover * description */ + @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { p_77624_3_.add(this.getRecordNameLocal()); } + @Override @SideOnly(Side.CLIENT) public String getRecordNameLocal() { return StatCollector.translateToLocal("item.record." + this.recordName + ".desc"); @@ -70,6 +70,7 @@ public class ItemModRecord extends ItemRecord { /** * Return an item rarity from EnumRarity */ + @Override public EnumRarity getRarity(ItemStack p_77613_1_) { return EnumRarity.rare; } @@ -89,6 +90,7 @@ public class ItemModRecord extends ItemRecord { * The name of the record to play * @return The resource location for the audio, null to use default. */ + @Override public ResourceLocation getRecordResource(String name) { String s = ""; @@ -103,7 +105,8 @@ public class ItemModRecord extends ItemRecord { return new ResourceLocation(s); } - public String getItemStackDisplayName(ItemStack p_77653_1_) + @Override + public String getItemStackDisplayName(ItemStack p_77653_1_) { String s = (StatCollector.translateToLocal(Items.record_11.getUnlocalizedName() + ".name")).trim(); diff --git a/com/hbm/items/special/ItemPolaroid.java b/com/hbm/items/special/ItemPolaroid.java index faa08dca0..bb6a0a457 100644 --- a/com/hbm/items/special/ItemPolaroid.java +++ b/com/hbm/items/special/ItemPolaroid.java @@ -2,7 +2,6 @@ package com.hbm.items.special; import java.util.List; -import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import net.minecraft.entity.Entity; @@ -15,7 +14,8 @@ import net.minecraft.world.World; public class ItemPolaroid extends Item { - public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { if(entity instanceof EntityPlayer) if(((EntityPlayer)entity).getHealth() < 10F) { ((EntityPlayer) entity).addPotionEffect(new PotionEffect(Potion.resistance.id, 10, 2)); diff --git a/com/hbm/items/special/ItemRadioactive.java b/com/hbm/items/special/ItemRadioactive.java index c195cb338..a3c7d7961 100644 --- a/com/hbm/items/special/ItemRadioactive.java +++ b/com/hbm/items/special/ItemRadioactive.java @@ -15,7 +15,8 @@ import net.minecraft.world.World; public class ItemRadioactive extends Item { - public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int i, boolean b) { if((entity instanceof EntityPlayer && !Library.checkForHazmat((EntityPlayer)entity)) || !(entity instanceof EntityPlayer)) { doRadiationDamage(entity); diff --git a/com/hbm/items/special/ItemSyringe.java b/com/hbm/items/special/ItemSyringe.java index 1a0961fa9..af05c2755 100644 --- a/com/hbm/items/special/ItemSyringe.java +++ b/com/hbm/items/special/ItemSyringe.java @@ -186,7 +186,8 @@ public class ItemSyringe extends Item { return EnumRarity.common; } - public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase entityPlayer) + @Override + public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase entityPlayer) { World world = entity.worldObj; diff --git a/com/hbm/items/special/ItemTankWaste.java b/com/hbm/items/special/ItemTankWaste.java index 754846873..8fe0cb270 100644 --- a/com/hbm/items/special/ItemTankWaste.java +++ b/com/hbm/items/special/ItemTankWaste.java @@ -23,14 +23,16 @@ public class ItemTankWaste extends Item { this.setMaxDamage(0); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int p_77617_1_) { int j = MathHelper.clamp_int(p_77617_1_, 0, 8); return this.field_150920_d[j]; } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister p_94581_1_) { this.field_150920_d = new IIcon[9]; @@ -40,7 +42,8 @@ public class ItemTankWaste extends Item { this.field_150920_d[i] = p_94581_1_.registerIcon(RefStrings.MODID + ":tank_waste_" + i); } } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_) { for (int i = 0; i < 9; ++i) @@ -48,7 +51,8 @@ public class ItemTankWaste extends Item { p_150895_3_.add(new ItemStack(p_150895_1_, 1, i)); } } - public String getUnlocalizedName(ItemStack p_77667_1_) + @Override + public String getUnlocalizedName(ItemStack p_77667_1_) { int i = MathHelper.clamp_int(p_77667_1_.getItemDamage(), 0, 9); return super.getUnlocalizedName() + "_" + i; diff --git a/com/hbm/items/special/WatzFuel.java b/com/hbm/items/special/WatzFuel.java index abd6ef440..d15912795 100644 --- a/com/hbm/items/special/WatzFuel.java +++ b/com/hbm/items/special/WatzFuel.java @@ -3,7 +3,6 @@ package com.hbm.items.special; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class WatzFuel extends ItemRadioactive { diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index ed405500c..a02cc17ce 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -2,34 +2,13 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; - -import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; -import net.minecraft.block.BlockLog; -import net.minecraft.block.IGrowable; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.event.entity.player.BonemealEvent; public class ItemAssemblyTemplate extends Item { @@ -76,13 +55,15 @@ public class ItemAssemblyTemplate extends Item { this.setMaxDamage(0); } - public String getUnlocalizedName(ItemStack stack) + @Override + public String getUnlocalizedName(ItemStack stack) { int i = stack.getItemDamage(); return super.getUnlocalizedName() + "." + EnumAssemblyTemplate.getEnum(i).getName(); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (int i = 0; i < EnumAssemblyTemplate.values().length; ++i) diff --git a/com/hbm/items/tool/ItemCrateCaller.java b/com/hbm/items/tool/ItemCrateCaller.java index 1ad25d19f..bf86c5062 100644 --- a/com/hbm/items/tool/ItemCrateCaller.java +++ b/com/hbm/items/tool/ItemCrateCaller.java @@ -4,13 +4,10 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.interfaces.IBomb; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; diff --git a/com/hbm/items/tool/ItemDetonator.java b/com/hbm/items/tool/ItemDetonator.java index 7167d8487..611ce8df8 100644 --- a/com/hbm/items/tool/ItemDetonator.java +++ b/com/hbm/items/tool/ItemDetonator.java @@ -2,7 +2,6 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.blocks.bomb.NukeGadget; import com.hbm.interfaces.IBomb; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/tool/ItemFluidIdentifier.java b/com/hbm/items/tool/ItemFluidIdentifier.java index b648950b4..88cbc3789 100644 --- a/com/hbm/items/tool/ItemFluidIdentifier.java +++ b/com/hbm/items/tool/ItemFluidIdentifier.java @@ -1,45 +1,20 @@ package com.hbm.items.tool; -import java.util.Collections; import java.util.List; -import java.util.Random; - -import com.hbm.blocks.bomb.BlockCrashedBomb; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.explosion.ExplosionParticleB; -import com.hbm.handler.FluidTypeHandler; import com.hbm.handler.FluidTypeHandler.FluidType; -import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; import com.hbm.tileentity.TileEntityFluidDuct; -import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockColored; -import net.minecraft.block.BlockLog; -import net.minecraft.block.IGrowable; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.FakePlayerFactory; -import net.minecraftforge.event.entity.player.BonemealEvent; -import scala.actors.threadpool.Arrays; public class ItemFluidIdentifier extends Item { @@ -51,13 +26,15 @@ public class ItemFluidIdentifier extends Item { this.setMaxDamage(0); } - public String getUnlocalizedName(ItemStack stack) + @Override + public String getUnlocalizedName(ItemStack stack) { int i = stack.getItemDamage(); return super.getUnlocalizedName() + "." + FluidType.getEnum(i).getName(); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs tabs, List list) { for (int i = 0; i < FluidType.values().length; ++i) @@ -96,13 +73,15 @@ public class ItemFluidIdentifier extends Item { return false; } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() { return true; } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister p_94581_1_) { super.registerIcons(p_94581_1_); @@ -110,13 +89,15 @@ public class ItemFluidIdentifier extends Item { this.overlayIcon = p_94581_1_.registerIcon("hbm:fluid_identifier_overlay"); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) { return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_); } - @SideOnly(Side.CLIENT) + @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int p_82790_2_) { if (p_82790_2_ == 0) diff --git a/com/hbm/items/tool/ItemMatch.java b/com/hbm/items/tool/ItemMatch.java index 06fdd4a65..164652ab6 100644 --- a/com/hbm/items/tool/ItemMatch.java +++ b/com/hbm/items/tool/ItemMatch.java @@ -9,7 +9,8 @@ import net.minecraft.world.World; public class ItemMatch extends Item { - public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) + @Override + public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { if (p_77648_3_.isRemote) { @@ -55,7 +56,7 @@ public class ItemMatch extends Item { { if (p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_).getMaterial() == Material.air) { - p_77648_3_.playSoundEffect((double)p_77648_4_ + 0.5D, (double)p_77648_5_ + 0.5D, (double)p_77648_6_ + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); + p_77648_3_.playSoundEffect(p_77648_4_ + 0.5D, p_77648_5_ + 0.5D, p_77648_6_ + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); p_77648_3_.setBlock(p_77648_4_, p_77648_5_, p_77648_6_, Blocks.fire); } diff --git a/com/hbm/items/tool/ItemMultitoolPassive.java b/com/hbm/items/tool/ItemMultitoolPassive.java index 749ab2c5b..a812ce82c 100644 --- a/com/hbm/items/tool/ItemMultitoolPassive.java +++ b/com/hbm/items/tool/ItemMultitoolPassive.java @@ -4,34 +4,25 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.blocks.bomb.BlockCrashedBomb; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.entity.projectile.EntityFire; import com.hbm.entity.projectile.EntityLaserBeam; import com.hbm.entity.projectile.EntityMinerBeam; -import com.hbm.entity.projectile.EntityPlasmaBeam; import com.hbm.entity.projectile.EntityRubble; import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionParticleB; import com.hbm.items.ModItems; import com.hbm.lib.Library; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.ArrowNockEvent; public class ItemMultitoolPassive extends Item { @@ -41,6 +32,7 @@ public class ItemMultitoolPassive extends Item { this.setMaxDamage(5000); } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(player.isSneaking()) { @@ -214,32 +206,33 @@ public class ItemMultitoolPassive extends Item { return false; } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); if(this == ModItems.multitool_ext) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 7, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 7, 0)); } else if (this == ModItems.multitool_miner) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 8, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 8, 0)); } else if (this == ModItems.multitool_hit) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 16, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 16, 0)); } else if (this == ModItems.multitool_beam) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 8, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 8, 0)); } else if (this == ModItems.multitool_sky) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 5, 0)); } else if (this == ModItems.multitool_mega) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 12, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 12, 0)); } else if (this == ModItems.multitool_joule) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 12, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 12, 0)); } else if (this == ModItems.multitool_decon) { multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 5, 0)); } return multimap; } diff --git a/com/hbm/items/tool/ItemMultitoolTool.java b/com/hbm/items/tool/ItemMultitoolTool.java index ce82cf314..89e232184 100644 --- a/com/hbm/items/tool/ItemMultitoolTool.java +++ b/com/hbm/items/tool/ItemMultitoolTool.java @@ -4,18 +4,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.google.common.collect.Sets; import com.hbm.items.ModItems; import cpw.mods.fml.common.registry.GameData; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.world.World; @@ -32,12 +28,13 @@ public class ItemMultitoolTool extends ItemTool { Set all = new HashSet(); for(Object b : GameData.getBlockRegistry()) { - all.add((Block)b); + all.add(b); } return all; } + @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { if(player.isSneaking()) { @@ -58,7 +55,8 @@ public class ItemMultitoolTool extends ItemTool { return stack; } - public boolean func_150897_b(Block p_150897_1_) { + @Override + public boolean func_150897_b(Block p_150897_1_) { return true; } diff --git a/com/hbm/items/tool/ItemOilDetector.java b/com/hbm/items/tool/ItemOilDetector.java index 7a29c6e3f..755a75c55 100644 --- a/com/hbm/items/tool/ItemOilDetector.java +++ b/com/hbm/items/tool/ItemOilDetector.java @@ -5,7 +5,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; diff --git a/com/hbm/items/tool/ItemRamManipulator.java b/com/hbm/items/tool/ItemRamManipulator.java index 828f2f0e2..5abdf13a1 100644 --- a/com/hbm/items/tool/ItemRamManipulator.java +++ b/com/hbm/items/tool/ItemRamManipulator.java @@ -2,7 +2,6 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.interfaces.IBomb; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; @@ -12,7 +11,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; public class ItemRamManipulator extends Item { diff --git a/com/hbm/items/tool/ItemWand.java b/com/hbm/items/tool/ItemWand.java index c44fc4913..9bb6dc6ca 100644 --- a/com/hbm/items/tool/ItemWand.java +++ b/com/hbm/items/tool/ItemWand.java @@ -2,8 +2,6 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.blocks.bomb.LaunchPad; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/com/hbm/items/tool/ItemWandD.java b/com/hbm/items/tool/ItemWandD.java index 8370ff018..494d34b60 100644 --- a/com/hbm/items/tool/ItemWandD.java +++ b/com/hbm/items/tool/ItemWandD.java @@ -8,7 +8,6 @@ import com.hbm.tileentity.TileEntityPylonRedWire; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; diff --git a/com/hbm/items/tool/ItemWandS.java b/com/hbm/items/tool/ItemWandS.java index 26f6729e2..3a6a01418 100644 --- a/com/hbm/items/tool/ItemWandS.java +++ b/com/hbm/items/tool/ItemWandS.java @@ -10,14 +10,12 @@ import com.hbm.world.FusionReactor; import com.hbm.world.NuclearReactor; import com.hbm.world.Watz; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; -import scala.Int; public class ItemWandS extends Item { diff --git a/com/hbm/items/tool/ItemWiring.java b/com/hbm/items/tool/ItemWiring.java index e45efd67a..98396a0a9 100644 --- a/com/hbm/items/tool/ItemWiring.java +++ b/com/hbm/items/tool/ItemWiring.java @@ -2,10 +2,6 @@ package com.hbm.items.tool; import java.util.List; -import com.hbm.blocks.ModBlocks; -import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEPylonSenderPacket; -import com.hbm.tileentity.TileEntityMachineTeleporter; import com.hbm.tileentity.TileEntityPylonRedWire; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/items/weapon/GunBaleFlare.java b/com/hbm/items/weapon/GunBaleFlare.java index 49f286a56..ebaca01d4 100644 --- a/com/hbm/items/weapon/GunBaleFlare.java +++ b/com/hbm/items/weapon/GunBaleFlare.java @@ -4,7 +4,6 @@ import java.util.List; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBaleflare; -import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; @@ -135,12 +134,13 @@ public class GunBaleFlare extends Item { return 0; } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) -0.3, 1)); + new AttributeModifier(field_111210_e, "Weapon modifier", -0.3, 1)); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } diff --git a/com/hbm/items/weapon/GunCryolator.java b/com/hbm/items/weapon/GunCryolator.java index 9b0559cb2..9fe418ba4 100644 --- a/com/hbm/items/weapon/GunCryolator.java +++ b/com/hbm/items/weapon/GunCryolator.java @@ -4,9 +4,7 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityFire; import com.hbm.entity.projectile.EntityLN2; -import com.hbm.entity.projectile.EntityPlasmaBeam; import com.hbm.items.ModItems; import net.minecraft.enchantment.Enchantment; @@ -33,6 +31,7 @@ public class GunCryolator extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -47,6 +46,7 @@ public class GunCryolator extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -85,10 +85,11 @@ public class GunCryolator extends Item { list.add("Damage: 5"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunDefabricator.java b/com/hbm/items/weapon/GunDefabricator.java index 087f183f3..37299fd2e 100644 --- a/com/hbm/items/weapon/GunDefabricator.java +++ b/com/hbm/items/weapon/GunDefabricator.java @@ -32,6 +32,7 @@ public class GunDefabricator extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -46,6 +47,7 @@ public class GunDefabricator extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -85,10 +87,11 @@ public class GunDefabricator extends Item { list.add("Damage: 40 - 120"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 6.5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 6.5, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunEMPRay.java b/com/hbm/items/weapon/GunEMPRay.java index dd8a5b102..8557bd630 100644 --- a/com/hbm/items/weapon/GunEMPRay.java +++ b/com/hbm/items/weapon/GunEMPRay.java @@ -4,11 +4,8 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.effect.EntityEMPBlast; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityDischarge; -import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.items.ModItems; @@ -38,6 +35,7 @@ public class GunEMPRay extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -145,10 +143,11 @@ public class GunEMPRay extends Item { list.add("Damage: 25 - 35"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunEuthanasia.java b/com/hbm/items/weapon/GunEuthanasia.java index 495414240..fe2562348 100644 --- a/com/hbm/items/weapon/GunEuthanasia.java +++ b/com/hbm/items/weapon/GunEuthanasia.java @@ -32,6 +32,7 @@ public class GunEuthanasia extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -46,6 +47,7 @@ public class GunEuthanasia extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -90,10 +92,11 @@ public class GunEuthanasia extends Item { list.add("Syringes have a 20% chance to instakill the enemy."); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 3, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 3, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunFatman.java b/com/hbm/items/weapon/GunFatman.java index 2b302b9b0..166d1403a 100644 --- a/com/hbm/items/weapon/GunFatman.java +++ b/com/hbm/items/weapon/GunFatman.java @@ -4,7 +4,6 @@ import java.util.List; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityMiniNuke; -import com.hbm.entity.projectile.EntityRocket; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; @@ -135,12 +134,13 @@ public class GunFatman extends Item { return 0; } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) -0.3, 1)); + new AttributeModifier(field_111210_e, "Weapon modifier", -0.3, 1)); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } diff --git a/com/hbm/items/weapon/GunHP.java b/com/hbm/items/weapon/GunHP.java index 385f4a8bc..f6e13f808 100644 --- a/com/hbm/items/weapon/GunHP.java +++ b/com/hbm/items/weapon/GunHP.java @@ -4,24 +4,16 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityFire; import com.hbm.entity.projectile.EntityPlasmaBeam; import com.hbm.items.ModItems; -import com.hbm.lib.Library; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ArrowNockEvent; @@ -38,6 +30,7 @@ public class GunHP extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -52,6 +45,7 @@ public class GunHP extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -113,10 +107,11 @@ public class GunHP extends Item { list.add("Damage: 25 - 45"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunImmolator.java b/com/hbm/items/weapon/GunImmolator.java index 50f9fc74a..fd6b7a793 100644 --- a/com/hbm/items/weapon/GunImmolator.java +++ b/com/hbm/items/weapon/GunImmolator.java @@ -4,24 +4,17 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityFire; import com.hbm.entity.projectile.EntityPlasmaBeam; import com.hbm.items.ModItems; -import com.hbm.lib.Library; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ArrowNockEvent; @@ -38,6 +31,7 @@ public class GunImmolator extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -52,6 +46,7 @@ public class GunImmolator extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -121,10 +116,11 @@ public class GunImmolator extends Item { list.add("Secondary Damage: 25 - 45"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunJack.java b/com/hbm/items/weapon/GunJack.java index eddc8671f..b92bf677d 100644 --- a/com/hbm/items/weapon/GunJack.java +++ b/com/hbm/items/weapon/GunJack.java @@ -138,10 +138,11 @@ public class GunJack extends Item { list.add("Projectiles: 24 - 48"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4.5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4.5, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunMIRV.java b/com/hbm/items/weapon/GunMIRV.java index 9847c471f..1cfde6795 100644 --- a/com/hbm/items/weapon/GunMIRV.java +++ b/com/hbm/items/weapon/GunMIRV.java @@ -4,7 +4,6 @@ import java.util.List; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityMiniMIRV; -import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; @@ -134,12 +133,13 @@ public class GunMIRV extends Item { return 0; } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) -0.3, 1)); + new AttributeModifier(field_111210_e, "Weapon modifier", -0.3, 1)); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } diff --git a/com/hbm/items/weapon/GunMP.java b/com/hbm/items/weapon/GunMP.java index 4038c9a3e..a0f84d47f 100644 --- a/com/hbm/items/weapon/GunMP.java +++ b/com/hbm/items/weapon/GunMP.java @@ -5,7 +5,6 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityCombineBall; import com.hbm.items.ModItems; import net.minecraft.enchantment.Enchantment; @@ -32,6 +31,7 @@ public class GunMP extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -46,6 +46,7 @@ public class GunMP extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -89,10 +90,11 @@ public class GunMP extends Item { list.add("Damage: 100 - 150"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 5, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunNightmare.java b/com/hbm/items/weapon/GunNightmare.java index 346033582..5791c1043 100644 --- a/com/hbm/items/weapon/GunNightmare.java +++ b/com/hbm/items/weapon/GunNightmare.java @@ -8,8 +8,6 @@ import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityNightmareBlast; import com.hbm.items.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; @@ -19,10 +17,7 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; @@ -234,10 +229,11 @@ public class GunNightmare extends Item { } } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 2.5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 2.5, 0)); return multimap; } } \ No newline at end of file diff --git a/com/hbm/items/weapon/GunOSIPR.java b/com/hbm/items/weapon/GunOSIPR.java index 95080983c..ce1083454 100644 --- a/com/hbm/items/weapon/GunOSIPR.java +++ b/com/hbm/items/weapon/GunOSIPR.java @@ -6,24 +6,16 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityCombineBall; -import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.items.ModItems; -import com.hbm.lib.ModDamageSource; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; public class GunOSIPR extends Item { @@ -41,6 +33,7 @@ public class GunOSIPR extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -55,6 +48,7 @@ public class GunOSIPR extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -124,10 +118,11 @@ public class GunOSIPR extends Item { list.add("Secondary Damage: 1000"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 5, 0)); return multimap; } diff --git a/com/hbm/items/weapon/GunRevolver.java b/com/hbm/items/weapon/GunRevolver.java index 02582cec6..5b1460a27 100644 --- a/com/hbm/items/weapon/GunRevolver.java +++ b/com/hbm/items/weapon/GunRevolver.java @@ -235,10 +235,11 @@ public class GunRevolver extends Item { } } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 2.5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 2.5, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunRpg.java b/com/hbm/items/weapon/GunRpg.java index 4cb23fdae..18a8af87a 100644 --- a/com/hbm/items/weapon/GunRpg.java +++ b/com/hbm/items/weapon/GunRpg.java @@ -3,7 +3,6 @@ package com.hbm.items.weapon; import java.util.List; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.entity.projectile.EntityRocket; import com.hbm.items.ModItems; @@ -159,10 +158,11 @@ public class GunRpg extends Item list.add("Projectiles explode on impact."); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4, 0)); return multimap; } } \ No newline at end of file diff --git a/com/hbm/items/weapon/GunSMG.java b/com/hbm/items/weapon/GunSMG.java index 400a02c85..cc073a1d7 100644 --- a/com/hbm/items/weapon/GunSMG.java +++ b/com/hbm/items/weapon/GunSMG.java @@ -32,6 +32,7 @@ public class GunSMG extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -46,6 +47,7 @@ public class GunSMG extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -86,10 +88,11 @@ public class GunSMG extends Item { list.add("Damage: 2 - 8"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 3, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 3, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunShotgun.java b/com/hbm/items/weapon/GunShotgun.java index 67f04733c..c127c3561 100644 --- a/com/hbm/items/weapon/GunShotgun.java +++ b/com/hbm/items/weapon/GunShotgun.java @@ -7,20 +7,14 @@ import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; import com.hbm.items.ModItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; -import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; @@ -185,10 +179,11 @@ public class GunShotgun extends Item { list.add("Projectiles: 6 - 12"); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 3.5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 3.5, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunSpark.java b/com/hbm/items/weapon/GunSpark.java index b7bfd3003..a31b01ddd 100644 --- a/com/hbm/items/weapon/GunSpark.java +++ b/com/hbm/items/weapon/GunSpark.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityPlasmaBeam; import com.hbm.entity.projectile.EntitySparkBeam; import com.hbm.items.ModItems; @@ -133,10 +131,11 @@ public class GunSpark extends Item { list.add("Projectiles explode on impact."); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 4.5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 4.5, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunSuicide.java b/com/hbm/items/weapon/GunSuicide.java index 459ba7644..aa4ce465e 100644 --- a/com/hbm/items/weapon/GunSuicide.java +++ b/com/hbm/items/weapon/GunSuicide.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import com.google.common.collect.Multimap; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; @@ -19,8 +18,6 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -229,10 +226,11 @@ public class GunSuicide extends Item { } } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 2.5, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 2.5, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/GunXVL1456.java b/com/hbm/items/weapon/GunXVL1456.java index d9f0b1f6f..4d0700ef8 100644 --- a/com/hbm/items/weapon/GunXVL1456.java +++ b/com/hbm/items/weapon/GunXVL1456.java @@ -5,16 +5,10 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityMiniNuke; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; -import com.hbm.sound.MovingSoundPlayerLoop; -import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound; -import com.hbm.sound.MovingSoundXVL1456; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -22,8 +16,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; @@ -44,6 +36,7 @@ public class GunXVL1456 extends Item { return EnumAction.bow; } + @Override public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int i) { int j = this.getMaxItemUseDuration(stack) - i; @@ -83,6 +76,7 @@ public class GunXVL1456 extends Item { } } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -102,6 +96,7 @@ public class GunXVL1456 extends Item { return p_77659_1_; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -146,11 +141,11 @@ public class GunXVL1456 extends Item { { if(!world.isRemote) { - stack.damageItem(1250, (EntityLivingBase) player); + stack.damageItem(1250, player); world.createExplosion(player, player.posX, player.posY, player.posZ, 10.0F, true); player.attackEntityFrom(ModDamageSource.tauBlast, 1000F); - ((EntityPlayer)player).dropOneItem(false); + player.dropOneItem(false); } } } @@ -175,10 +170,11 @@ public class GunXVL1456 extends Item { list.add("Projectiles penetrate walls."); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 6, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 6, 0)); return multimap; } diff --git a/com/hbm/items/weapon/GunZOMG.java b/com/hbm/items/weapon/GunZOMG.java index 8c59393e4..aa1a3b5c1 100644 --- a/com/hbm/items/weapon/GunZOMG.java +++ b/com/hbm/items/weapon/GunZOMG.java @@ -5,7 +5,6 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityCombineBall; import com.hbm.entity.projectile.EntityRainbow; import com.hbm.items.ModItems; import com.hbm.lib.Library; @@ -36,6 +35,7 @@ public class GunZOMG extends Item { return EnumAction.bow; } + @Override public int getMaxItemUseDuration(ItemStack p_77626_1_) { return 72000; } @@ -108,6 +108,7 @@ public class GunZOMG extends Item { return stack; } + @Override public void onUsingTick(ItemStack stack, EntityPlayer player, int count) { World world = player.worldObj; @@ -213,10 +214,11 @@ public class GunZOMG extends Item { list.add("Energy projectiles destroy blocks."); } + @Override public Multimap getItemAttributeModifiers() { Multimap multimap = super.getItemAttributeModifiers(); multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Weapon modifier", (double) 6, 0)); + new AttributeModifier(field_111210_e, "Weapon modifier", 6, 0)); return multimap; } } diff --git a/com/hbm/items/weapon/ItemClip.java b/com/hbm/items/weapon/ItemClip.java index 54f469f5e..97a458cb4 100644 --- a/com/hbm/items/weapon/ItemClip.java +++ b/com/hbm/items/weapon/ItemClip.java @@ -1,15 +1,10 @@ package com.hbm.items.weapon; -import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; public class ItemClip extends Item { diff --git a/com/hbm/lib/HbmWorld.java b/com/hbm/lib/HbmWorld.java index 4565ef2b1..79f0f7473 100644 --- a/com/hbm/lib/HbmWorld.java +++ b/com/hbm/lib/HbmWorld.java @@ -1,6 +1,5 @@ package com.hbm.lib; -import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.registry.GameRegistry; public class HbmWorld { diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 548e78412..9f4fe45ec 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -2,10 +2,7 @@ package com.hbm.lib; import java.util.ArrayList; import java.util.List; -import java.util.UUID; - import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.machine.DummyBlockAssembler; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForGas; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForOil; @@ -14,7 +11,6 @@ import com.hbm.entity.projectile.EntityChopperMine; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; -import com.hbm.interfaces.IFluidDuct; import com.hbm.interfaces.IGasAcceptor; import com.hbm.interfaces.IGasDuct; import com.hbm.interfaces.IGasSource; @@ -30,17 +26,13 @@ import com.hbm.tileentity.TileEntityDummy; import com.hbm.tileentity.TileEntityFluidDuct; import com.hbm.tileentity.TileEntityGasDuct; import com.hbm.tileentity.TileEntityGasDuctSolid; -import com.hbm.tileentity.TileEntityLaunchPad; import com.hbm.tileentity.TileEntityMachineBattery; -import com.hbm.tileentity.TileEntityMachineDeuterium; -import com.hbm.tileentity.TileEntityMachineElectricFurnace; import com.hbm.tileentity.TileEntityOilDuct; import com.hbm.tileentity.TileEntityOilDuctSolid; import com.hbm.tileentity.TileEntityPylonRedWire; import com.hbm.tileentity.TileEntityWireCoated; import net.minecraft.block.Block; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -492,9 +484,9 @@ public class Library { } else { - double d0 = player.prevPosX + (player.posX - player.prevPosX) * (double)par1; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * (double)par1 + (player.getEyeHeight() - player.getDefaultEyeHeight()); - double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * (double)par1; + double d0 = player.prevPosX + (player.posX - player.prevPosX) * par1; + double d1 = player.prevPosY + (player.posY - player.prevPosY) * par1 + (player.getEyeHeight() - player.getDefaultEyeHeight()); + double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * par1; return Vec3.createVectorHelper(d0, d1, d2); } } @@ -511,111 +503,111 @@ public class Library { public static int chargeItemsFromTE(ItemStack[] slots, int index, int power, int maxPower) { - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_6 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_6 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_24 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_24 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } for(int i = 0; i < 5; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 5; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 5; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_4 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_4 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 5; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_12 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_12 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_3 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_3 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_6 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_6 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_2 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_2 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_4 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_4 && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_titanium && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_titanium && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_advanced && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) + if(power - 100 >= 0 && slots[index] != null && slots[index].getItem() == ModItems.factory_core_advanced && ItemBattery.getCharge(slots[index]) < ((ItemBattery)slots[index].getItem()).getMaxCharge()) { power -= 100; ((ItemBattery)slots[index].getItem()).chargeBattery(slots[index], 1); @@ -659,111 +651,111 @@ public class Library { return maxPower; } - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_generic && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_6 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_6 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_24 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_red_cell_24 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } for(int i = 0; i < 5; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 5; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 5; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_4 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_4 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 5; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_12 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_advanced_cell_12 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_3 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_3 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_6 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_lithium_cell_6 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_2 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_2 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 15; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_4 && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.battery_schrabidium_cell_4 && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 25; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.fusion_core && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.fusion_core && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); } else break; for(int i = 0; i < 10; i++) - if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.energy_core && ((ItemBattery)slots[index].getItem()).getCharge(slots[index]) > 0) + if(power + 100 <= maxPower && slots[index] != null && slots[index].getItem() == ModItems.energy_core && ItemBattery.getCharge(slots[index]) > 0) { power += 100; ((ItemBattery)slots[index].getItem()).dischargeBattery(slots[index], 1); diff --git a/com/hbm/lib/ModDamageSource.java b/com/hbm/lib/ModDamageSource.java index 371de56bd..57f3b4462 100644 --- a/com/hbm/lib/ModDamageSource.java +++ b/com/hbm/lib/ModDamageSource.java @@ -11,7 +11,6 @@ import com.hbm.entity.projectile.EntityPlasmaBeam; import com.hbm.entity.projectile.EntityRainbow; import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSourceIndirect; diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java index 9eeb37a68..751690da9 100644 --- a/com/hbm/main/ClientProxy.java +++ b/com/hbm/main/ClientProxy.java @@ -142,7 +142,6 @@ import com.hbm.render.item.ItemRenderMP; import com.hbm.render.item.ItemRenderMP40; import com.hbm.render.item.ItemRenderMiniNuke; import com.hbm.render.item.ItemRenderMultitool; -import com.hbm.render.item.ItemRenderNukeGadget; import com.hbm.render.item.ItemRenderOSIPR; import com.hbm.render.item.ItemRenderOverkill; import com.hbm.render.item.ItemRenderPoleTop; @@ -155,7 +154,6 @@ import com.hbm.render.item.ItemRenderRevolverIron; import com.hbm.render.item.ItemRenderRevolverLead; import com.hbm.render.item.ItemRenderRevolverNightmare; import com.hbm.render.item.ItemRenderRevolverSchrabidium; -import com.hbm.render.item.ItemRenderRocket; import com.hbm.render.item.ItemRenderRpg; import com.hbm.render.item.ItemRenderSatelliteReceiver; import com.hbm.render.item.ItemRenderSteelPoles; @@ -169,6 +167,7 @@ import com.hbm.render.tileentity.RenderAssembler; import com.hbm.render.tileentity.RenderBombMulti; import com.hbm.render.tileentity.RenderCable; import com.hbm.render.tileentity.RenderCentrifuge; +import com.hbm.render.tileentity.RenderChemplant; import com.hbm.render.tileentity.RenderCrashedBomb; import com.hbm.render.tileentity.RenderCyclotron; import com.hbm.render.tileentity.RenderDecoBlock; @@ -225,6 +224,7 @@ import com.hbm.tileentity.TileEntityMachineOilWell; import com.hbm.tileentity.TileEntityLaunchPad; import com.hbm.tileentity.TileEntityMachineAssembler; import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.TileEntityMachineChemplant; import com.hbm.tileentity.TileEntityMachineCyclotron; import com.hbm.tileentity.TileEntityMachineGasFlare; import com.hbm.tileentity.TileEntityMachinePuF6Tank; @@ -286,6 +286,7 @@ public class ClientProxy extends ServerProxy ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineGasFlare.class, new RenderGasFlare()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineMiningDrill.class, new RenderMiningDrill()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineAssembler.class, new RenderAssembler()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineChemplant.class, new RenderChemplant()); //RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderRocket()); RenderingRegistry.registerEntityRenderingHandler(EntityRocket.class, new RenderSnowball(ModItems.man_core)); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index da925dc90..8e669a52c 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -1,6 +1,5 @@ package com.hbm.main; -import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -8,8 +7,6 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraftforge.common.AchievementPage; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -29,7 +26,6 @@ import com.hbm.creativetabs.BlockTab; import com.hbm.creativetabs.MachineTab; import com.hbm.creativetabs.NukeTab; import com.hbm.creativetabs.PartsTab; -import com.hbm.creativetabs.TestTab; import com.hbm.entity.effect.EntityBlackHole; import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.effect.EntityEMPBlast; @@ -119,7 +115,6 @@ import com.hbm.inventory.FluidContainerRegistry; import com.hbm.inventory.MachineRecipes; import com.hbm.inventory.MachineRecipes.ShredderRecipe; import com.hbm.items.ModItems; -import com.hbm.items.tool.ItemFluidIdentifier; import com.hbm.lib.HbmWorld; import com.hbm.lib.Library; import com.hbm.lib.RefStrings; @@ -152,6 +147,7 @@ import com.hbm.tileentity.TileEntityMachineAssembler; import com.hbm.tileentity.TileEntityMachineBattery; import com.hbm.tileentity.TileEntityMachineCMBFactory; import com.hbm.tileentity.TileEntityMachineCentrifuge; +import com.hbm.tileentity.TileEntityMachineChemplant; import com.hbm.tileentity.TileEntityMachineCoal; import com.hbm.tileentity.TileEntityMachineCyclotron; import com.hbm.tileentity.TileEntityMachineDeuterium; @@ -199,7 +195,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; @Mod(modid = RefStrings.MODID, name = RefStrings.NAME, version = RefStrings.VERSION) @@ -464,6 +459,7 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityMachineMiningDrill.class, "tileentity_mining_drill"); GameRegistry.registerTileEntity(TileEntityMachineAssembler.class, "tileentity_assembly_machine"); GameRegistry.registerTileEntity(TileEntityFluidDuct.class, "tileentity_universal_duct"); + GameRegistry.registerTileEntity(TileEntityMachineChemplant.class, "tileentity_chemical_plant"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); diff --git a/com/hbm/main/ModEventHandler.java b/com/hbm/main/ModEventHandler.java index 455eeccb8..519b9bb01 100644 --- a/com/hbm/main/ModEventHandler.java +++ b/com/hbm/main/ModEventHandler.java @@ -1,13 +1,9 @@ package com.hbm.main; -import com.hbm.blocks.ModBlocks; -import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import net.minecraft.client.Minecraft; -import net.minecraft.item.Item; import net.minecraft.util.ChatComponentText; public class ModEventHandler diff --git a/com/hbm/main/ModEventHandlerClient.java b/com/hbm/main/ModEventHandlerClient.java index c63c2e441..61e5667ea 100644 --- a/com/hbm/main/ModEventHandlerClient.java +++ b/com/hbm/main/ModEventHandlerClient.java @@ -1,8 +1,5 @@ package com.hbm.main; -import java.util.ArrayList; -import java.util.List; - import com.hbm.entity.mob.EntityHunterChopper; import com.hbm.entity.projectile.EntityChopperMine; import com.hbm.lib.Library; @@ -13,16 +10,12 @@ import com.hbm.sound.MovingSoundPlayerLoop; import com.hbm.sound.MovingSoundXVL1456; import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound; -import codechicken.lib.render.IFaceRenderer; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSound; import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.sound.PlaySoundEvent17; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; public class ModEventHandlerClient { diff --git a/com/hbm/main/NEIConfig.java b/com/hbm/main/NEIConfig.java index 1004fd97b..0348f3112 100644 --- a/com/hbm/main/NEIConfig.java +++ b/com/hbm/main/NEIConfig.java @@ -9,7 +9,6 @@ import com.hbm.handler.CyclotronRecipeHandler; import com.hbm.handler.ReactorRecipeHandler; import com.hbm.handler.RefineryRecipeHandler; import com.hbm.handler.ShredderRecipeHandler; -import com.hbm.inventory.gui.GUITestDiFurnace; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; diff --git a/com/hbm/packet/LoopedSoundPacket.java b/com/hbm/packet/LoopedSoundPacket.java index a6203e3d3..93dc0f594 100644 --- a/com/hbm/packet/LoopedSoundPacket.java +++ b/com/hbm/packet/LoopedSoundPacket.java @@ -1,14 +1,7 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - import com.hbm.sound.SoundLoopMiner; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEAssemblerPacket.java b/com/hbm/packet/TEAssemblerPacket.java index a599f5b39..63dfb6d36 100644 --- a/com/hbm/packet/TEAssemblerPacket.java +++ b/com/hbm/packet/TEAssemblerPacket.java @@ -1,13 +1,6 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEDrillPacket.java b/com/hbm/packet/TEDrillPacket.java index 6506f1ed7..0a6baafe8 100644 --- a/com/hbm/packet/TEDrillPacket.java +++ b/com/hbm/packet/TEDrillPacket.java @@ -1,12 +1,6 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEDrillSoundPacket.java b/com/hbm/packet/TEDrillSoundPacket.java index 5a27df7b4..41be4da03 100644 --- a/com/hbm/packet/TEDrillSoundPacket.java +++ b/com/hbm/packet/TEDrillSoundPacket.java @@ -1,12 +1,6 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEFluidPacket.java b/com/hbm/packet/TEFluidPacket.java index eab5d07dc..4aa70a3a1 100644 --- a/com/hbm/packet/TEFluidPacket.java +++ b/com/hbm/packet/TEFluidPacket.java @@ -1,16 +1,8 @@ package com.hbm.packet; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; - import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidContainer; -import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineMiningDrill; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEFluidPipePacket.java b/com/hbm/packet/TEFluidPipePacket.java index 714821e80..1103739ae 100644 --- a/com/hbm/packet/TEFluidPipePacket.java +++ b/com/hbm/packet/TEFluidPipePacket.java @@ -1,19 +1,12 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.tileentity.TileEntityFluidDuct; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; public class TEFluidPipePacket implements IMessage { diff --git a/com/hbm/packet/TEIGeneratorPacket.java b/com/hbm/packet/TEIGeneratorPacket.java index 86fb32259..28e88ef57 100644 --- a/com/hbm/packet/TEIGeneratorPacket.java +++ b/com/hbm/packet/TEIGeneratorPacket.java @@ -1,11 +1,6 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEMissilePacket.java b/com/hbm/packet/TEMissilePacket.java index 162acb692..4f9a839df 100644 --- a/com/hbm/packet/TEMissilePacket.java +++ b/com/hbm/packet/TEMissilePacket.java @@ -1,12 +1,6 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - import com.hbm.tileentity.TileEntityLaunchPad; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityPylonRedWire; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/com/hbm/packet/TEPylonDestructorPacket.java b/com/hbm/packet/TEPylonDestructorPacket.java index 861285890..3429d3e48 100644 --- a/com/hbm/packet/TEPylonDestructorPacket.java +++ b/com/hbm/packet/TEPylonDestructorPacket.java @@ -1,8 +1,5 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - import com.hbm.tileentity.TileEntityPylonRedWire; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TEPylonSenderPacket.java b/com/hbm/packet/TEPylonSenderPacket.java index bde0c624f..4304f15ca 100644 --- a/com/hbm/packet/TEPylonSenderPacket.java +++ b/com/hbm/packet/TEPylonSenderPacket.java @@ -1,8 +1,5 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - import com.hbm.tileentity.TileEntityPylonRedWire; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/packet/TEStructurePacket.java b/com/hbm/packet/TEStructurePacket.java index 5a2bf48ab..f3d11429b 100644 --- a/com/hbm/packet/TEStructurePacket.java +++ b/com/hbm/packet/TEStructurePacket.java @@ -1,10 +1,5 @@ package com.hbm.packet; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityPylonRedWire; import com.hbm.tileentity.TileEntityStructureMarker; import cpw.mods.fml.common.network.simpleimpl.IMessage; diff --git a/com/hbm/render/entity/BSmokeRenderer.java b/com/hbm/render/entity/BSmokeRenderer.java index 34488e666..036f32d13 100644 --- a/com/hbm/render/entity/BSmokeRenderer.java +++ b/com/hbm/render/entity/BSmokeRenderer.java @@ -1,41 +1,17 @@ package com.hbm.render.entity; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.Callable; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.hbm.entity.particle.EntityBSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; public class BSmokeRenderer extends Render { private Item field_94151_a; @@ -59,6 +35,7 @@ public class BSmokeRenderer extends Render { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { if (p_76986_1_ instanceof EntityBSmokeFX) { @@ -118,6 +95,7 @@ public class BSmokeRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -134,10 +112,10 @@ public class BSmokeRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/entity/DSmokeRenderer.java b/com/hbm/render/entity/DSmokeRenderer.java index 3bfa628df..51ae9e323 100644 --- a/com/hbm/render/entity/DSmokeRenderer.java +++ b/com/hbm/render/entity/DSmokeRenderer.java @@ -1,40 +1,17 @@ package com.hbm.render.entity; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.Callable; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.hbm.entity.particle.EntityDSmokeFX; import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; public class DSmokeRenderer extends Render { private Item field_94151_a; @@ -50,6 +27,7 @@ public class DSmokeRenderer extends Render { this(p_i1260_1_, 0); } + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { @@ -113,6 +91,7 @@ public class DSmokeRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -129,10 +108,10 @@ public class DSmokeRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/entity/ElectricityRenderer.java b/com/hbm/render/entity/ElectricityRenderer.java index b5d3ca856..0c719e297 100644 --- a/com/hbm/render/entity/ElectricityRenderer.java +++ b/com/hbm/render/entity/ElectricityRenderer.java @@ -3,9 +3,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.hbm.entity.particle.EntityBSmokeFX; -import com.hbm.items.ModItems; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; @@ -36,6 +33,7 @@ public class ElectricityRenderer extends Render { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { IIcon iicon = field_94151_a.getIconFromDamage(0); @@ -59,6 +57,7 @@ public class ElectricityRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -75,10 +74,10 @@ public class ElectricityRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/entity/GasFlameRenderer.java b/com/hbm/render/entity/GasFlameRenderer.java index ed4a75a2f..bddef0290 100644 --- a/com/hbm/render/entity/GasFlameRenderer.java +++ b/com/hbm/render/entity/GasFlameRenderer.java @@ -3,9 +3,7 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.hbm.entity.particle.EntityGasFX; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.entity.particle.EntityOilSpillFX; import com.hbm.items.ModItems; import net.minecraft.client.renderer.Tessellator; @@ -38,6 +36,7 @@ public class GasFlameRenderer extends Render { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { if (p_76986_1_ instanceof EntityGasFlameFX) { @@ -100,6 +99,7 @@ public class GasFlameRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -116,10 +116,10 @@ public class GasFlameRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/entity/GasRenderer.java b/com/hbm/render/entity/GasRenderer.java index eb8e423c6..e476a781f 100644 --- a/com/hbm/render/entity/GasRenderer.java +++ b/com/hbm/render/entity/GasRenderer.java @@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.hbm.entity.particle.EntityGasFX; -import com.hbm.entity.particle.EntityOilSpillFX; import com.hbm.items.ModItems; import net.minecraft.client.renderer.Tessellator; @@ -37,6 +36,7 @@ public class GasRenderer extends Render { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { if (p_76986_1_ instanceof EntityGasFX) { @@ -99,6 +99,7 @@ public class GasRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -115,10 +116,10 @@ public class GasRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/entity/ModEffectRenderer.java b/com/hbm/render/entity/ModEffectRenderer.java index d87863277..df3e5f5d9 100644 --- a/com/hbm/render/entity/ModEffectRenderer.java +++ b/com/hbm/render/entity/ModEffectRenderer.java @@ -1,40 +1,17 @@ package com.hbm.render.entity; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.Callable; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; public class ModEffectRenderer extends Render { private Item field_94151_a; @@ -58,6 +35,7 @@ public class ModEffectRenderer extends Render { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { if (p_76986_1_ instanceof EntitySmokeFX) { @@ -117,6 +95,7 @@ public class ModEffectRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -133,10 +112,10 @@ public class ModEffectRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/entity/RenderBaleflare.java b/com/hbm/render/entity/RenderBaleflare.java index adb946c4f..0f5ae28ba 100644 --- a/com/hbm/render/entity/RenderBaleflare.java +++ b/com/hbm/render/entity/RenderBaleflare.java @@ -4,8 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelBaleflare; -import com.hbm.render.model.ModelMiniNuke; - import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/entity/RenderBeam.java b/com/hbm/render/entity/RenderBeam.java index 7a4911906..39fcce24e 100644 --- a/com/hbm/render/entity/RenderBeam.java +++ b/com/hbm/render/entity/RenderBeam.java @@ -4,13 +4,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityPlasmaBeam; -import com.hbm.entity.projectile.EntityRainbow; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBullet; -import com.hbm.render.model.ModelMiniNuke; - -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/entity/RenderBeam2.java b/com/hbm/render/entity/RenderBeam2.java index af53d34fc..d7175604a 100644 --- a/com/hbm/render/entity/RenderBeam2.java +++ b/com/hbm/render/entity/RenderBeam2.java @@ -4,13 +4,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityPlasmaBeam; -import com.hbm.entity.projectile.EntityRainbow; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBullet; -import com.hbm.render.model.ModelMiniNuke; - -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/entity/RenderBeam3.java b/com/hbm/render/entity/RenderBeam3.java index ea5559a55..46899f38f 100644 --- a/com/hbm/render/entity/RenderBeam3.java +++ b/com/hbm/render/entity/RenderBeam3.java @@ -4,13 +4,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityPlasmaBeam; -import com.hbm.entity.projectile.EntityRainbow; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBullet; -import com.hbm.render.model.ModelMiniNuke; - -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/entity/RenderBeam4.java b/com/hbm/render/entity/RenderBeam4.java index 09a32c771..96e29b5f9 100644 --- a/com/hbm/render/entity/RenderBeam4.java +++ b/com/hbm/render/entity/RenderBeam4.java @@ -4,13 +4,7 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityPlasmaBeam; -import com.hbm.entity.projectile.EntityRainbow; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelBullet; -import com.hbm.render.model.ModelMiniNuke; - -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; diff --git a/com/hbm/render/entity/RenderBigNuke.java b/com/hbm/render/entity/RenderBigNuke.java index 01ed58354..c07e0a468 100644 --- a/com/hbm/render/entity/RenderBigNuke.java +++ b/com/hbm/render/entity/RenderBigNuke.java @@ -5,7 +5,6 @@ import java.util.Random; import org.lwjgl.opengl.GL11; import com.hbm.entity.effect.EntityNukeCloudBig; -import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.lib.RefStrings; import net.minecraft.client.renderer.RenderHelper; diff --git a/com/hbm/render/entity/RenderChopperMine.java b/com/hbm/render/entity/RenderChopperMine.java index 2291eb90a..5adf88792 100644 --- a/com/hbm/render/entity/RenderChopperMine.java +++ b/com/hbm/render/entity/RenderChopperMine.java @@ -2,7 +2,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelChopperMine; diff --git a/com/hbm/render/entity/RenderCloudFleija.java b/com/hbm/render/entity/RenderCloudFleija.java index d200a13a1..9e0d6e90d 100644 --- a/com/hbm/render/entity/RenderCloudFleija.java +++ b/com/hbm/render/entity/RenderCloudFleija.java @@ -1,15 +1,10 @@ package com.hbm.render.entity; -import java.util.Random; - import org.lwjgl.opengl.GL11; import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.effect.EntityNukeCloudBig; import com.hbm.lib.RefStrings; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/entity/RenderCyberCrab.java b/com/hbm/render/entity/RenderCyberCrab.java index 75f07eede..549d006c7 100644 --- a/com/hbm/render/entity/RenderCyberCrab.java +++ b/com/hbm/render/entity/RenderCyberCrab.java @@ -1,19 +1,9 @@ package com.hbm.render.entity; -import org.lwjgl.opengl.GL11; - -import com.hbm.entity.mob.EntityHunterChopper; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelCrab; -import com.hbm.render.model.ModelHunterChopper; -import com.hbm.render.model.ProtoCopter; - -import net.minecraft.client.model.ModelSpider; -import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; -import net.minecraft.entity.boss.BossStatus; import net.minecraft.util.ResourceLocation; public class RenderCyberCrab extends RenderLiving { diff --git a/com/hbm/render/entity/RenderEMPBlast.java b/com/hbm/render/entity/RenderEMPBlast.java index 474ad43d5..fdced4e27 100644 --- a/com/hbm/render/entity/RenderEMPBlast.java +++ b/com/hbm/render/entity/RenderEMPBlast.java @@ -1,23 +1,11 @@ package com.hbm.render.entity; -import java.util.Random; - import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import com.hbm.entity.effect.EntityEMPBlast; -import com.hbm.entity.effect.EntityNukeCloudNoShroom; -import com.hbm.entity.particle.EntityBSmokeFX; -import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; diff --git a/com/hbm/render/entity/RenderEmpty.java b/com/hbm/render/entity/RenderEmpty.java index 6fcf27124..428d80d14 100644 --- a/com/hbm/render/entity/RenderEmpty.java +++ b/com/hbm/render/entity/RenderEmpty.java @@ -1,50 +1,19 @@ package com.hbm.render.entity; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.Callable; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import com.hbm.entity.particle.EntityBSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; -import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ActiveRenderInfo; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; -import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; -import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; public class RenderEmpty extends Render { public RenderEmpty() {} + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { } + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return null; } diff --git a/com/hbm/render/entity/RenderFallout.java b/com/hbm/render/entity/RenderFallout.java index 1ea6e063a..b215eac70 100644 --- a/com/hbm/render/entity/RenderFallout.java +++ b/com/hbm/render/entity/RenderFallout.java @@ -16,7 +16,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Timer; import net.minecraft.util.Vec3; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.client.IRenderHandler; @@ -91,8 +90,8 @@ public class RenderFallout extends Render { for (int i = 0; i < 32; ++i) { for (int j = 0; j < 32; ++j) { - float f2 = (float) (j - 16); - float f3 = (float) (i - 16); + float f2 = j - 16; + float f3 = i - 16; float f4 = MathHelper.sqrt_float(f2 * f2 + f3 * f3); this.rainXCoords[i << 5 | j] = -f3 / f4; this.rainYCoords[i << 5 | j] = f2 / f4; @@ -112,11 +111,11 @@ public class RenderFallout extends Render { OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); double d0 = entitylivingbase.lastTickPosX - + (entitylivingbase.posX - entitylivingbase.lastTickPosX) * (double) p_78474_1_; + + (entitylivingbase.posX - entitylivingbase.lastTickPosX) * p_78474_1_; double d1 = entitylivingbase.lastTickPosY - + (entitylivingbase.posY - entitylivingbase.lastTickPosY) * (double) p_78474_1_; + + (entitylivingbase.posY - entitylivingbase.lastTickPosY) * p_78474_1_; double d2 = entitylivingbase.lastTickPosZ - + (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * (double) p_78474_1_; + + (entitylivingbase.posZ - entitylivingbase.lastTickPosZ) * p_78474_1_; int k = MathHelper.floor_double(d1); byte b0 = 5; @@ -126,7 +125,7 @@ public class RenderFallout extends Render { boolean flag = false; byte b1 = -1; - float f5 = (float) this.rendererUpdateCount + p_78474_1_; + float f5 = this.rendererUpdateCount + p_78474_1_; if (this.mc.gameSettings.fancyGraphics) { b0 = 10; @@ -163,7 +162,7 @@ public class RenderFallout extends Render { } if (l1 != i2) { - this.random.setSeed((long) (i1 * i1 * 3121 + i1 * 45238971 ^ l * l * 418711 + l * 13761)); + this.random.setSeed(i1 * i1 * 3121 + i1 * 45238971 ^ l * l * 418711 + l * 13761); float f9 = biomegenbase.getFloatTemperature(i1, l1, l); float f10; double d4; @@ -218,33 +217,33 @@ public class RenderFallout extends Render { } b1 = 1; - this.mc.getTextureManager().bindTexture(this.falloutTexture); + this.mc.getTextureManager().bindTexture(RenderFallout.falloutTexture); tessellator.startDrawingQuads(); } - f10 = ((float) (this.rendererUpdateCount & 511) + p_78474_1_) / 512.0F; + f10 = ((this.rendererUpdateCount & 511) + p_78474_1_) / 512.0F; float f16 = this.random.nextFloat() + f5 * 0.01F * (float) this.random.nextGaussian(); float f11 = this.random.nextFloat() + f5 * (float) this.random.nextGaussian() * 0.001F; - d4 = (double) ((float) i1 + 0.5F) - entitylivingbase.posX; - double d5 = (double) ((float) l + 0.5F) - entitylivingbase.posZ; - float f14 = MathHelper.sqrt_double(d4 * d4 + d5 * d5) / (float) b0; + d4 = i1 + 0.5F - entitylivingbase.posX; + double d5 = l + 0.5F - entitylivingbase.posZ; + float f14 = MathHelper.sqrt_double(d4 * d4 + d5 * d5) / b0; float f15 = 1.0F; tessellator.setBrightness( (worldclient.getLightBrightnessForSkyBlocks(i1, j2, l, 0) * 3 + 15728880) / 4); tessellator.setColorRGBA_F(f15, f15, f15, ((1.0F - f14 * f14) * 0.3F + 0.5F) * f1); tessellator.setTranslation(-d0 * 1.0D, -d1 * 1.0D, -d2 * 1.0D); - tessellator.addVertexWithUV((double) ((float) i1 - f6) + 0.5D, (double) l1, - (double) ((float) l - f7) + 0.5D, (double) (0.0F * f8 + f16), - (double) ((float) l1 * f8 / 4.0F + f10 * f8 + f11)); - tessellator.addVertexWithUV((double) ((float) i1 + f6) + 0.5D, (double) l1, - (double) ((float) l + f7) + 0.5D, (double) (1.0F * f8 + f16), - (double) ((float) l1 * f8 / 4.0F + f10 * f8 + f11)); - tessellator.addVertexWithUV((double) ((float) i1 + f6) + 0.5D, (double) i2, - (double) ((float) l + f7) + 0.5D, (double) (1.0F * f8 + f16), - (double) ((float) i2 * f8 / 4.0F + f10 * f8 + f11)); - tessellator.addVertexWithUV((double) ((float) i1 - f6) + 0.5D, (double) i2, - (double) ((float) l - f7) + 0.5D, (double) (0.0F * f8 + f16), - (double) ((float) i2 * f8 / 4.0F + f10 * f8 + f11)); + tessellator.addVertexWithUV(i1 - f6 + 0.5D, l1, + l - f7 + 0.5D, 0.0F * f8 + f16, + l1 * f8 / 4.0F + f10 * f8 + f11); + tessellator.addVertexWithUV(i1 + f6 + 0.5D, l1, + l + f7 + 0.5D, 1.0F * f8 + f16, + l1 * f8 / 4.0F + f10 * f8 + f11); + tessellator.addVertexWithUV(i1 + f6 + 0.5D, i2, + l + f7 + 0.5D, 1.0F * f8 + f16, + i2 * f8 / 4.0F + f10 * f8 + f11); + tessellator.addVertexWithUV(i1 - f6 + 0.5D, i2, + l - f7 + 0.5D, 0.0F * f8 + f16, + i2 * f8 / 4.0F + f10 * f8 + f11); tessellator.setTranslation(0.0D, 0.0D, 0.0D); } } diff --git a/com/hbm/render/entity/RenderFireball.java b/com/hbm/render/entity/RenderFireball.java index 466c293ca..25b01eb73 100644 --- a/com/hbm/render/entity/RenderFireball.java +++ b/com/hbm/render/entity/RenderFireball.java @@ -3,7 +3,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.entity.projectile.EntityFire; import com.hbm.items.ModItems; @@ -37,7 +36,8 @@ public class RenderFireball extends Render { * (Render> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; - float f3 = (((float)(i >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; - float f4 = (((float)(i >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; + float f2 = (((i >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; + float f3 = (((i >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; + float f4 = (((i >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; GL11.glTranslatef(f2, f3, f4); - double d3 = p_76986_1_.lastTickPosX + (p_76986_1_.posX - p_76986_1_.lastTickPosX) * (double)p_76986_9_; - double d4 = p_76986_1_.lastTickPosY + (p_76986_1_.posY - p_76986_1_.lastTickPosY) * (double)p_76986_9_; - double d5 = p_76986_1_.lastTickPosZ + (p_76986_1_.posZ - p_76986_1_.lastTickPosZ) * (double)p_76986_9_; + double d3 = p_76986_1_.lastTickPosX + (p_76986_1_.posX - p_76986_1_.lastTickPosX) * p_76986_9_; + double d4 = p_76986_1_.lastTickPosY + (p_76986_1_.posY - p_76986_1_.lastTickPosY) * p_76986_9_; + double d5 = p_76986_1_.lastTickPosZ + (p_76986_1_.posZ - p_76986_1_.lastTickPosZ) * p_76986_9_; double d6 = 0.30000001192092896D; Vec3 vec3 = p_76986_1_.func_70489_a(d3, d4, d5); float f5 = p_76986_1_.prevRotationPitch + (p_76986_1_.rotationPitch - p_76986_1_.prevRotationPitch) * p_76986_9_; @@ -86,7 +82,7 @@ public class RenderMinecartTest extends RenderMinecart // GL11.glRotatef(-f5, 0.0F, 0.0F, 1.0F); - float f7 = (float)p_76986_1_.getRollingAmplitude() - p_76986_9_; + float f7 = p_76986_1_.getRollingAmplitude() - p_76986_9_; float f8 = p_76986_1_.getDamage() - p_76986_9_; if (f8 < 0.0F) @@ -96,7 +92,7 @@ public class RenderMinecartTest extends RenderMinecart if (f7 > 0.0F) { - GL11.glRotatef(MathHelper.sin(f7) * f7 * f8 / 10.0F * (float)p_76986_1_.getRollingDirection(), 1.0F, 0.0F, 0.0F); + GL11.glRotatef(MathHelper.sin(f7) * f7 * f8 / 10.0F * p_76986_1_.getRollingDirection(), 1.0F, 0.0F, 0.0F); } int k = p_76986_1_.getDisplayTileOffset(); @@ -109,7 +105,7 @@ public class RenderMinecartTest extends RenderMinecart this.bindTexture(TextureMap.locationBlocksTexture); float f6 = 0.75F; GL11.glScalef(f6, f6, f6); - GL11.glTranslatef(0.0F, (float)k / 16.0F, 0.0F); + GL11.glTranslatef(0.0F, k / 16.0F, 0.0F); this.func_147910_a(p_76986_1_, p_76986_9_, block, j); GL11.glPopMatrix(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); @@ -125,9 +121,9 @@ public class RenderMinecartTest extends RenderMinecart { int j = p_147910_1_.func_94104_d(); - if (j > -1 && (float)j - p_147910_2_ + 1.0F < 10.0F) + if (j > -1 && j - p_147910_2_ + 1.0F < 10.0F) { - float f1 = 1.0F - ((float)j - p_147910_2_ + 1.0F) / 10.0F; + float f1 = 1.0F - (j - p_147910_2_ + 1.0F) / 10.0F; if (f1 < 0.0F) { @@ -158,7 +154,7 @@ public class RenderMinecartTest extends RenderMinecart GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); - GL11.glColor4f(1.0F, 1.0F, 1.0F, (1.0F - ((float)j - p_147910_2_ + 1.0F) / 100.0F) * 0.8F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, (1.0F - (j - p_147910_2_ + 1.0F) / 100.0F) * 0.8F); GL11.glPushMatrix(); //this.field_94145_f.renderBlockAsItem(ModBlocks.crate, 0, 1.0F); bindTexture(boyTexture); @@ -171,7 +167,8 @@ public class RenderMinecartTest extends RenderMinecart } } - protected void func_147910_a(EntityMinecart p_147910_1_, float p_147910_2_, Block p_147910_3_, int p_147910_4_) + @Override + protected void func_147910_a(EntityMinecart p_147910_1_, float p_147910_2_, Block p_147910_3_, int p_147910_4_) { this.func_147910_a((EntityMinecartTest)p_147910_1_, p_147910_2_, p_147910_3_, p_147910_4_); } diff --git a/com/hbm/render/entity/RenderMiniMIRV.java b/com/hbm/render/entity/RenderMiniMIRV.java index d036fb8cf..eabbfc571 100644 --- a/com/hbm/render/entity/RenderMiniMIRV.java +++ b/com/hbm/render/entity/RenderMiniMIRV.java @@ -4,8 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelMIRV; -import com.hbm.render.model.ModelMiniNuke; - import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/entity/RenderMiniNuke.java b/com/hbm/render/entity/RenderMiniNuke.java index e1b4177ff..d189845a0 100644 --- a/com/hbm/render/entity/RenderMiniNuke.java +++ b/com/hbm/render/entity/RenderMiniNuke.java @@ -8,8 +8,6 @@ import com.hbm.render.model.ModelMiniNuke; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; public class RenderMiniNuke extends Render { diff --git a/com/hbm/render/entity/RenderMissileHuge.java b/com/hbm/render/entity/RenderMissileHuge.java index c9c101632..07f62191f 100644 --- a/com/hbm/render/entity/RenderMissileHuge.java +++ b/com/hbm/render/entity/RenderMissileHuge.java @@ -2,12 +2,8 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; -import com.hbm.entity.missile.EntityMissileBunkerBuster; import com.hbm.entity.missile.EntityMissileBurst; -import com.hbm.entity.missile.EntityMissileCluster; import com.hbm.entity.missile.EntityMissileDrill; -import com.hbm.entity.missile.EntityMissileGeneric; -import com.hbm.entity.missile.EntityMissileIncendiary; import com.hbm.entity.missile.EntityMissileInferno; import com.hbm.entity.missile.EntityMissileRain; import com.hbm.lib.RefStrings; diff --git a/com/hbm/render/entity/RenderOminousBullet.java b/com/hbm/render/entity/RenderOminousBullet.java index 75ae2e601..cab1e04bd 100644 --- a/com/hbm/render/entity/RenderOminousBullet.java +++ b/com/hbm/render/entity/RenderOminousBullet.java @@ -4,8 +4,6 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityRainbow; import com.hbm.lib.RefStrings; import net.minecraft.client.renderer.Tessellator; diff --git a/com/hbm/render/entity/RenderRainbow.java b/com/hbm/render/entity/RenderRainbow.java index 862588ef5..288ac3464 100644 --- a/com/hbm/render/entity/RenderRainbow.java +++ b/com/hbm/render/entity/RenderRainbow.java @@ -4,7 +4,6 @@ import java.util.Random; import org.lwjgl.opengl.GL11; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityRainbow; import com.hbm.lib.RefStrings; diff --git a/com/hbm/render/entity/RenderRocket.java b/com/hbm/render/entity/RenderRocket.java index 9484a8516..9999259d4 100644 --- a/com/hbm/render/entity/RenderRocket.java +++ b/com/hbm/render/entity/RenderRocket.java @@ -4,13 +4,11 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import com.hbm.entity.projectile.EntityBullet; -import com.hbm.entity.projectile.EntityRocket; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelBullet; diff --git a/com/hbm/render/entity/RenderRubble.java b/com/hbm/render/entity/RenderRubble.java index 7ca51514c..f68c3b03a 100644 --- a/com/hbm/render/entity/RenderRubble.java +++ b/com/hbm/render/entity/RenderRubble.java @@ -3,7 +3,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelChopperMine; import com.hbm.render.model.ModelRubble; import net.minecraft.client.renderer.entity.Render; diff --git a/com/hbm/render/entity/RenderShrapnel.java b/com/hbm/render/entity/RenderShrapnel.java index 4888ecda9..d7ab88bf4 100644 --- a/com/hbm/render/entity/RenderShrapnel.java +++ b/com/hbm/render/entity/RenderShrapnel.java @@ -3,8 +3,6 @@ package com.hbm.render.entity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelChopperMine; -import com.hbm.render.model.ModelRubble; import com.hbm.render.model.ModelShrapnel; import net.minecraft.client.renderer.entity.Render; diff --git a/com/hbm/render/entity/SSmokeRenderer.java b/com/hbm/render/entity/SSmokeRenderer.java index 982129ff7..780239f4c 100644 --- a/com/hbm/render/entity/SSmokeRenderer.java +++ b/com/hbm/render/entity/SSmokeRenderer.java @@ -1,41 +1,17 @@ package com.hbm.render.entity; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.Callable; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; public class SSmokeRenderer extends Render { private Item field_94151_a; @@ -59,6 +35,7 @@ public class SSmokeRenderer extends Render { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { if (p_76986_1_ instanceof EntitySSmokeFX) { @@ -121,6 +98,7 @@ public class SSmokeRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -137,10 +115,10 @@ public class SSmokeRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/entity/SpillRenderer.java b/com/hbm/render/entity/SpillRenderer.java index ddc875385..ea6ead92d 100644 --- a/com/hbm/render/entity/SpillRenderer.java +++ b/com/hbm/render/entity/SpillRenderer.java @@ -1,42 +1,17 @@ package com.hbm.render.entity; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.Callable; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import com.hbm.entity.particle.EntityOilSpillFX; -import com.hbm.entity.particle.EntitySSmokeFX; -import com.hbm.entity.particle.EntitySmokeFX; import com.hbm.items.ModItems; -import com.hbm.lib.RefStrings; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.crash.CrashReport; -import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.Entity; -import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.item.Item; -import net.minecraft.item.ItemPotion; -import net.minecraft.potion.PotionHelper; import net.minecraft.util.IIcon; -import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; public class SpillRenderer extends Render { private Item field_94151_a; @@ -60,6 +35,7 @@ public class SpillRenderer extends Render { * void func_76986_a(T entity, double d, double d1, double d2, float f, * float f1). But JAD is pre 1.5 so doesn't do that. */ + @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { if (p_76986_1_ instanceof EntityOilSpillFX) { @@ -122,6 +98,7 @@ public class SpillRenderer extends Render { * Returns the location of an entity's texture. Doesn't seem to be called * unless you call Render.bindEntityTexture. */ + @Override protected ResourceLocation getEntityTexture(Entity p_110775_1_) { return TextureMap.locationItemsTexture; } @@ -138,10 +115,10 @@ public class SpillRenderer extends Render { GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); p_77026_1_.startDrawingQuads(); p_77026_1_.setNormal(0.0F, 1.0F, 0.0F); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (0.0F - f6), 0.0D, (double) f, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (0.0F - f6), 0.0D, (double) f1, (double) f3); - p_77026_1_.addVertexWithUV((double) (f4 - f5), (double) (f4 - f6), 0.0D, (double) f1, (double) f2); - p_77026_1_.addVertexWithUV((double) (0.0F - f5), (double) (f4 - f6), 0.0D, (double) f, (double) f2); + p_77026_1_.addVertexWithUV(0.0F - f5, 0.0F - f6, 0.0D, f, f3); + p_77026_1_.addVertexWithUV(f4 - f5, 0.0F - f6, 0.0D, f1, f3); + p_77026_1_.addVertexWithUV(f4 - f5, f4 - f6, 0.0D, f1, f2); + p_77026_1_.addVertexWithUV(0.0F - f5, f4 - f6, 0.0D, f, f2); p_77026_1_.draw(); } } diff --git a/com/hbm/render/item/ItemRenderBFLauncher.java b/com/hbm/render/item/ItemRenderBFLauncher.java index 760dc55fc..05e376c94 100644 --- a/com/hbm/render/item/ItemRenderBFLauncher.java +++ b/com/hbm/render/item/ItemRenderBFLauncher.java @@ -4,15 +4,11 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelBFLauncher; -import com.hbm.render.model.ModelMIRVLauncher; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderBFLauncher implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderBaleflare.java b/com/hbm/render/item/ItemRenderBaleflare.java index 36efc1b06..b7ae76738 100644 --- a/com/hbm/render/item/ItemRenderBaleflare.java +++ b/com/hbm/render/item/ItemRenderBaleflare.java @@ -4,15 +4,11 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelBaleflare; -import com.hbm.render.model.ModelMIRV; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderBaleflare implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderCryolator.java b/com/hbm/render/item/ItemRenderCryolator.java index dbfda1bcf..99dded32d 100644 --- a/com/hbm/render/item/ItemRenderCryolator.java +++ b/com/hbm/render/item/ItemRenderCryolator.java @@ -4,15 +4,11 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelCryolator; -import com.hbm.render.model.ModelImmolator; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderCryolator implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderEMPRay.java b/com/hbm/render/item/ItemRenderEMPRay.java index f7ea7fd7d..eedb01b9d 100644 --- a/com/hbm/render/item/ItemRenderEMPRay.java +++ b/com/hbm/render/item/ItemRenderEMPRay.java @@ -12,8 +12,6 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderEMPRay implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderFatMan.java b/com/hbm/render/item/ItemRenderFatMan.java index d0f8d1c3e..16eb88f03 100644 --- a/com/hbm/render/item/ItemRenderFatMan.java +++ b/com/hbm/render/item/ItemRenderFatMan.java @@ -10,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderFatMan implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderImmolator.java b/com/hbm/render/item/ItemRenderImmolator.java index 2c32d8ed1..0ee101757 100644 --- a/com/hbm/render/item/ItemRenderImmolator.java +++ b/com/hbm/render/item/ItemRenderImmolator.java @@ -3,20 +3,12 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; -import com.hbm.render.model.ModelEMPRay; import com.hbm.render.model.ModelImmolator; -import com.hbm.render.model.ModelMP40; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderImmolator implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderMIRV.java b/com/hbm/render/item/ItemRenderMIRV.java index d3f416e1a..d59bc50b9 100644 --- a/com/hbm/render/item/ItemRenderMIRV.java +++ b/com/hbm/render/item/ItemRenderMIRV.java @@ -4,15 +4,11 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelMIRV; -import com.hbm.render.model.ModelMiniNuke; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderMIRV implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderMIRVLauncher.java b/com/hbm/render/item/ItemRenderMIRVLauncher.java index cbae1972c..c7b6bd88d 100644 --- a/com/hbm/render/item/ItemRenderMIRVLauncher.java +++ b/com/hbm/render/item/ItemRenderMIRVLauncher.java @@ -3,7 +3,6 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelFatman; import com.hbm.render.model.ModelMIRVLauncher; import net.minecraft.client.Minecraft; @@ -11,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderMIRVLauncher implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderMP.java b/com/hbm/render/item/ItemRenderMP.java index 18ec740d5..4a7a2f1b7 100644 --- a/com/hbm/render/item/ItemRenderMP.java +++ b/com/hbm/render/item/ItemRenderMP.java @@ -10,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderMP implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderMP40.java b/com/hbm/render/item/ItemRenderMP40.java index fa3253aca..8b0cdbce2 100644 --- a/com/hbm/render/item/ItemRenderMP40.java +++ b/com/hbm/render/item/ItemRenderMP40.java @@ -3,7 +3,6 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelMP40; import net.minecraft.client.Minecraft; @@ -11,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderMP40 implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderMiniNuke.java b/com/hbm/render/item/ItemRenderMiniNuke.java index 4d109cb8c..071fde3e9 100644 --- a/com/hbm/render/item/ItemRenderMiniNuke.java +++ b/com/hbm/render/item/ItemRenderMiniNuke.java @@ -10,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderMiniNuke implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderMultitool.java b/com/hbm/render/item/ItemRenderMultitool.java index 68c619592..18522789e 100644 --- a/com/hbm/render/item/ItemRenderMultitool.java +++ b/com/hbm/render/item/ItemRenderMultitool.java @@ -4,22 +4,16 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelMultitoolClaw; import com.hbm.render.model.ModelMultitoolFist; import com.hbm.render.model.ModelMultitoolOpen; import com.hbm.render.model.ModelMultitoolPointer; -import com.hbm.render.model.ModelUboinik; - import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderMultitool implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderOSIPR.java b/com/hbm/render/item/ItemRenderOSIPR.java index 6b4442a86..1e483928a 100644 --- a/com/hbm/render/item/ItemRenderOSIPR.java +++ b/com/hbm/render/item/ItemRenderOSIPR.java @@ -10,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderOSIPR implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderOverkill.java b/com/hbm/render/item/ItemRenderOverkill.java index 9998aafa4..16a9caa6b 100644 --- a/com/hbm/render/item/ItemRenderOverkill.java +++ b/com/hbm/render/item/ItemRenderOverkill.java @@ -4,21 +4,16 @@ import org.lwjgl.opengl.GL11; import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelDefabricator; import com.hbm.render.model.ModelEuthanasia; import com.hbm.render.model.ModelHP; import com.hbm.render.model.ModelJack; import com.hbm.render.model.ModelSpark; -import com.hbm.render.model.ModelUboinik; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderOverkill implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderRevolverInverted.java b/com/hbm/render/item/ItemRenderRevolverInverted.java index 57197ded5..210f64509 100644 --- a/com/hbm/render/item/ItemRenderRevolverInverted.java +++ b/com/hbm/render/item/ItemRenderRevolverInverted.java @@ -10,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderRevolverInverted implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderRevolverLead.java b/com/hbm/render/item/ItemRenderRevolverLead.java index b2a7e2e1d..d5b2fa5a0 100644 --- a/com/hbm/render/item/ItemRenderRevolverLead.java +++ b/com/hbm/render/item/ItemRenderRevolverLead.java @@ -10,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderRevolverLead implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderRevolverNightmare.java b/com/hbm/render/item/ItemRenderRevolverNightmare.java index 03a41421c..86e362976 100644 --- a/com/hbm/render/item/ItemRenderRevolverNightmare.java +++ b/com/hbm/render/item/ItemRenderRevolverNightmare.java @@ -6,16 +6,12 @@ import com.hbm.items.ModItems; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelNightmare; import com.hbm.render.model.ModelNightmare2; -import com.hbm.render.model.ModelRevolver; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderRevolverNightmare implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderUboinik.java b/com/hbm/render/item/ItemRenderUboinik.java index 3296bd785..fc62469db 100644 --- a/com/hbm/render/item/ItemRenderUboinik.java +++ b/com/hbm/render/item/ItemRenderUboinik.java @@ -3,7 +3,6 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelCryolator; import com.hbm.render.model.ModelUboinik; import net.minecraft.client.Minecraft; @@ -11,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderUboinik implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderXVL1456.java b/com/hbm/render/item/ItemRenderXVL1456.java index e194155e0..35c8e6192 100644 --- a/com/hbm/render/item/ItemRenderXVL1456.java +++ b/com/hbm/render/item/ItemRenderXVL1456.java @@ -2,7 +2,6 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; -import com.hbm.items.weapon.GunXVL1456; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelXVL1456; @@ -13,8 +12,6 @@ import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderXVL1456 implements IItemRenderer { diff --git a/com/hbm/render/item/ItemRenderZOMG.java b/com/hbm/render/item/ItemRenderZOMG.java index 6b8dc6d39..082d9317f 100644 --- a/com/hbm/render/item/ItemRenderZOMG.java +++ b/com/hbm/render/item/ItemRenderZOMG.java @@ -3,7 +3,6 @@ package com.hbm.render.item; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.main.MainRegistry; import com.hbm.render.model.ModelZOMG; import net.minecraft.client.Minecraft; @@ -11,8 +10,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.IItemRenderer.ItemRenderType; -import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; public class ItemRenderZOMG implements IItemRenderer { diff --git a/com/hbm/render/model/ModelAt4.java b/com/hbm/render/model/ModelAt4.java index a662a7a87..f2f15512f 100644 --- a/com/hbm/render/model/ModelAt4.java +++ b/com/hbm/render/model/ModelAt4.java @@ -89,7 +89,8 @@ public class ModelAt4 extends ModelBase setRotation(Shape9, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -124,7 +125,8 @@ public class ModelAt4 extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelBFLauncher.java b/com/hbm/render/model/ModelBFLauncher.java index fa56f60de..103f39f9c 100644 --- a/com/hbm/render/model/ModelBFLauncher.java +++ b/com/hbm/render/model/ModelBFLauncher.java @@ -203,6 +203,7 @@ public class ModelBFLauncher extends ModelBase { setRotation(Shape20, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -246,6 +247,7 @@ public class ModelBFLauncher extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelBaleflare.java b/com/hbm/render/model/ModelBaleflare.java index 3dce06925..1449240eb 100644 --- a/com/hbm/render/model/ModelBaleflare.java +++ b/com/hbm/render/model/ModelBaleflare.java @@ -75,6 +75,7 @@ public class ModelBaleflare extends ModelBase { setRotation(Shape7, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -105,6 +106,7 @@ public class ModelBaleflare extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelCloak.java b/com/hbm/render/model/ModelCloak.java index 8a9f38114..849688e2f 100644 --- a/com/hbm/render/model/ModelCloak.java +++ b/com/hbm/render/model/ModelCloak.java @@ -45,12 +45,12 @@ public class ModelCloak extends ModelBiped GL11.glPushMatrix(); GL11.glTranslatef(0.0F, 0.0F, 0.125F); - double d3 = player.field_71091_bM + (player.field_71094_bP - player.field_71091_bM) * (double)par7 - (player.prevPosX + (player.posX - player.prevPosX) * (double)par7); - double d4 = player.field_71096_bN + (player.field_71095_bQ - player.field_71096_bN) * (double)par7 - (player.prevPosY + (player.posY - player.prevPosY) * (double)par7); - double d0 = player.field_71097_bO + (player.field_71085_bR - player.field_71097_bO) * (double)par7 - (player.prevPosZ + (player.posZ - player.prevPosZ) * (double)par7); + double d3 = player.field_71091_bM + (player.field_71094_bP - player.field_71091_bM) * par7 - (player.prevPosX + (player.posX - player.prevPosX) * par7); + double d4 = player.field_71096_bN + (player.field_71095_bQ - player.field_71096_bN) * par7 - (player.prevPosY + (player.posY - player.prevPosY) * par7); + double d0 = player.field_71097_bO + (player.field_71085_bR - player.field_71097_bO) * par7 - (player.prevPosZ + (player.posZ - player.prevPosZ) * par7); float f4 = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * par7; - double d1 = (double)MathHelper.sin(f4 * (float)Math.PI / 180.0F); - double d2 = (double)(-MathHelper.cos(f4 * (float)Math.PI / 180.0F)); + double d1 = MathHelper.sin(f4 * (float)Math.PI / 180.0F); + double d2 = (-MathHelper.cos(f4 * (float)Math.PI / 180.0F)); float f5 = (float)d4 * 10.0F; if (f5 < -6.0F) diff --git a/com/hbm/render/model/ModelCrab.java b/com/hbm/render/model/ModelCrab.java index e2bb04720..dd460d7ab 100755 --- a/com/hbm/render/model/ModelCrab.java +++ b/com/hbm/render/model/ModelCrab.java @@ -151,6 +151,7 @@ public class ModelCrab extends ModelBase { GL11.glPopMatrix(); } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { modelcrabModel[10].rotateAngleY = 0.78539816F; diff --git a/com/hbm/render/model/ModelCryolator.java b/com/hbm/render/model/ModelCryolator.java index 7b2ef6f69..e73a18fca 100644 --- a/com/hbm/render/model/ModelCryolator.java +++ b/com/hbm/render/model/ModelCryolator.java @@ -343,6 +343,7 @@ public class ModelCryolator extends ModelBase { setRotation(ScaffoldBack, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -408,6 +409,7 @@ public class ModelCryolator extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelDefabricator.java b/com/hbm/render/model/ModelDefabricator.java index 9a4986496..a697ca62e 100755 --- a/com/hbm/render/model/ModelDefabricator.java +++ b/com/hbm/render/model/ModelDefabricator.java @@ -223,6 +223,7 @@ public class ModelDefabricator extends ModelBase } } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); diff --git a/com/hbm/render/model/ModelEMPRay.java b/com/hbm/render/model/ModelEMPRay.java index 9f98c5412..54f8d321f 100644 --- a/com/hbm/render/model/ModelEMPRay.java +++ b/com/hbm/render/model/ModelEMPRay.java @@ -384,7 +384,8 @@ public class ModelEMPRay extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelEuthanasia.java b/com/hbm/render/model/ModelEuthanasia.java index ab96fe23a..5d55bbabb 100644 --- a/com/hbm/render/model/ModelEuthanasia.java +++ b/com/hbm/render/model/ModelEuthanasia.java @@ -131,7 +131,8 @@ public class ModelEuthanasia extends ModelBase setRotation(Trigger, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -159,7 +160,8 @@ public class ModelEuthanasia extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelFatman.java b/com/hbm/render/model/ModelFatman.java index a40447b4d..049216d94 100644 --- a/com/hbm/render/model/ModelFatman.java +++ b/com/hbm/render/model/ModelFatman.java @@ -259,7 +259,8 @@ public class ModelFatman extends ModelBase setRotation(Shape33, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -311,7 +312,8 @@ public class ModelFatman extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelHP.java b/com/hbm/render/model/ModelHP.java index 3587d1c0e..c6ee40597 100644 --- a/com/hbm/render/model/ModelHP.java +++ b/com/hbm/render/model/ModelHP.java @@ -147,7 +147,8 @@ public class ModelHP extends ModelBase setRotation(BarrelPlate, 0F, 0F, 0.5235988F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -179,7 +180,8 @@ public class ModelHP extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelHunterChopper.java b/com/hbm/render/model/ModelHunterChopper.java index dcc30360f..5086d3e9e 100644 --- a/com/hbm/render/model/ModelHunterChopper.java +++ b/com/hbm/render/model/ModelHunterChopper.java @@ -6,7 +6,6 @@ package com.hbm.render.model; -import com.hbm.entity.mob.EntityHunterChopper; import com.hbm.main.MainRegistry; import net.minecraft.client.model.ModelBase; @@ -373,6 +372,7 @@ public class ModelHunterChopper extends ModelBase { setRotation(GunBack, 0F, MainRegistry.x, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -434,6 +434,7 @@ public class ModelHunterChopper extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelImmolator.java b/com/hbm/render/model/ModelImmolator.java index 0786e1e78..c94ca7deb 100644 --- a/com/hbm/render/model/ModelImmolator.java +++ b/com/hbm/render/model/ModelImmolator.java @@ -201,6 +201,7 @@ public class ModelImmolator extends ModelBase { setRotation(ValveBack, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -238,6 +239,7 @@ public class ModelImmolator extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelJack.java b/com/hbm/render/model/ModelJack.java index f133c4282..c0621d054 100644 --- a/com/hbm/render/model/ModelJack.java +++ b/com/hbm/render/model/ModelJack.java @@ -96,7 +96,8 @@ public class ModelJack extends ModelBase setRotation(StockPlate, 0F, 0F, 0.4014257F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -119,7 +120,8 @@ public class ModelJack extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMIRV.java b/com/hbm/render/model/ModelMIRV.java index fc9f287c6..69cbe99e5 100644 --- a/com/hbm/render/model/ModelMIRV.java +++ b/com/hbm/render/model/ModelMIRV.java @@ -66,7 +66,8 @@ public class ModelMIRV extends ModelBase GL11.glEnable(GL11.GL_CULL_FACE); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -85,7 +86,8 @@ public class ModelMIRV extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMIRVLauncher.java b/com/hbm/render/model/ModelMIRVLauncher.java index af232b5ae..6cdcdfa22 100644 --- a/com/hbm/render/model/ModelMIRVLauncher.java +++ b/com/hbm/render/model/ModelMIRVLauncher.java @@ -231,7 +231,8 @@ public class ModelMIRVLauncher extends ModelBase setRotation(Shape22, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -281,7 +282,8 @@ public class ModelMIRVLauncher extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMP.java b/com/hbm/render/model/ModelMP.java index c5b44d50f..b9c8c4ebf 100644 --- a/com/hbm/render/model/ModelMP.java +++ b/com/hbm/render/model/ModelMP.java @@ -194,6 +194,7 @@ public class ModelMP extends ModelBase { setRotation(Shape25, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); diff --git a/com/hbm/render/model/ModelMP40.java b/com/hbm/render/model/ModelMP40.java index d60c6c655..ccd31ff80 100644 --- a/com/hbm/render/model/ModelMP40.java +++ b/com/hbm/render/model/ModelMP40.java @@ -126,6 +126,7 @@ public class ModelMP40 extends ModelBase { setRotation(BarFront, 0F, 0F, 0.7853982F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -156,6 +157,7 @@ public class ModelMP40 extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMiniNuke.java b/com/hbm/render/model/ModelMiniNuke.java index 52b4a9b04..04deee6a8 100644 --- a/com/hbm/render/model/ModelMiniNuke.java +++ b/com/hbm/render/model/ModelMiniNuke.java @@ -82,7 +82,8 @@ public class ModelMiniNuke extends ModelBase setRotation(Shape8, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -115,7 +116,8 @@ public class ModelMiniNuke extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMultitoolClaw.java b/com/hbm/render/model/ModelMultitoolClaw.java index bb9f7267d..3f3aaef01 100644 --- a/com/hbm/render/model/ModelMultitoolClaw.java +++ b/com/hbm/render/model/ModelMultitoolClaw.java @@ -236,6 +236,7 @@ public class ModelMultitoolClaw extends ModelBase { setRotation(WireB, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -278,6 +279,7 @@ public class ModelMultitoolClaw extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMultitoolFist.java b/com/hbm/render/model/ModelMultitoolFist.java index bf917fecb..62410e8a3 100644 --- a/com/hbm/render/model/ModelMultitoolFist.java +++ b/com/hbm/render/model/ModelMultitoolFist.java @@ -236,6 +236,7 @@ public class ModelMultitoolFist extends ModelBase { setRotation(WireB, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -278,6 +279,7 @@ public class ModelMultitoolFist extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMultitoolOpen.java b/com/hbm/render/model/ModelMultitoolOpen.java index 291d41b70..a5a61728c 100644 --- a/com/hbm/render/model/ModelMultitoolOpen.java +++ b/com/hbm/render/model/ModelMultitoolOpen.java @@ -236,6 +236,7 @@ public class ModelMultitoolOpen extends ModelBase { setRotation(WireB, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -278,6 +279,7 @@ public class ModelMultitoolOpen extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelMultitoolPointer.java b/com/hbm/render/model/ModelMultitoolPointer.java index df2bd022e..309cb9187 100644 --- a/com/hbm/render/model/ModelMultitoolPointer.java +++ b/com/hbm/render/model/ModelMultitoolPointer.java @@ -236,6 +236,7 @@ public class ModelMultitoolPointer extends ModelBase { setRotation(WireB, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -278,6 +279,7 @@ public class ModelMultitoolPointer extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelNightmare.java b/com/hbm/render/model/ModelNightmare.java index f175a44ac..9edac0bb8 100644 --- a/com/hbm/render/model/ModelNightmare.java +++ b/com/hbm/render/model/ModelNightmare.java @@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ModelNightmare extends ModelBase { @@ -186,6 +185,7 @@ public class ModelNightmare extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelNightmare2.java b/com/hbm/render/model/ModelNightmare2.java index ab218f7b0..9b1732ec2 100644 --- a/com/hbm/render/model/ModelNightmare2.java +++ b/com/hbm/render/model/ModelNightmare2.java @@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; public class ModelNightmare2 extends ModelBase { @@ -234,6 +233,7 @@ public class ModelNightmare2 extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelOSIPR.java b/com/hbm/render/model/ModelOSIPR.java index 2e4989757..f63c32e50 100644 --- a/com/hbm/render/model/ModelOSIPR.java +++ b/com/hbm/render/model/ModelOSIPR.java @@ -180,6 +180,7 @@ public class ModelOSIPR extends ModelBase { setRotation(Shape23, 0F, 0F, 0.148353F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -240,6 +241,7 @@ public class ModelOSIPR extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelPylon.java b/com/hbm/render/model/ModelPylon.java index 8ca9dce7a..8f37b769a 100755 --- a/com/hbm/render/model/ModelPylon.java +++ b/com/hbm/render/model/ModelPylon.java @@ -66,6 +66,7 @@ public class ModelPylon extends ModelBase } } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); diff --git a/com/hbm/render/model/ModelRainbow.java b/com/hbm/render/model/ModelRainbow.java index d92a080cd..f9d1a6ed0 100644 --- a/com/hbm/render/model/ModelRainbow.java +++ b/com/hbm/render/model/ModelRainbow.java @@ -82,7 +82,8 @@ public class ModelRainbow extends ModelBase setRotation(Shape8, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -103,7 +104,8 @@ public class ModelRainbow extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelRubble.java b/com/hbm/render/model/ModelRubble.java index 07c4fccff..9b2c7b92c 100644 --- a/com/hbm/render/model/ModelRubble.java +++ b/com/hbm/render/model/ModelRubble.java @@ -89,6 +89,7 @@ public class ModelRubble extends ModelBase { setRotation(Shape10, 0F, 0F, -0.3490659F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -123,6 +124,7 @@ public class ModelRubble extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelSpark.java b/com/hbm/render/model/ModelSpark.java index 5e3fcb0a4..9125c0944 100644 --- a/com/hbm/render/model/ModelSpark.java +++ b/com/hbm/render/model/ModelSpark.java @@ -147,7 +147,8 @@ public class ModelSpark extends ModelBase setRotation(Handle2, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -179,7 +180,8 @@ public class ModelSpark extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelUboinik.java b/com/hbm/render/model/ModelUboinik.java index e1c03b94c..6dd05595b 100644 --- a/com/hbm/render/model/ModelUboinik.java +++ b/com/hbm/render/model/ModelUboinik.java @@ -217,6 +217,7 @@ public class ModelUboinik extends ModelBase { setRotation(StockBottom, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -262,6 +263,7 @@ public class ModelUboinik extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelXVL1456.java b/com/hbm/render/model/ModelXVL1456.java index 466fe9f9e..2d60edd3f 100644 --- a/com/hbm/render/model/ModelXVL1456.java +++ b/com/hbm/render/model/ModelXVL1456.java @@ -285,6 +285,7 @@ public class ModelXVL1456 extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ModelZOMG.java b/com/hbm/render/model/ModelZOMG.java index efdab04c5..9d338ad96 100644 --- a/com/hbm/render/model/ModelZOMG.java +++ b/com/hbm/render/model/ModelZOMG.java @@ -208,6 +208,7 @@ public class ModelZOMG extends ModelBase { setRotation(ScopePivot, 0F, 0F, 0F); } + @Override public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -246,6 +247,7 @@ public class ModelZOMG extends ModelBase { model.rotateAngleZ = z; } + @Override public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/model/ProtoCopter.java b/com/hbm/render/model/ProtoCopter.java index 3aacc44a8..e64b227e6 100644 --- a/com/hbm/render/model/ProtoCopter.java +++ b/com/hbm/render/model/ProtoCopter.java @@ -11,8 +11,6 @@ package com.hbm.render.model; -import com.hbm.main.MainRegistry; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -87,7 +85,8 @@ public class ProtoCopter extends ModelBase setRotation(Shape8, 0F, 0F, 0F); } - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + @Override +public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5, entity); @@ -108,7 +107,8 @@ public class ProtoCopter extends ModelBase model.rotateAngleZ = z; } - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) + @Override +public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); } diff --git a/com/hbm/render/tileentity/RenderAssembler.java b/com/hbm/render/tileentity/RenderAssembler.java index c0291387c..d95353c2c 100644 --- a/com/hbm/render/tileentity/RenderAssembler.java +++ b/com/hbm/render/tileentity/RenderAssembler.java @@ -4,9 +4,6 @@ import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; import com.hbm.tileentity.TileEntityMachineAssembler; -import com.hbm.tileentity.TileEntityMachineIGenerator; -import com.hbm.tileentity.TileEntityMachineMiningDrill; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/tileentity/RenderChemplant.java b/com/hbm/render/tileentity/RenderChemplant.java new file mode 100644 index 000000000..e09e1baf6 --- /dev/null +++ b/com/hbm/render/tileentity/RenderChemplant.java @@ -0,0 +1,93 @@ +package com.hbm.render.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.lib.RefStrings; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; + +public class RenderChemplant extends TileEntitySpecialRenderer { + + private static final ResourceLocation body = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/chemplant.obj"); + //private static final ResourceLocation bolt = new ResourceLocation(/*"/assets/" + */RefStrings.MODID, "models/assembler_wheel.obj"); + + private IModelCustom bodyModel; + private ResourceLocation bodyTexture; + //private IModelCustom boltModel; + //private ResourceLocation boltTexture; + + public RenderChemplant() + { + bodyModel = AdvancedModelLoader.loadModel(body); + bodyTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGenRotor.png"); + //boltModel = AdvancedModelLoader.loadModel(bolt); + //boltTexture = new ResourceLocation(RefStrings.MODID, "textures/models/textureIGenRotor.png"); + } + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) + { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5D, y, z + 0.5D); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + switch(tileEntity.getBlockMetadata()) + { + case 2: + GL11.glRotatef(180, 0F, 1F, 0F); + GL11.glTranslated(0.5D, 0.0D, -0.5D); break; + case 4: + GL11.glRotatef(270, 0F, 1F, 0F); + GL11.glTranslated(0.5D, 0.0D, -0.5D); break; + case 3: + GL11.glRotatef(0, 0F, 1F, 0F); + GL11.glTranslated(0.5D, 0.0D, -0.5D); break; + case 5: + GL11.glRotatef(90, 0F, 1F, 0F); + GL11.glTranslated(0.5D, 0.0D, -0.5D); break; + } + + bindTexture(bodyTexture); + + bodyModel.renderAll(); + + GL11.glPopMatrix(); + + renderTileEntityAt2(tileEntity, x, y, z, f); + } + + public void renderTileEntityAt2(TileEntity tileEntity, double x, double y, double z, float f) + { + /*GL11.glPushMatrix(); + GL11.glTranslated(x, y, z); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glRotatef(180, 0F, 1F, 0F); + switch(tileEntity.getBlockMetadata()) + { + case 2: + GL11.glTranslated(-1, 0, 0); + GL11.glRotatef(90, 0F, 1F, 0F); break; + case 4: + GL11.glRotatef(180, 0F, 1F, 0F); break; + case 3: + GL11.glTranslated(0, 0, -1); + GL11.glRotatef(270, 0F, 1F, 0F); break; + case 5: + GL11.glTranslated(-1, 0, -1); + GL11.glRotatef(0, 0F, 1F, 0F); break; + } + + + GL11.glRotatef(((TileEntityMachineAssembler)tileEntity).rotation, 0F, 1F, 0F); + + bindTexture(boltTexture); + boltModel.renderAll(); + + GL11.glPopMatrix();*/ + } +} diff --git a/com/hbm/render/tileentity/RenderFluidDuct.java b/com/hbm/render/tileentity/RenderFluidDuct.java index 547ea0a38..059485f04 100644 --- a/com/hbm/render/tileentity/RenderFluidDuct.java +++ b/com/hbm/render/tileentity/RenderFluidDuct.java @@ -3,11 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityCable; import com.hbm.tileentity.TileEntityFluidDuct; -import com.hbm.tileentity.TileEntityGasDuct; -import com.hbm.tileentity.TileEntityOilDuct; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderGasDuct.java b/com/hbm/render/tileentity/RenderGasDuct.java index f05f0e643..fd5a6b19f 100644 --- a/com/hbm/render/tileentity/RenderGasDuct.java +++ b/com/hbm/render/tileentity/RenderGasDuct.java @@ -3,10 +3,7 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityCable; import com.hbm.tileentity.TileEntityGasDuct; -import com.hbm.tileentity.TileEntityOilDuct; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/render/tileentity/RenderMiningDrill.java b/com/hbm/render/tileentity/RenderMiningDrill.java index bc22314dd..85a1482ca 100644 --- a/com/hbm/render/tileentity/RenderMiningDrill.java +++ b/com/hbm/render/tileentity/RenderMiningDrill.java @@ -3,7 +3,6 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityMachineIGenerator; import com.hbm.tileentity.TileEntityMachineMiningDrill; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/com/hbm/render/tileentity/RenderOilDuct.java b/com/hbm/render/tileentity/RenderOilDuct.java index bd94b5ccf..2db93e080 100644 --- a/com/hbm/render/tileentity/RenderOilDuct.java +++ b/com/hbm/render/tileentity/RenderOilDuct.java @@ -3,7 +3,6 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; import com.hbm.lib.RefStrings; -import com.hbm.tileentity.TileEntityCable; import com.hbm.tileentity.TileEntityOilDuct; import net.minecraft.client.renderer.Tessellator; diff --git a/com/hbm/render/tileentity/RenderPylon.java b/com/hbm/render/tileentity/RenderPylon.java index e72a26b7c..b52df1175 100644 --- a/com/hbm/render/tileentity/RenderPylon.java +++ b/com/hbm/render/tileentity/RenderPylon.java @@ -2,21 +2,12 @@ package com.hbm.render.tileentity; import org.lwjgl.opengl.GL11; -import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; import com.hbm.render.model.ModelPylon; -import com.hbm.render.model.ModelSteelBeam; -import com.hbm.render.model.ModelSteelCorner; -import com.hbm.render.model.ModelSteelRoof; -import com.hbm.render.model.ModelSteelScaffold; -import com.hbm.render.model.ModelSteelWall; import com.hbm.tileentity.TileEntityPylonRedWire; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityHanging; -import net.minecraft.entity.EntityLiving; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/render/tileentity/RenderStructureMaker.java b/com/hbm/render/tileentity/RenderStructureMaker.java index 3a60c0ffd..6d7af9dad 100644 --- a/com/hbm/render/tileentity/RenderStructureMaker.java +++ b/com/hbm/render/tileentity/RenderStructureMaker.java @@ -5,7 +5,6 @@ import org.lwjgl.opengl.GL14; import com.hbm.blocks.ModBlocks; import com.hbm.lib.RefStrings; -import com.hbm.render.model.ModelTapeRecorder; import com.hbm.tileentity.TileEntityStructureMarker; import com.hbm.world.FWatz; import com.hbm.world.FactoryTitanium; @@ -354,7 +353,7 @@ public class RenderStructureMaker extends TileEntitySpecialRenderer { public void renderSmolBlockAt(ResourceLocation loc1, ResourceLocation loc2, int x, int y, int z) { GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); + GL11.glTranslatef(x, y, z); GL11.glRotatef(180, 0F, 0F, 1F); Tessellator tesseract = Tessellator.instance; tesseract.startDrawingQuads(); diff --git a/com/hbm/sound/MovingSoundChopper.java b/com/hbm/sound/MovingSoundChopper.java index cfafb36c3..916189750 100644 --- a/com/hbm/sound/MovingSoundChopper.java +++ b/com/hbm/sound/MovingSoundChopper.java @@ -1,12 +1,7 @@ package com.hbm.sound; import com.hbm.entity.mob.EntityHunterChopper; -import com.hbm.items.ModItems; -import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound; - import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; public class MovingSoundChopper extends MovingSoundPlayerLoop { diff --git a/com/hbm/sound/MovingSoundChopperMine.java b/com/hbm/sound/MovingSoundChopperMine.java index 1c5d21526..065d10d13 100644 --- a/com/hbm/sound/MovingSoundChopperMine.java +++ b/com/hbm/sound/MovingSoundChopperMine.java @@ -1,8 +1,5 @@ package com.hbm.sound; -import com.hbm.entity.mob.EntityHunterChopper; -import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound; - import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/MovingSoundCrashing.java b/com/hbm/sound/MovingSoundCrashing.java index a56ba230f..b4533dff0 100644 --- a/com/hbm/sound/MovingSoundCrashing.java +++ b/com/hbm/sound/MovingSoundCrashing.java @@ -1,8 +1,6 @@ package com.hbm.sound; import com.hbm.entity.mob.EntityHunterChopper; -import com.hbm.sound.MovingSoundPlayerLoop.EnumHbmSound; - import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/sound/MovingSoundPlayerLoop.java b/com/hbm/sound/MovingSoundPlayerLoop.java index f73359121..23714debb 100644 --- a/com/hbm/sound/MovingSoundPlayerLoop.java +++ b/com/hbm/sound/MovingSoundPlayerLoop.java @@ -5,7 +5,6 @@ import java.util.List; import net.minecraft.client.audio.MovingSound; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; public abstract class MovingSoundPlayerLoop extends MovingSound { diff --git a/com/hbm/sound/MovingSoundXVL1456.java b/com/hbm/sound/MovingSoundXVL1456.java index 9944ba24a..304e123ef 100644 --- a/com/hbm/sound/MovingSoundXVL1456.java +++ b/com/hbm/sound/MovingSoundXVL1456.java @@ -2,10 +2,8 @@ package com.hbm.sound; import com.hbm.items.ModItems; -import net.minecraft.client.audio.MovingSound; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/com/hbm/threads/ThreadLaser.java b/com/hbm/threads/ThreadLaser.java index 19aed28ad..023d1cd79 100644 --- a/com/hbm/threads/ThreadLaser.java +++ b/com/hbm/threads/ThreadLaser.java @@ -1,9 +1,7 @@ package com.hbm.threads; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; public class ThreadLaser implements Runnable { @@ -63,7 +61,7 @@ public class ThreadLaser implements Runnable { try { age++; - thread.sleep(2000); + Thread.sleep(2000); } catch (InterruptedException e) { e.printStackTrace(); } diff --git a/com/hbm/tileentity/TileEntityCable.java b/com/hbm/tileentity/TileEntityCable.java index 10a746a70..c54e60c4c 100644 --- a/com/hbm/tileentity/TileEntityCable.java +++ b/com/hbm/tileentity/TileEntityCable.java @@ -11,7 +11,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import scala.Int; public class TileEntityCable extends TileEntity implements IConductor { @@ -23,6 +22,7 @@ public class TileEntityCable extends TileEntity implements IConductor { } + @Override public void updateEntity() { this.updateConnections(); } diff --git a/com/hbm/tileentity/TileEntityConverterHeRf.java b/com/hbm/tileentity/TileEntityConverterHeRf.java index e1af17051..da50c9d23 100644 --- a/com/hbm/tileentity/TileEntityConverterHeRf.java +++ b/com/hbm/tileentity/TileEntityConverterHeRf.java @@ -4,7 +4,6 @@ import com.hbm.calc.Location; import com.hbm.interfaces.IConsumer; import cofh.api.energy.EnergyStorage; -import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; import net.minecraft.tileentity.TileEntity; diff --git a/com/hbm/tileentity/TileEntityConverterRfHe.java b/com/hbm/tileentity/TileEntityConverterRfHe.java index 395290d90..623a09359 100644 --- a/com/hbm/tileentity/TileEntityConverterRfHe.java +++ b/com/hbm/tileentity/TileEntityConverterRfHe.java @@ -3,17 +3,12 @@ package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.lib.Library; import cofh.api.energy.EnergyStorage; -import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; -import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -107,6 +102,7 @@ public class TileEntityConverterRfHe extends TileEntity implements ISource, IEne ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityCoreAdvanced.java b/com/hbm/tileentity/TileEntityCoreAdvanced.java index ae2fc738a..ede3620b3 100644 --- a/com/hbm/tileentity/TileEntityCoreAdvanced.java +++ b/com/hbm/tileentity/TileEntityCoreAdvanced.java @@ -210,14 +210,17 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor return false; } + @Override public int getPowerScaled(int i) { return (power * i) / maxPower; } + @Override public int getProgressScaled(int i) { return (progress * i) / processTime; } + @Override public boolean isProcessable(ItemStack item) { if(item != null) { @@ -231,7 +234,7 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor public void updateEntity() { if(this.slots[22] != null && this.slots[22].getItem() == ModItems.factory_core_advanced) { - this.power = (int) ((ItemBattery)ModItems.factory_core_advanced).getCharge(slots[22]); + this.power = (int) ItemBattery.getCharge(slots[22]); } else { this.power = 0; } @@ -402,7 +405,7 @@ public class TileEntityCoreAdvanced extends TileEntity implements ISidedInventor this.progress = 0; } - if(this.progress >= this.processTime) + if(this.progress >= TileEntityCoreAdvanced.processTime) { if(this.slots[9] != null && isProcessable(this.slots[9])) { diff --git a/com/hbm/tileentity/TileEntityCoreTitanium.java b/com/hbm/tileentity/TileEntityCoreTitanium.java index 6ea84e011..faf467a96 100644 --- a/com/hbm/tileentity/TileEntityCoreTitanium.java +++ b/com/hbm/tileentity/TileEntityCoreTitanium.java @@ -7,7 +7,6 @@ import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; @@ -211,14 +210,17 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor return false; } + @Override public int getPowerScaled(int i) { return (power * i) / maxPower; } + @Override public int getProgressScaled(int i) { return (progress * i) / processTime; } + @Override public boolean isProcessable(ItemStack item) { if(item != null) { @@ -232,7 +234,7 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor public void updateEntity() { if(this.slots[22] != null && this.slots[22].getItem() == ModItems.factory_core_titanium) { - this.power = (int) ((ItemBattery)ModItems.factory_core_titanium).getCharge(slots[22]); + this.power = (int) ItemBattery.getCharge(slots[22]); } else { this.power = 0; } @@ -327,7 +329,7 @@ public class TileEntityCoreTitanium extends TileEntity implements ISidedInventor this.progress = 0; } - if(this.progress >= this.processTime) + if(this.progress >= TileEntityCoreTitanium.processTime) { if(this.slots[9] != null && isProcessable(this.slots[9])) { diff --git a/com/hbm/tileentity/TileEntityDummy.java b/com/hbm/tileentity/TileEntityDummy.java index 767c9d51d..2909bae38 100644 --- a/com/hbm/tileentity/TileEntityDummy.java +++ b/com/hbm/tileentity/TileEntityDummy.java @@ -1,11 +1,6 @@ package com.hbm.tileentity; -import com.hbm.interfaces.IBomb; import com.hbm.interfaces.IMultiblock; -import com.hbm.interfaces.ISource; - -import net.minecraft.block.BlockContainer; -import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -15,7 +10,8 @@ public class TileEntityDummy extends TileEntity { public int targetY; public int targetZ; - public void updateEntity() { + @Override + public void updateEntity() { if(!this.worldObj.isRemote) { if(!(this.worldObj.getBlock(targetX, targetY, targetZ) instanceof IMultiblock)) { worldObj.func_147480_a(xCoord, yCoord, zCoord, false); @@ -23,7 +19,8 @@ public class TileEntityDummy extends TileEntity { } } - public void readFromNBT(NBTTagCompound nbt) + @Override + public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); this.targetX = nbt.getInteger("tx"); @@ -31,7 +28,8 @@ public class TileEntityDummy extends TileEntity { this.targetZ = nbt.getInteger("tz"); } - public void writeToNBT(NBTTagCompound nbt) + @Override + public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); nbt.setInteger("tx", this.targetX); diff --git a/com/hbm/tileentity/TileEntityFWatzCore.java b/com/hbm/tileentity/TileEntityFWatzCore.java index 51db964fa..d2f3e68e6 100644 --- a/com/hbm/tileentity/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/TileEntityFWatzCore.java @@ -4,23 +4,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IReactor; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; -import com.hbm.items.special.WatzFuel; import com.hbm.lib.Library; -import com.hbm.main.MainRegistry; import com.hbm.world.FWatz; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -416,6 +407,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, ffgeua(this.xCoord, this.yCoord - 11, this.zCoord - 10, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityFluidDuct.java b/com/hbm/tileentity/TileEntityFluidDuct.java index daaf8894a..412dcf56e 100644 --- a/com/hbm/tileentity/TileEntityFluidDuct.java +++ b/com/hbm/tileentity/TileEntityFluidDuct.java @@ -1,17 +1,10 @@ package com.hbm.tileentity; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.calc.UnionOfTileEntitiesAndBooleansForGas; import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidDuct; -import com.hbm.interfaces.IGasDuct; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFluidPipePacket; -import com.hbm.packet.TEIGeneratorPacket; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.nbt.NBTTagCompound; @@ -29,6 +22,7 @@ public class TileEntityFluidDuct extends TileEntity implements IFluidDuct { } + @Override public void updateEntity() { if(!worldObj.isRemote) @@ -57,12 +51,14 @@ public class TileEntityFluidDuct extends TileEntity implements IFluidDuct { else connections[5] = null; } - public void readFromNBT(NBTTagCompound nbt) + @Override + public void readFromNBT(NBTTagCompound nbt) { this.type = FluidType.values()[nbt.getInteger("fluid")]; } - public void writeToNBT(NBTTagCompound nbt) + @Override + public void writeToNBT(NBTTagCompound nbt) { for(int i = 0; i < FluidType.values().length; i++) if(FluidType.values()[i] == this.type) diff --git a/com/hbm/tileentity/TileEntityFusionMultiblock.java b/com/hbm/tileentity/TileEntityFusionMultiblock.java index 1c89b298d..7e9fb16f6 100644 --- a/com/hbm/tileentity/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/TileEntityFusionMultiblock.java @@ -4,15 +4,12 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IReactor; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; import com.hbm.lib.Library; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -1259,6 +1256,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve ffgeua(this.xCoord, this.yCoord - 3, this.zCoord, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityGasDuct.java b/com/hbm/tileentity/TileEntityGasDuct.java index a78220d75..be23f9a52 100644 --- a/com/hbm/tileentity/TileEntityGasDuct.java +++ b/com/hbm/tileentity/TileEntityGasDuct.java @@ -4,10 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForGas; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IGasDuct; -import com.hbm.interfaces.IOilDuct; -import com.hbm.interfaces.IOilAcceptor; import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; @@ -25,6 +22,7 @@ public class TileEntityGasDuct extends TileEntity implements IGasDuct { } + @Override public void updateEntity() { this.updateConnections(); } diff --git a/com/hbm/tileentity/TileEntityGasDuctSolid.java b/com/hbm/tileentity/TileEntityGasDuctSolid.java index 0f078f8be..5b82052b2 100644 --- a/com/hbm/tileentity/TileEntityGasDuctSolid.java +++ b/com/hbm/tileentity/TileEntityGasDuctSolid.java @@ -4,10 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForGas; -import com.hbm.calc.UnionOfTileEntitiesAndBooleansForOil; import com.hbm.interfaces.IGasDuct; -import com.hbm.interfaces.IOilDuct; - import net.minecraft.tileentity.TileEntity; public class TileEntityGasDuctSolid extends TileEntity implements IGasDuct { diff --git a/com/hbm/tileentity/TileEntityHatch.java b/com/hbm/tileentity/TileEntityHatch.java index dfef7efd5..d48bae1be 100644 --- a/com/hbm/tileentity/TileEntityHatch.java +++ b/com/hbm/tileentity/TileEntityHatch.java @@ -27,12 +27,14 @@ public class TileEntityHatch extends TileEntity { } } + @Override public void readFromNBT(NBTTagCompound p_145839_1_) { this.x = p_145839_1_.getInteger("x1"); this.y = p_145839_1_.getInteger("y1"); this.z = p_145839_1_.getInteger("z1"); } + @Override public void writeToNBT(NBTTagCompound p_145841_1_) { p_145841_1_.setInteger("x1", this.x); p_145841_1_.setInteger("y1", this.y); diff --git a/com/hbm/tileentity/TileEntityLaunchPad.java b/com/hbm/tileentity/TileEntityLaunchPad.java index fe2dbe327..6d8ffe745 100644 --- a/com/hbm/tileentity/TileEntityLaunchPad.java +++ b/com/hbm/tileentity/TileEntityLaunchPad.java @@ -1,18 +1,14 @@ package com.hbm.tileentity; -import com.hbm.blocks.bomb.LaunchPad; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEFluidPipePacket; import com.hbm.packet.TEMissilePacket; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/tileentity/TileEntityMachineAssembler.java b/com/hbm/tileentity/TileEntityMachineAssembler.java index 91cc8902f..1961dea4d 100644 --- a/com/hbm/tileentity/TileEntityMachineAssembler.java +++ b/com/hbm/tileentity/TileEntityMachineAssembler.java @@ -3,7 +3,6 @@ package com.hbm.tileentity; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.IConsumer; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; @@ -12,14 +11,9 @@ import com.hbm.items.tool.ItemAssemblyTemplate; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEAssemblerPacket; -import com.hbm.packet.TEDrillPacket; -import com.hbm.packet.TEIGeneratorPacket; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; diff --git a/com/hbm/tileentity/TileEntityMachineBattery.java b/com/hbm/tileentity/TileEntityMachineBattery.java index 7e6b7e669..e87c06161 100644 --- a/com/hbm/tileentity/TileEntityMachineBattery.java +++ b/com/hbm/tileentity/TileEntityMachineBattery.java @@ -3,18 +3,12 @@ package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -399,6 +393,7 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityMachineChemplant.java b/com/hbm/tileentity/TileEntityMachineChemplant.java new file mode 100644 index 000000000..1fc5cecf0 --- /dev/null +++ b/com/hbm/tileentity/TileEntityMachineChemplant.java @@ -0,0 +1,7 @@ +package com.hbm.tileentity; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityMachineChemplant extends TileEntity { + +} diff --git a/com/hbm/tileentity/TileEntityMachineCoal.java b/com/hbm/tileentity/TileEntityMachineCoal.java index a3c628279..2d8cde9ba 100644 --- a/com/hbm/tileentity/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/TileEntityMachineCoal.java @@ -1,6 +1,5 @@ package com.hbm.tileentity; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -14,10 +13,7 @@ import net.minecraft.tileentity.TileEntity; import java.util.ArrayList; import java.util.List; -import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineCoal; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; @@ -270,7 +266,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory } if(slots[0] != null && slots[0].getItem() == ModItems.inf_water) { - this.water = this.maxWater; + this.water = TileEntityMachineCoal.maxWater; } //Battery Item @@ -381,6 +377,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityMachineCyclotron.java b/com/hbm/tileentity/TileEntityMachineCyclotron.java index bca3ae901..a261940bd 100644 --- a/com/hbm/tileentity/TileEntityMachineCyclotron.java +++ b/com/hbm/tileentity/TileEntityMachineCyclotron.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.entity.effect.EntityBlackHole; import com.hbm.entity.effect.EntityCloudFleija; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; @@ -13,21 +11,17 @@ import com.hbm.explosion.ExplosionChaos; import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionParticleB; import com.hbm.explosion.ExplosionThermo; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -568,6 +562,7 @@ public class TileEntityMachineCyclotron extends TileEntity implements ISidedInve ffgeua(this.xCoord, this.yCoord, this.zCoord - 2, getTact()); } + @Override public boolean getTact() { if (age >= 0 && age < 10) { return true; diff --git a/com/hbm/tileentity/TileEntityMachineDeuterium.java b/com/hbm/tileentity/TileEntityMachineDeuterium.java index 5c861a7f3..ab496f133 100644 --- a/com/hbm/tileentity/TileEntityMachineDeuterium.java +++ b/com/hbm/tileentity/TileEntityMachineDeuterium.java @@ -1,6 +1,5 @@ package com.hbm.tileentity; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; diff --git a/com/hbm/tileentity/TileEntityMachineDiesel.java b/com/hbm/tileentity/TileEntityMachineDiesel.java index c400677a8..a14855889 100644 --- a/com/hbm/tileentity/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/TileEntityMachineDiesel.java @@ -4,18 +4,14 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -363,6 +359,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); } + @Override public boolean getTact() { if (age >= 0 && age < 10) { return true; diff --git a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java index 358d8b1bf..5b54ff1da 100644 --- a/com/hbm/tileentity/TileEntityMachineElectricFurnace.java +++ b/com/hbm/tileentity/TileEntityMachineElectricFurnace.java @@ -1,15 +1,11 @@ package com.hbm.tileentity; import com.hbm.blocks.machine.MachineElectricFurnace; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; -import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/com/hbm/tileentity/TileEntityMachineGasFlare.java b/com/hbm/tileentity/TileEntityMachineGasFlare.java index b9446b377..cc6f40594 100644 --- a/com/hbm/tileentity/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/TileEntityMachineGasFlare.java @@ -4,15 +4,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityGasFX; import com.hbm.entity.particle.EntityGasFlameFX; -import com.hbm.explosion.ExplosionLarge; import com.hbm.explosion.ExplosionThermo; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IGasAcceptor; -import com.hbm.interfaces.IOilAcceptor; -import com.hbm.interfaces.IOilSource; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; @@ -20,16 +15,13 @@ import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.oredict.OreDictionary; public class TileEntityMachineGasFlare extends TileEntity implements ISidedInventory, ISource, IGasAcceptor { @@ -327,6 +319,6 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven @Override public int getMaxGasFill() { - return this.maxGas; + return TileEntityMachineGasFlare.maxGas; } } diff --git a/com/hbm/tileentity/TileEntityMachineGenerator.java b/com/hbm/tileentity/TileEntityMachineGenerator.java index e0aec9d60..aaa1c0aea 100644 --- a/com/hbm/tileentity/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/TileEntityMachineGenerator.java @@ -4,11 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineGenerator; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; @@ -16,7 +13,6 @@ import com.hbm.items.special.ItemBattery; import com.hbm.items.special.ItemFuelRod; import com.hbm.lib.Library; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -626,6 +622,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityMachineIGenerator.java b/com/hbm/tileentity/TileEntityMachineIGenerator.java index f48d61a5e..f5f957fb3 100644 --- a/com/hbm/tileentity/TileEntityMachineIGenerator.java +++ b/com/hbm/tileentity/TileEntityMachineIGenerator.java @@ -4,20 +4,14 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEIGeneratorPacket; -import com.hbm.packet.TEPylonSenderPacket; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -226,7 +220,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv if(age == 9 || age == 19) ffgeuaInit(); - rotation += ((float)(this.torque / 100F)); + rotation += (this.torque / 100F); if(burn > 0) { burn--; @@ -389,7 +383,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv } if (slots[13] != null && slots[13].getItem() == ModItems.inf_diesel) - this.fuel = this.maxFuel; + this.fuel = TileEntityMachineIGenerator.maxFuel; } public void doLubeTask() { @@ -475,7 +469,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv } if (slots[13] != null && slots[13].getItem() == ModItems.inf_water) - this.water = this.maxWater; + this.water = TileEntityMachineIGenerator.maxWater; } public void doSolidFuelTask() { @@ -609,6 +603,7 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv } } + @Override public boolean getTact() { if (age >= 0 && age < 10) { return true; diff --git a/com/hbm/tileentity/TileEntityMachineMiningDrill.java b/com/hbm/tileentity/TileEntityMachineMiningDrill.java index 336824b68..8fb1556d0 100644 --- a/com/hbm/tileentity/TileEntityMachineMiningDrill.java +++ b/com/hbm/tileentity/TileEntityMachineMiningDrill.java @@ -1,17 +1,9 @@ package com.hbm.tileentity; -import java.util.ArrayList; -import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.particle.EntityGasFX; -import com.hbm.explosion.ExplosionLarge; import com.hbm.interfaces.IConsumer; -import com.hbm.interfaces.IGasAcceptor; -import com.hbm.interfaces.IGasSource; -import com.hbm.interfaces.IOilAcceptor; -import com.hbm.interfaces.IOilSource; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; @@ -19,13 +11,11 @@ import com.hbm.packet.LoopedSoundPacket; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEDrillPacket; import com.hbm.packet.TEDrillSoundPacket; -import com.hbm.packet.TEIGeneratorPacket; import com.hbm.sound.SoundLoopMachine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; @@ -37,8 +27,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityHopper; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.oredict.OreDictionary; public class TileEntityMachineMiningDrill extends TileEntity implements ISidedInventory, IConsumer { diff --git a/com/hbm/tileentity/TileEntityMachineOilWell.java b/com/hbm/tileentity/TileEntityMachineOilWell.java index 2e398ad36..91f7f7e02 100644 --- a/com/hbm/tileentity/TileEntityMachineOilWell.java +++ b/com/hbm/tileentity/TileEntityMachineOilWell.java @@ -5,17 +5,13 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.machine.MachineElectricFurnace; import com.hbm.entity.particle.EntityGasFX; -import com.hbm.entity.particle.EntityOilSpillFX; import com.hbm.explosion.ExplosionLarge; -import com.hbm.handler.ShredderRecipeHandler; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IGasAcceptor; import com.hbm.interfaces.IGasSource; import com.hbm.interfaces.IOilAcceptor; import com.hbm.interfaces.IOilSource; -import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; @@ -27,12 +23,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; public class TileEntityMachineOilWell extends TileEntity implements ISidedInventory, IConsumer, IOilSource, IGasSource { @@ -322,7 +316,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent warning = 2; break; - } else if((b == ModBlocks.ore_oil || b == ModBlocks.ore_oil_empty) && this.oil < this.maxOil && this.gas < this.maxGas) { + } else if((b == ModBlocks.ore_oil || b == ModBlocks.ore_oil_empty) && this.oil < TileEntityMachineOilWell.maxOil && this.gas < TileEntityMachineOilWell.maxGas) { if(succ(this.xCoord, i, this.zCoord)) { oil += 5; if(oil > maxOil) diff --git a/com/hbm/tileentity/TileEntityMachinePuF6Tank.java b/com/hbm/tileentity/TileEntityMachinePuF6Tank.java index 7e441c79f..6acba9ba6 100644 --- a/com/hbm/tileentity/TileEntityMachinePuF6Tank.java +++ b/com/hbm/tileentity/TileEntityMachinePuF6Tank.java @@ -5,7 +5,6 @@ import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/tileentity/TileEntityMachineRTG.java b/com/hbm/tileentity/TileEntityMachineRTG.java index 572f0cb60..515a1c0cc 100644 --- a/com/hbm/tileentity/TileEntityMachineRTG.java +++ b/com/hbm/tileentity/TileEntityMachineRTG.java @@ -2,24 +2,12 @@ package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; -import java.util.Random; - -import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.machine.MachineGenerator; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.ISource; import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; -import com.hbm.items.special.ItemFuelRod; import com.hbm.lib.Library; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -262,6 +250,7 @@ public class TileEntityMachineRTG extends TileEntity implements ISidedInventory, ffgeua(this.xCoord, this.yCoord, this.zCoord + 1, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityMachineReactor.java b/com/hbm/tileentity/TileEntityMachineReactor.java index 4c41a635b..0f6b27c67 100644 --- a/com/hbm/tileentity/TileEntityMachineReactor.java +++ b/com/hbm/tileentity/TileEntityMachineReactor.java @@ -4,7 +4,6 @@ import com.hbm.inventory.MachineRecipes; import com.hbm.items.ModItems; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/com/hbm/tileentity/TileEntityMachineRefinery.java b/com/hbm/tileentity/TileEntityMachineRefinery.java index f00d4f3b4..94cf7ea35 100644 --- a/com/hbm/tileentity/TileEntityMachineRefinery.java +++ b/com/hbm/tileentity/TileEntityMachineRefinery.java @@ -7,7 +7,6 @@ import com.hbm.items.special.ItemBattery; import com.hbm.lib.Library; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -359,7 +358,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } public int getOilScaled(int i) { - return (int)((oil * i) / maxOil); + return (oil * i) / maxOil; } public int getSmearScaled(int i) { @@ -407,6 +406,6 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven @Override public int getMaxFill() { - return this.maxOil; + return TileEntityMachineRefinery.maxOil; } } diff --git a/com/hbm/tileentity/TileEntityMachineShredder.java b/com/hbm/tileentity/TileEntityMachineShredder.java index e53582677..37e4145c8 100644 --- a/com/hbm/tileentity/TileEntityMachineShredder.java +++ b/com/hbm/tileentity/TileEntityMachineShredder.java @@ -1,24 +1,13 @@ package com.hbm.tileentity; -import java.util.ArrayList; -import java.util.List; - -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; -import com.hbm.interfaces.ISource; import com.hbm.inventory.MachineRecipes; -import com.hbm.items.ModItems; import com.hbm.items.special.ItemBattery; import com.hbm.items.special.ItemBlades; import com.hbm.lib.Library; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -407,7 +396,7 @@ public class TileEntityMachineShredder extends TileEntity implements ISidedInven @Override public int getMaxPower() { - return this.maxPower; + return TileEntityMachineShredder.maxPower; } public int getGearLeft() { diff --git a/com/hbm/tileentity/TileEntityMachineTeleporter.java b/com/hbm/tileentity/TileEntityMachineTeleporter.java index 48eb92abe..8bf780eb9 100644 --- a/com/hbm/tileentity/TileEntityMachineTeleporter.java +++ b/com/hbm/tileentity/TileEntityMachineTeleporter.java @@ -3,22 +3,13 @@ package com.hbm.tileentity; import java.util.List; import com.hbm.interfaces.IConsumer; -import com.hbm.items.ModItems; -import com.hbm.items.special.ItemBattery; import com.hbm.lib.ModDamageSource; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; public class TileEntityMachineTeleporter extends TileEntity implements IConsumer { diff --git a/com/hbm/tileentity/TileEntityMachineUF6Tank.java b/com/hbm/tileentity/TileEntityMachineUF6Tank.java index a6f559717..2f026c6d6 100644 --- a/com/hbm/tileentity/TileEntityMachineUF6Tank.java +++ b/com/hbm/tileentity/TileEntityMachineUF6Tank.java @@ -8,7 +8,6 @@ import com.hbm.items.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/com/hbm/tileentity/TileEntityNukeFurnace.java b/com/hbm/tileentity/TileEntityNukeFurnace.java index 761069bcf..8d9f28c70 100644 --- a/com/hbm/tileentity/TileEntityNukeFurnace.java +++ b/com/hbm/tileentity/TileEntityNukeFurnace.java @@ -3,8 +3,6 @@ package com.hbm.tileentity; import com.hbm.blocks.machine.MachineNukeFurnace; import com.hbm.items.ModItems; import com.hbm.items.special.ItemCustomLore; -import com.hbm.items.special.ItemFuelRod; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; diff --git a/com/hbm/tileentity/TileEntityOilDuct.java b/com/hbm/tileentity/TileEntityOilDuct.java index 7e2b82e93..27db97e0c 100644 --- a/com/hbm/tileentity/TileEntityOilDuct.java +++ b/com/hbm/tileentity/TileEntityOilDuct.java @@ -3,11 +3,8 @@ package com.hbm.tileentity; import java.util.ArrayList; import java.util.List; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.calc.UnionOfTileEntitiesAndBooleansForOil; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IOilDuct; -import com.hbm.interfaces.IOilAcceptor; import com.hbm.lib.Library; import cpw.mods.fml.relauncher.Side; @@ -25,6 +22,7 @@ public class TileEntityOilDuct extends TileEntity implements IOilDuct { } + @Override public void updateEntity() { this.updateConnections(); } diff --git a/com/hbm/tileentity/TileEntityPylonRedWire.java b/com/hbm/tileentity/TileEntityPylonRedWire.java index 2799f6645..e1d0c60c9 100644 --- a/com/hbm/tileentity/TileEntityPylonRedWire.java +++ b/com/hbm/tileentity/TileEntityPylonRedWire.java @@ -12,9 +12,7 @@ import com.hbm.packet.TEPylonSenderPacket; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; @@ -42,7 +40,7 @@ public class TileEntityPylonRedWire extends TileEntity implements IConductor { if(scheduleConnectionCheck && this.scheduleBuffer != null) { scheduleConnectionCheck = false; - this.connected = this.convertArrayToList(this.scheduleBuffer, worldObj); + this.connected = TileEntityPylonRedWire.convertArrayToList(this.scheduleBuffer, worldObj); } if(!worldObj.isRemote) {} @@ -77,7 +75,7 @@ public class TileEntityPylonRedWire extends TileEntity implements IConductor { public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); - int[][] con = this.convertListToArray(connected); + int[][] con = TileEntityPylonRedWire.convertListToArray(connected); int[] conX = new int[con.length]; int[] conY = new int[con.length]; diff --git a/com/hbm/tileentity/TileEntityReactorMultiblock.java b/com/hbm/tileentity/TileEntityReactorMultiblock.java index 064f8b727..bf275f491 100644 --- a/com/hbm/tileentity/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/TileEntityReactorMultiblock.java @@ -7,13 +7,9 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.blocks.machine.MachineGenerator; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; -import com.hbm.entity.effect.EntityNukeCloudSmall; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; import com.hbm.entity.mob.EntityNuclearCreeper; -import com.hbm.explosion.ExplosionNukeGeneric; import com.hbm.explosion.ExplosionParticle; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IReactor; import com.hbm.interfaces.ISource; @@ -21,17 +17,14 @@ import com.hbm.items.ModItems; import com.hbm.items.special.ItemFuelRod; import com.hbm.lib.Library; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.potion.Potion; @@ -756,7 +749,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv explosion.posY = this.yCoord; explosion.posZ = this.zCoord; this.worldObj.spawnEntityInWorld(explosion); - ExplosionParticle.spawnMush(this.worldObj, (int)this.xCoord, (int)this.yCoord - 3, (int)this.zCoord); + ExplosionParticle.spawnMush(this.worldObj, this.xCoord, this.yCoord - 3, this.zCoord); } @Override @@ -771,6 +764,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv ffgeua(this.xCoord, this.yCoord - 2, this.zCoord, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityStructureMarker.java b/com/hbm/tileentity/TileEntityStructureMarker.java index c824cafe1..1d90939a6 100644 --- a/com/hbm/tileentity/TileEntityStructureMarker.java +++ b/com/hbm/tileentity/TileEntityStructureMarker.java @@ -1,12 +1,9 @@ package com.hbm.tileentity; import com.hbm.packet.PacketDispatcher; -import com.hbm.packet.TEIGeneratorPacket; import com.hbm.packet.TEStructurePacket; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; public class TileEntityStructureMarker extends TileEntity { @@ -20,6 +17,7 @@ public class TileEntityStructureMarker extends TileEntity { //6: Fusionary Watz Plant public int type = 0; + @Override public void updateEntity() { if(this.type > 6) diff --git a/com/hbm/tileentity/TileEntityWatzCore.java b/com/hbm/tileentity/TileEntityWatzCore.java index 5fbc1ed55..c8bb7712e 100644 --- a/com/hbm/tileentity/TileEntityWatzCore.java +++ b/com/hbm/tileentity/TileEntityWatzCore.java @@ -5,9 +5,7 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.entity.logic.EntityNukeExplosionAdvanced; -import com.hbm.interfaces.IConductor; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IReactor; import com.hbm.interfaces.ISource; @@ -16,7 +14,6 @@ import com.hbm.items.special.WatzFuel; import com.hbm.lib.Library; import com.hbm.main.MainRegistry; -import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -692,6 +689,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I ffgeua(this.xCoord, this.yCoord - 7, this.zCoord, getTact()); } + @Override public boolean getTact() { if(age >= 0 && age < 10) { diff --git a/com/hbm/tileentity/TileEntityWireCoated.java b/com/hbm/tileentity/TileEntityWireCoated.java index 27bd17d77..23e0081be 100644 --- a/com/hbm/tileentity/TileEntityWireCoated.java +++ b/com/hbm/tileentity/TileEntityWireCoated.java @@ -5,8 +5,6 @@ import java.util.List; import com.hbm.calc.UnionOfTileEntitiesAndBooleans; import com.hbm.interfaces.IConductor; -import com.hbm.lib.Library; - import net.minecraft.tileentity.TileEntity; public class TileEntityWireCoated extends TileEntity implements IConductor { diff --git a/com/hbm/tileentity/TileEntityYellowBarrel.java b/com/hbm/tileentity/TileEntityYellowBarrel.java index 9d4d6b954..18c6e08dd 100644 --- a/com/hbm/tileentity/TileEntityYellowBarrel.java +++ b/com/hbm/tileentity/TileEntityYellowBarrel.java @@ -12,7 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityMooshroom; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayer; diff --git a/com/hbm/world/Bunker.java b/com/hbm/world/Bunker.java index f85ce3b26..ec3058fb8 100644 --- a/com/hbm/world/Bunker.java +++ b/com/hbm/world/Bunker.java @@ -66,6 +66,7 @@ public class Bunker extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/DesertAtom003.java b/com/hbm/world/DesertAtom003.java index cec0c4975..15e51f6a6 100644 --- a/com/hbm/world/DesertAtom003.java +++ b/com/hbm/world/DesertAtom003.java @@ -387,14 +387,14 @@ public class DesertAtom003 if(tank0 instanceof TileEntityMachinePuF6Tank) { TileEntityMachinePuF6Tank tankuf2 = (TileEntityMachinePuF6Tank)tank2; - tankuf2.fillState = rand.nextInt(tankuf2.maxFill); + tankuf2.fillState = rand.nextInt(TileEntityMachinePuF6Tank.maxFill); } world.setBlock(x + 31, y + 4, z + 7, Block21, 3, 3); TileEntity tank3 = world.getTileEntity(x + 31, y + 4, z + 7); if(tank3 instanceof TileEntityMachinePuF6Tank) { TileEntityMachinePuF6Tank tankuf3 = (TileEntityMachinePuF6Tank)tank3; - tankuf3.fillState = rand.nextInt(tankuf3.maxFill); + tankuf3.fillState = rand.nextInt(TileEntityMachinePuF6Tank.maxFill); } world.setBlock(x + 32, y + 4, z + 7, Block2, 0, 3); world.setBlock(x + 33, y + 4, z + 7, Block22, 0, 3); diff --git a/com/hbm/world/Dud.java b/com/hbm/world/Dud.java index e7a1be7fb..8333ae0fa 100644 --- a/com/hbm/world/Dud.java +++ b/com/hbm/world/Dud.java @@ -3,14 +3,11 @@ package com.hbm.world; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.lib.HbmChestContents; import com.hbm.main.MainRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -63,6 +60,7 @@ public class Dud extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/FWatz.java b/com/hbm/world/FWatz.java index a9145c656..138145ff5 100644 --- a/com/hbm/world/FWatz.java +++ b/com/hbm/world/FWatz.java @@ -5,10 +5,8 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.gen.feature.WorldGenerator; public class FWatz { diff --git a/com/hbm/world/Factory.java b/com/hbm/world/Factory.java index 5c5942c2c..7cc70b099 100644 --- a/com/hbm/world/Factory.java +++ b/com/hbm/world/Factory.java @@ -65,6 +65,7 @@ public class Factory extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/FactoryAdvanced.java b/com/hbm/world/FactoryAdvanced.java index 36844d578..6eeb283f9 100644 --- a/com/hbm/world/FactoryAdvanced.java +++ b/com/hbm/world/FactoryAdvanced.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -19,6 +17,7 @@ public class FactoryAdvanced extends WorldGenerator Block Block3 = ModBlocks.factory_advanced_furnace; Block Block4 = ModBlocks.factory_advanced_core; + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/FactoryTitanium.java b/com/hbm/world/FactoryTitanium.java index f74d7184b..080f26e71 100644 --- a/com/hbm/world/FactoryTitanium.java +++ b/com/hbm/world/FactoryTitanium.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -38,6 +36,7 @@ public class FactoryTitanium extends WorldGenerator Block Block3 = ModBlocks.factory_titanium_furnace; Block Block4 = ModBlocks.factory_titanium_core; + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/FusionReactor.java b/com/hbm/world/FusionReactor.java index 5f0c0a7be..d944455f1 100644 --- a/com/hbm/world/FusionReactor.java +++ b/com/hbm/world/FusionReactor.java @@ -7,7 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -120,6 +119,7 @@ public class FusionReactor extends WorldGenerator Block Block6 = ModBlocks.fusion_hatch; Block Block7 = ModBlocks.fusion_core; + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/LibraryDungeon.java b/com/hbm/world/LibraryDungeon.java index 2b204aa28..7d0aab21c 100644 --- a/com/hbm/world/LibraryDungeon.java +++ b/com/hbm/world/LibraryDungeon.java @@ -9,7 +9,6 @@ import java.util.Random; import com.hbm.main.MainRegistry; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityMobSpawner; @@ -35,6 +34,7 @@ public class LibraryDungeon extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/NuclearReactor.java b/com/hbm/world/NuclearReactor.java index c8f18962a..8e2843134 100644 --- a/com/hbm/world/NuclearReactor.java +++ b/com/hbm/world/NuclearReactor.java @@ -7,8 +7,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -59,6 +57,7 @@ public class NuclearReactor extends WorldGenerator Block Block5 = ModBlocks.reactor_hatch; Block Block6 = ModBlocks.reactor_computer; + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/Relay.java b/com/hbm/world/Relay.java index f5300d0c8..a8480f3b7 100644 --- a/com/hbm/world/Relay.java +++ b/com/hbm/world/Relay.java @@ -70,6 +70,7 @@ public class Relay extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/Satellite.java b/com/hbm/world/Satellite.java index 89a9981b5..c8a91a240 100644 --- a/com/hbm/world/Satellite.java +++ b/com/hbm/world/Satellite.java @@ -67,6 +67,7 @@ public class Satellite extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/Silo.java b/com/hbm/world/Silo.java index f2a5d8a32..18e9ed627 100644 --- a/com/hbm/world/Silo.java +++ b/com/hbm/world/Silo.java @@ -66,6 +66,7 @@ public class Silo extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/Spaceship.java b/com/hbm/world/Spaceship.java index 162c97a8a..c2e4a28cf 100644 --- a/com/hbm/world/Spaceship.java +++ b/com/hbm/world/Spaceship.java @@ -65,6 +65,7 @@ public class Spaceship extends WorldGenerator return false; } + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1); diff --git a/com/hbm/world/Watz.java b/com/hbm/world/Watz.java index 0a6a36e6a..158ef39c3 100644 --- a/com/hbm/world/Watz.java +++ b/com/hbm/world/Watz.java @@ -6,8 +6,6 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; @@ -134,6 +132,7 @@ public class Watz extends WorldGenerator } }; + @Override public boolean generate(World world, Random rand, int x, int y, int z) { int i = rand.nextInt(1);