diff --git a/resources/tinkertextures/entity/pullcart.png b/resources/tinkertextures/entity/pullcart.png new file mode 100644 index 00000000..29135d5c Binary files /dev/null and b/resources/tinkertextures/entity/pullcart.png differ diff --git a/resources/tinkertextures/entity/wagontexture.png b/resources/tinkertextures/entity/wagontexture.png new file mode 100644 index 00000000..817de297 Binary files /dev/null and b/resources/tinkertextures/entity/wagontexture.png differ diff --git a/resources/tinkertextures/gui/display.png b/resources/tinkertextures/gui/display.png new file mode 100644 index 00000000..e4d1ceab Binary files /dev/null and b/resources/tinkertextures/gui/display.png differ diff --git a/resources/tinkertextures/tools/axes.png b/resources/tinkertextures/tools/axes.png index 539d2cce..4a750608 100644 Binary files a/resources/tinkertextures/tools/axes.png and b/resources/tinkertextures/tools/axes.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_0.png b/resources/tinkertextures/tools/axes/axe_effect_0.png new file mode 100644 index 00000000..853fe7e9 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_0.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_1.png b/resources/tinkertextures/tools/axes/axe_effect_1.png new file mode 100644 index 00000000..27e08b5e Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_1.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_10.png b/resources/tinkertextures/tools/axes/axe_effect_10.png new file mode 100644 index 00000000..fbcb1f8d Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_10.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_2.png b/resources/tinkertextures/tools/axes/axe_effect_2.png new file mode 100644 index 00000000..31bf7bb1 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_2.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_3.png b/resources/tinkertextures/tools/axes/axe_effect_3.png new file mode 100644 index 00000000..d6dd4b93 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_3.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_4.png b/resources/tinkertextures/tools/axes/axe_effect_4.png new file mode 100644 index 00000000..01f37173 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_4.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_5.png b/resources/tinkertextures/tools/axes/axe_effect_5.png new file mode 100644 index 00000000..647f60e2 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_5.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_6.png b/resources/tinkertextures/tools/axes/axe_effect_6.png new file mode 100644 index 00000000..ccc4832a Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_6.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_7.png b/resources/tinkertextures/tools/axes/axe_effect_7.png new file mode 100644 index 00000000..5a194501 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_7.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_8.png b/resources/tinkertextures/tools/axes/axe_effect_8.png new file mode 100644 index 00000000..aceb8fcf Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_8.png differ diff --git a/resources/tinkertextures/tools/axes/axe_effect_9.png b/resources/tinkertextures/tools/axes/axe_effect_9.png new file mode 100644 index 00000000..01d1caeb Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_effect_9.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_0.png b/resources/tinkertextures/tools/axes/axe_handle_0.png new file mode 100644 index 00000000..750084ce Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_0.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_1.png b/resources/tinkertextures/tools/axes/axe_handle_1.png new file mode 100644 index 00000000..e837f6ee Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_1.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_10.png b/resources/tinkertextures/tools/axes/axe_handle_10.png new file mode 100644 index 00000000..f4ebcff1 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_10.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_11.png b/resources/tinkertextures/tools/axes/axe_handle_11.png new file mode 100644 index 00000000..461bd1f8 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_11.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_12.png b/resources/tinkertextures/tools/axes/axe_handle_12.png new file mode 100644 index 00000000..b305d857 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_12.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_13.png b/resources/tinkertextures/tools/axes/axe_handle_13.png new file mode 100644 index 00000000..748d7126 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_13.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_14.png b/resources/tinkertextures/tools/axes/axe_handle_14.png new file mode 100644 index 00000000..983ea25e Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_14.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_15.png b/resources/tinkertextures/tools/axes/axe_handle_15.png new file mode 100644 index 00000000..6ba47033 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_15.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_2.png b/resources/tinkertextures/tools/axes/axe_handle_2.png new file mode 100644 index 00000000..adafa561 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_2.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_3.png b/resources/tinkertextures/tools/axes/axe_handle_3.png new file mode 100644 index 00000000..0a096a55 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_3.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_4.png b/resources/tinkertextures/tools/axes/axe_handle_4.png new file mode 100644 index 00000000..74523ccb Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_4.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_5.png b/resources/tinkertextures/tools/axes/axe_handle_5.png new file mode 100644 index 00000000..b51a7d4b Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_5.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_6.png b/resources/tinkertextures/tools/axes/axe_handle_6.png new file mode 100644 index 00000000..77bd6a58 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_6.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_7.png b/resources/tinkertextures/tools/axes/axe_handle_7.png new file mode 100644 index 00000000..f0276fd3 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_7.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_8.png b/resources/tinkertextures/tools/axes/axe_handle_8.png new file mode 100644 index 00000000..2ab2e499 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_8.png differ diff --git a/resources/tinkertextures/tools/axes/axe_handle_9.png b/resources/tinkertextures/tools/axes/axe_handle_9.png new file mode 100644 index 00000000..ae5c66d8 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_handle_9.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_0.png b/resources/tinkertextures/tools/axes/axe_head_0.png new file mode 100644 index 00000000..e178de74 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_0.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_1.png b/resources/tinkertextures/tools/axes/axe_head_1.png new file mode 100644 index 00000000..f453c41a Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_1.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_10.png b/resources/tinkertextures/tools/axes/axe_head_10.png new file mode 100644 index 00000000..8dc921d4 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_10.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_11.png b/resources/tinkertextures/tools/axes/axe_head_11.png new file mode 100644 index 00000000..beb5888b Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_11.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_12.png b/resources/tinkertextures/tools/axes/axe_head_12.png new file mode 100644 index 00000000..379a435c Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_12.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_13.png b/resources/tinkertextures/tools/axes/axe_head_13.png new file mode 100644 index 00000000..c1f3c6eb Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_13.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_14.png b/resources/tinkertextures/tools/axes/axe_head_14.png new file mode 100644 index 00000000..6753e5e2 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_14.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_15.png b/resources/tinkertextures/tools/axes/axe_head_15.png new file mode 100644 index 00000000..75787a05 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_15.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_2.png b/resources/tinkertextures/tools/axes/axe_head_2.png new file mode 100644 index 00000000..64bfae5d Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_2.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_3.png b/resources/tinkertextures/tools/axes/axe_head_3.png new file mode 100644 index 00000000..b816c6cd Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_3.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_4.png b/resources/tinkertextures/tools/axes/axe_head_4.png new file mode 100644 index 00000000..a0585c00 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_4.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_5.png b/resources/tinkertextures/tools/axes/axe_head_5.png new file mode 100644 index 00000000..01815096 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_5.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_6.png b/resources/tinkertextures/tools/axes/axe_head_6.png new file mode 100644 index 00000000..68691f81 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_6.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_7.png b/resources/tinkertextures/tools/axes/axe_head_7.png new file mode 100644 index 00000000..d7eb6b5a Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_7.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_8.png b/resources/tinkertextures/tools/axes/axe_head_8.png new file mode 100644 index 00000000..c8842632 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_8.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_9.png b/resources/tinkertextures/tools/axes/axe_head_9.png new file mode 100644 index 00000000..5cb205c5 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_9.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_0.png b/resources/tinkertextures/tools/axes/axe_head_broken_0.png new file mode 100644 index 00000000..291a5172 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_0.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_1.png b/resources/tinkertextures/tools/axes/axe_head_broken_1.png new file mode 100644 index 00000000..82c89911 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_1.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_10.png b/resources/tinkertextures/tools/axes/axe_head_broken_10.png new file mode 100644 index 00000000..927dfeb7 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_10.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_11.png b/resources/tinkertextures/tools/axes/axe_head_broken_11.png new file mode 100644 index 00000000..522b0b92 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_11.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_12.png b/resources/tinkertextures/tools/axes/axe_head_broken_12.png new file mode 100644 index 00000000..234b9267 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_12.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_13.png b/resources/tinkertextures/tools/axes/axe_head_broken_13.png new file mode 100644 index 00000000..fcf85a27 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_13.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_14.png b/resources/tinkertextures/tools/axes/axe_head_broken_14.png new file mode 100644 index 00000000..5e773362 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_14.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_15.png b/resources/tinkertextures/tools/axes/axe_head_broken_15.png new file mode 100644 index 00000000..f19425b4 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_15.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_2.png b/resources/tinkertextures/tools/axes/axe_head_broken_2.png new file mode 100644 index 00000000..15761679 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_2.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_3.png b/resources/tinkertextures/tools/axes/axe_head_broken_3.png new file mode 100644 index 00000000..cbefa24c Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_3.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_4.png b/resources/tinkertextures/tools/axes/axe_head_broken_4.png new file mode 100644 index 00000000..8c9054d0 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_4.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_5.png b/resources/tinkertextures/tools/axes/axe_head_broken_5.png new file mode 100644 index 00000000..8dca3d67 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_5.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_6.png b/resources/tinkertextures/tools/axes/axe_head_broken_6.png new file mode 100644 index 00000000..4b5f86a5 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_6.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_7.png b/resources/tinkertextures/tools/axes/axe_head_broken_7.png new file mode 100644 index 00000000..eaadb25c Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_7.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_8.png b/resources/tinkertextures/tools/axes/axe_head_broken_8.png new file mode 100644 index 00000000..346fa037 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_8.png differ diff --git a/resources/tinkertextures/tools/axes/axe_head_broken_9.png b/resources/tinkertextures/tools/axes/axe_head_broken_9.png new file mode 100644 index 00000000..94369f18 Binary files /dev/null and b/resources/tinkertextures/tools/axes/axe_head_broken_9.png differ diff --git a/resources/tinkertextures/tools/baseheads.png b/resources/tinkertextures/tools/baseheads.png index 155cbd08..61951391 100644 Binary files a/resources/tinkertextures/tools/baseheads.png and b/resources/tinkertextures/tools/baseheads.png differ diff --git a/resources/tinkertextures/tools/frypans.png b/resources/tinkertextures/tools/frypans.png index 5b342cbe..952999a7 100644 Binary files a/resources/tinkertextures/tools/frypans.png and b/resources/tinkertextures/tools/frypans.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_0.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_0.png new file mode 100644 index 00000000..85127245 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_0.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_1.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_1.png new file mode 100644 index 00000000..32253413 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_1.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_10.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_10.png new file mode 100644 index 00000000..aca4f0ca Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_10.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_11.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_11.png new file mode 100644 index 00000000..764e6d15 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_11.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_12.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_12.png new file mode 100644 index 00000000..0489ee9a Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_12.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_13.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_13.png new file mode 100644 index 00000000..50133810 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_13.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_14.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_14.png new file mode 100644 index 00000000..58e192a4 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_14.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_2.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_2.png new file mode 100644 index 00000000..bc3ac639 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_2.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_3.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_3.png new file mode 100644 index 00000000..068ebc49 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_3.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_4.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_4.png new file mode 100644 index 00000000..9e973bc3 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_4.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_5.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_5.png new file mode 100644 index 00000000..51f735d7 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_5.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_6.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_6.png new file mode 100644 index 00000000..53a14324 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_6.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_7.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_7.png new file mode 100644 index 00000000..e25b2b7e Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_7.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_8.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_8.png new file mode 100644 index 00000000..077008e3 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_8.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_9.png b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_9.png new file mode 100644 index 00000000..5dd10d5c Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_accessory_9.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_0.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_0.png new file mode 100644 index 00000000..2592c2d7 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_0.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_1.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_1.png new file mode 100644 index 00000000..30b1a236 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_1.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_10.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_10.png new file mode 100644 index 00000000..fbcb1f8d Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_10.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_2.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_2.png new file mode 100644 index 00000000..32c2e769 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_2.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_3.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_3.png new file mode 100644 index 00000000..bb258bdc Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_3.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_4.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_4.png new file mode 100644 index 00000000..f6d96315 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_4.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_5.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_5.png new file mode 100644 index 00000000..5182eb8c Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_5.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_6.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_6.png new file mode 100644 index 00000000..19a63301 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_6.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_7.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_7.png new file mode 100644 index 00000000..894e5a39 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_7.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_8.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_8.png new file mode 100644 index 00000000..a851b384 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_8.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_effect_9.png b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_9.png new file mode 100644 index 00000000..03c4a674 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_effect_9.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_0.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_0.png new file mode 100644 index 00000000..ed659ecd Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_0.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_1.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_1.png new file mode 100644 index 00000000..39568833 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_1.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_10.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_10.png new file mode 100644 index 00000000..b76c5b8b Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_10.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_11.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_11.png new file mode 100644 index 00000000..178ed4ae Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_11.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_12.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_12.png new file mode 100644 index 00000000..51ba2d02 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_12.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_13.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_13.png new file mode 100644 index 00000000..2f071054 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_13.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_14.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_14.png new file mode 100644 index 00000000..dd39b7a2 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_14.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_2.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_2.png new file mode 100644 index 00000000..f6e57db3 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_2.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_3.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_3.png new file mode 100644 index 00000000..20c3a8e8 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_3.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_4.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_4.png new file mode 100644 index 00000000..1c443cb8 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_4.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_5.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_5.png new file mode 100644 index 00000000..1ef4d659 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_5.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_6.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_6.png new file mode 100644 index 00000000..4543d7ac Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_6.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_7.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_7.png new file mode 100644 index 00000000..cfa6aaab Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_7.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_8.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_8.png new file mode 100644 index 00000000..f3ee8fe6 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_8.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_handle_9.png b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_9.png new file mode 100644 index 00000000..17eeb7e7 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_handle_9.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_0.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_0.png new file mode 100644 index 00000000..c460f406 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_0.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_1.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_1.png new file mode 100644 index 00000000..3d1ff580 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_1.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_10.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_10.png new file mode 100644 index 00000000..1b5001ff Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_10.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_11.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_11.png new file mode 100644 index 00000000..6dc208b4 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_11.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_12.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_12.png new file mode 100644 index 00000000..4d59731b Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_12.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_13.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_13.png new file mode 100644 index 00000000..79d8158f Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_13.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_14.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_14.png new file mode 100644 index 00000000..89572461 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_14.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_2.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_2.png new file mode 100644 index 00000000..59b49d72 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_2.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_3.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_3.png new file mode 100644 index 00000000..0d426aad Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_3.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_4.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_4.png new file mode 100644 index 00000000..6f6873b5 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_4.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_5.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_5.png new file mode 100644 index 00000000..45ff088c Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_5.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_6.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_6.png new file mode 100644 index 00000000..27342dc5 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_6.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_7.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_7.png new file mode 100644 index 00000000..4c76c617 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_7.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_8.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_8.png new file mode 100644 index 00000000..c6b6c7e0 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_8.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_9.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_9.png new file mode 100644 index 00000000..6dae2bb7 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_9.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_0.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_0.png new file mode 100644 index 00000000..fe69922d Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_0.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_1.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_1.png new file mode 100644 index 00000000..78c4ca80 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_1.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_10.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_10.png new file mode 100644 index 00000000..d00b58be Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_10.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_11.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_11.png new file mode 100644 index 00000000..288e52a7 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_11.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_12.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_12.png new file mode 100644 index 00000000..9dbec136 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_12.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_13.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_13.png new file mode 100644 index 00000000..9f7561ad Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_13.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_14.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_14.png new file mode 100644 index 00000000..601cf008 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_14.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_2.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_2.png new file mode 100644 index 00000000..69b843dc Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_2.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_3.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_3.png new file mode 100644 index 00000000..9a7087c8 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_3.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_4.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_4.png new file mode 100644 index 00000000..7eb9adca Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_4.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_5.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_5.png new file mode 100644 index 00000000..27df72ba Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_5.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_6.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_6.png new file mode 100644 index 00000000..cd58ef59 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_6.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_7.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_7.png new file mode 100644 index 00000000..0e58cc72 Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_7.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_8.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_8.png new file mode 100644 index 00000000..60ac17cb Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_8.png differ diff --git a/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_9.png b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_9.png new file mode 100644 index 00000000..622b87ef Binary files /dev/null and b/resources/tinkertextures/tools/pickaxes/pickaxe_head_broken_9.png differ diff --git a/tinker/armory/Armory.java b/tinker/armory/Armory.java index dabab4ee..e9863d07 100644 --- a/tinker/armory/Armory.java +++ b/tinker/armory/Armory.java @@ -1,11 +1,12 @@ package tinker.armory; -import tinker.armory.content.ArmorStandItem; -import tinker.armory.content.Toolrack; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import tinker.armory.content.ArmorStandItem; +import tinker.armory.content.DisplayBlock; +import tinker.armory.content.Shelf; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; @@ -42,9 +43,12 @@ public class Armory public void preInit(FMLPreInitializationEvent evt) { PHArmory.initProps(); - stoneRack = new Toolrack(PHArmory.rackBlock, Material.rock); - GameRegistry.registerBlock(stoneRack, tinker.armory.content.ToolrackItem.class, "ToolRack"); - GameRegistry.registerTileEntity(tinker.armory.content.ToolrackLogic.class, "InfiToolrack"); + toolrack = new DisplayBlock(PHArmory.toolrack, Material.rock); + GameRegistry.registerBlock(toolrack, tinker.armory.content.ToolrackItem.class, "ToolRack"); + GameRegistry.registerTileEntity(tinker.armory.content.ShieldrackLogic.class, "Display"); + shelf = new Shelf(PHArmory.shieldrack, Material.rock); + GameRegistry.registerBlock(shelf, tinker.armory.content.ToolrackItem.class, "Shelf"); + GameRegistry.registerTileEntity(tinker.armory.content.ToolrackLogic.class, "aShelf"); /*armorStand = new ArmorStand(1501, Material.rock); GameRegistry.registerBlock(armorStand, mDiyo.inficraft.armory.ArmorStandItem.class); GameRegistry.registerTileEntity(mDiyo.inficraft.armory.ArmorStandLogic.class, "InfiArmorStand");*/ @@ -67,8 +71,8 @@ public class Armory } /* Prototype fields, used elsewhere */ - public static Block stoneRack; - public static Block woodRack; + public static Block shelf; + public static Block toolrack; public static Block armorStand; public static Block pedestal; diff --git a/tinker/armory/PHArmory.java b/tinker/armory/PHArmory.java index a704a724..2bb7d119 100644 --- a/tinker/armory/PHArmory.java +++ b/tinker/armory/PHArmory.java @@ -42,8 +42,9 @@ public class PHArmory * Avoid values below 4096 for items and in the 250-450 and 2216-2226 range for blocks */ - armorBlock = config.getBlock("Armor Stand", 3257).getInt(3257); - rackBlock = config.getBlock("Tool Rack", 3257).getInt(3257); + //armorBlock = config.getBlock("Armor Stand", 3257).getInt(3257); + toolrack = config.getBlock("Toolrack", 3201).getInt(3201); + shieldrack = config.getBlock("Shield Rack", 3202).getInt(3202); armorItem = config.getItem("Armor Stand Item", 4570).getInt(4570); /*berryBlockID = config.getBlock("Berry_Bush", 3257).getInt(3257); berryItemID = config.getItem("Berry_Food", 12402).getInt(12402); @@ -68,7 +69,8 @@ public class PHArmory /* Prototype fields, used elsewhere */ public static int armorBlock; public static int armorItem; - public static int rackBlock; + public static int toolrack; + public static int shieldrack; /*public static int raspSpawnDensity; public static int raspSpawnHeight; public static int raspSpawnRange; diff --git a/tinker/armory/client/ArmoryProxyClient.java b/tinker/armory/client/ArmoryProxyClient.java index 969aaa86..63d48879 100644 --- a/tinker/armory/client/ArmoryProxyClient.java +++ b/tinker/armory/client/ArmoryProxyClient.java @@ -15,8 +15,9 @@ public class ArmoryProxyClient extends ArmoryProxyCommon @Override public void registerRenderer() { - RenderingRegistry.registerBlockHandler(new RenderToolrack()); - ClientRegistry.bindTileEntitySpecialRenderer(ToolrackLogic.class, new ToolrackSpecialRender()); + RenderingRegistry.registerBlockHandler(new RenderShelf()); + RenderingRegistry.registerBlockHandler(new RenderDisplay()); + ClientRegistry.bindTileEntitySpecialRenderer(ToolrackLogic.class, new ShelfSpecialRender()); RenderingRegistry.registerEntityRenderingHandler(tinker.armory.content.ArmorStandEntity.class, new RenderArmorStandEntity(new ArmorStandModelStatue(), 0)); } diff --git a/tinker/armory/client/BlockSkinRenderHelper.java b/tinker/armory/client/BlockSkinRenderHelper.java new file mode 100644 index 00000000..72875519 --- /dev/null +++ b/tinker/armory/client/BlockSkinRenderHelper.java @@ -0,0 +1,954 @@ +package tinker.armory.client; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; + +public class BlockSkinRenderHelper +{ + public static boolean renderStandardMetadataBlock (Block block, int metadata, int x, int y, int z, RenderBlocks render, IBlockAccess world) + { + int var5 = block.colorMultiplier(world, x, y, z); + float var6 = (float) (var5 >> 16 & 255) / 255.0F; + float var7 = (float) (var5 >> 8 & 255) / 255.0F; + float var8 = (float) (var5 & 255) / 255.0F; + + if (EntityRenderer.anaglyphEnable) + { + float var9 = (var6 * 30.0F + var7 * 59.0F + var8 * 11.0F) / 100.0F; + float var10 = (var6 * 30.0F + var7 * 70.0F) / 100.0F; + float var11 = (var6 * 30.0F + var8 * 70.0F) / 100.0F; + var6 = var9; + var7 = var10; + var8 = var11; + } + + return Minecraft.isAmbientOcclusionEnabled() && Block.lightValue[block.blockID] == 0 ? + renderMetadataBlockWithAmbientOcclusion(block, metadata, x, y, z, var6, var7, var8, render, world) + : renderMetadataBlockWithColorMultiplier(block, metadata, x, y, z, var6, var7, var8, render, world); + } + + static boolean renderMetadataBlockWithAmbientOcclusion(Block block, int metadata, int xMin, int yMin, int zMin, + float xMax, float yMax, float zMax, RenderBlocks render, IBlockAccess world) + { + render.enableAO = true; + boolean var8 = false; + float var9 = render.lightValueOwn; + float var10 = render.lightValueOwn; + float var11 = render.lightValueOwn; + float var12 = render.lightValueOwn; + boolean var13 = true; + boolean var14 = true; + boolean var15 = true; + boolean var16 = true; + boolean var17 = true; + boolean var18 = true; + render.lightValueOwn = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin); + render.aoLightValueXNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueYNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueZNeg = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueXPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + render.aoLightValueYPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoLightValueZPos = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + int var19 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin); + int var20 = var19; + int var21 = var19; + int var22 = var19; + int var23 = var19; + int var24 = var19; + int var25 = var19; + + if (render.renderMinY <= 0.0D) + { + var21 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + } + + if (render.renderMaxY >= 1.0D) + { + var24 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + } + + if (render.renderMinX <= 0.0D) + { + var20 = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + } + + if (render.renderMaxX >= 1.0D) + { + var23 = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + } + + if (render.renderMinZ <= 0.0D) + { + var22 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + } + + if (render.renderMaxZ >= 1.0D) + { + var25 = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + } + + Tessellator var26 = Tessellator.instance; + var26.setBrightness(983055); + render.aoGrassXYZPPC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin + 1, zMin)]; + render.aoGrassXYZPNC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin - 1, zMin)]; + render.aoGrassXYZPCP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin, zMin + 1)]; + render.aoGrassXYZPCN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin + 1, yMin, zMin - 1)]; + render.aoGrassXYZNPC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin + 1, zMin)]; + render.aoGrassXYZNNC = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin - 1, zMin)]; + render.aoGrassXYZNCN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin, zMin - 1)]; + render.aoGrassXYZNCP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin - 1, yMin, zMin + 1)]; + render.aoGrassXYZCPP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin + 1, zMin + 1)]; + render.aoGrassXYZCPN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin + 1, zMin - 1)]; + render.aoGrassXYZCNP = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin - 1, zMin + 1)]; + render.aoGrassXYZCNN = Block.canBlockGrass[render.blockAccess.getBlockId(xMin, yMin - 1, zMin - 1)]; + + if (block.blockIndexInTexture == 3) + { + var18 = false; + var17 = false; + var16 = false; + var15 = false; + var13 = false; + } + + if (render.overrideBlockTexture >= 0) + { + var18 = false; + var17 = false; + var16 = false; + var15 = false; + var13 = false; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin - 1, zMin, 0)) + { + if (render.aoType > 0) + { + if (render.renderMinY <= 0.0D) + { + --yMin; + } + + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + + if (!render.aoGrassXYZCNN && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCNP && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXYNN; + render.aoBrightnessXYZNNP = render.aoBrightnessXYNN; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin + 1); + } + + if (!render.aoGrassXYZCNN && !render.aoGrassXYZPNC) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCNP && !render.aoGrassXYZPNC) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXYPN; + render.aoBrightnessXYZPNP = render.aoBrightnessXYPN; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin + 1); + } + + if (render.renderMinY <= 0.0D) + { + ++yMin; + } + + var9 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXYNN + render.aoLightValueScratchYZNP + render.aoLightValueYNeg) / 4.0F; + var12 = (render.aoLightValueScratchYZNP + render.aoLightValueYNeg + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXYPN) / 4.0F; + var11 = (render.aoLightValueYNeg + render.aoLightValueScratchYZNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNN) / 4.0F; + var10 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNN + render.aoLightValueYNeg + render.aoLightValueScratchYZNN) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXYNN, render.aoBrightnessYZNP, var21); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXYPN, var21); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYPN, render.aoBrightnessXYZPNN, var21); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNN, render.aoBrightnessYZNN, var21); + } + else + { + var12 = render.aoLightValueYNeg; + var11 = render.aoLightValueYNeg; + var10 = render.aoLightValueYNeg; + var9 = render.aoLightValueYNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = render.aoBrightnessXYNN; + } + + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var13 ? xMax : 1.0F) * 0.5F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var13 ? yMax : 1.0F) * 0.5F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var13 ? zMax : 1.0F) * 0.5F; + render.colorRedTopLeft *= var9; + render.colorGreenTopLeft *= var9; + render.colorBlueTopLeft *= var9; + render.colorRedBottomLeft *= var10; + render.colorGreenBottomLeft *= var10; + render.colorBlueBottomLeft *= var10; + render.colorRedBottomRight *= var11; + render.colorGreenBottomRight *= var11; + render.colorBlueBottomRight *= var11; + render.colorRedTopRight *= var12; + render.colorGreenTopRight *= var12; + render.colorBlueTopRight *= var12; + render.renderBottomFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(0, metadata)); + var8 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin + 1, zMin, 1)) + { + if (render.aoType > 0) + { + if (render.renderMaxY >= 1.0D) + { + ++yMin; + } + + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + + if (!render.aoGrassXYZCPN && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPN = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCPN && !render.aoGrassXYZPPC) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPN = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin - 1); + } + + if (!render.aoGrassXYZCPP && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXYNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXYNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin + 1); + } + + if (!render.aoGrassXYZCPP && !render.aoGrassXYZPPC) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXYPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXYPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin + 1); + } + + if (render.renderMaxY >= 1.0D) + { + --yMin; + } + + var12 = (render.aoLightValueScratchXYZNPP + render.aoLightValueScratchXYNP + render.aoLightValueScratchYZPP + render.aoLightValueYPos) / 4.0F; + var9 = (render.aoLightValueScratchYZPP + render.aoLightValueYPos + render.aoLightValueScratchXYZPPP + render.aoLightValueScratchXYPP) / 4.0F; + var10 = (render.aoLightValueYPos + render.aoLightValueScratchYZPN + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPN) / 4.0F; + var11 = (render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPN + render.aoLightValueYPos + render.aoLightValueScratchYZPN) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNPP, render.aoBrightnessXYNP, render.aoBrightnessYZPP, var24); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXYZPPP, render.aoBrightnessXYPP, var24); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXYPP, render.aoBrightnessXYZPPN, var24); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYNP, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, var24); + } + else + { + var12 = render.aoLightValueYPos; + var11 = render.aoLightValueYPos; + var10 = render.aoLightValueYPos; + var9 = render.aoLightValueYPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var24; + } + + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = var14 ? xMax : 1.0F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = var14 ? yMax : 1.0F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = var14 ? zMax : 1.0F; + render.colorRedTopLeft *= var9; + render.colorGreenTopLeft *= var9; + render.colorBlueTopLeft *= var9; + render.colorRedBottomLeft *= var10; + render.colorGreenBottomLeft *= var10; + render.colorBlueBottomLeft *= var10; + render.colorRedBottomRight *= var11; + render.colorGreenBottomRight *= var11; + render.colorBlueBottomRight *= var11; + render.colorRedTopRight *= var12; + render.colorGreenTopRight *= var12; + render.colorBlueTopRight *= var12; + render.renderTopFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTextureFromSideAndMetadata(1, metadata)); + var8 = true; + } + + int var27; + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin - 1, 2)) + { + if (render.aoType > 0) + { + if (render.renderMinZ <= 0.0D) + { + --zMin; + } + + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchYZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchYZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessYZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessYZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZCNN) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin - 1, zMin); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZCPN) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin + 1, zMin); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin + 1, zMin); + } + + if (!render.aoGrassXYZPCN && !render.aoGrassXYZCNN) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin - 1, zMin); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZPCN && !render.aoGrassXYZCPN) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin + 1, zMin); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin + 1, zMin); + } + + if (render.renderMinZ <= 0.0D) + { + ++zMin; + } + + var9 = (render.aoLightValueScratchXZNN + render.aoLightValueScratchXYZNPN + render.aoLightValueZNeg + render.aoLightValueScratchYZPN) / 4.0F; + var10 = (render.aoLightValueZNeg + render.aoLightValueScratchYZPN + render.aoLightValueScratchXZPN + render.aoLightValueScratchXYZPPN) / 4.0F; + var11 = (render.aoLightValueScratchYZNN + render.aoLightValueZNeg + render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXZPN) / 4.0F; + var12 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXZNN + render.aoLightValueScratchYZNN + render.aoLightValueZNeg) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessYZPN, var22); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessYZPN, render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, var22); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNN, render.aoBrightnessXYZPNN, render.aoBrightnessXZPN, var22); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXZNN, render.aoBrightnessYZNN, var22); + } + else + { + var12 = render.aoLightValueZNeg; + var11 = render.aoLightValueZNeg; + var10 = render.aoLightValueZNeg; + var9 = render.aoLightValueZNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var22; + } + + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var15 ? xMax : 1.0F) * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var15 ? yMax : 1.0F) * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var15 ? zMax : 1.0F) * 0.8F; + render.colorRedTopLeft *= var9; + render.colorGreenTopLeft *= var9; + render.colorBlueTopLeft *= var9; + render.colorRedBottomLeft *= var10; + render.colorGreenBottomLeft *= var10; + render.colorBlueBottomLeft *= var10; + render.colorRedBottomRight *= var11; + render.colorGreenBottomRight *= var11; + render.colorBlueBottomRight *= var11; + render.colorRedTopRight *= var12; + render.colorGreenTopRight *= var12; + render.colorBlueTopRight *= var12; + var27 = block.getBlockTextureFromSideAndMetadata(2, metadata); + render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, var27); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) + { + render.colorRedTopLeft *= xMax; + render.colorRedBottomLeft *= xMax; + render.colorRedBottomRight *= xMax; + render.colorRedTopRight *= xMax; + render.colorGreenTopLeft *= yMax; + render.colorGreenBottomLeft *= yMax; + render.colorGreenBottomRight *= yMax; + render.colorGreenTopRight *= yMax; + render.colorBlueTopLeft *= zMax; + render.colorBlueBottomLeft *= zMax; + render.colorBlueBottomRight *= zMax; + render.colorBlueTopRight *= zMax; + render.renderEastFace(block, (double)xMin, (double)yMin, (double)zMin, 38); + } + + var8 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin, yMin, zMin + 1, 3)) + { + if (render.aoType > 0) + { + if (render.renderMaxZ >= 1.0D) + { + ++zMin; + } + + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin, zMin); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin, zMin); + render.aoLightValueScratchYZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchYZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin, zMin); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin, zMin); + render.aoBrightnessYZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessYZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZCNP) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin - 1, zMin); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZCPP) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin - 1, yMin + 1, zMin); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin - 1, yMin + 1, zMin); + } + + if (!render.aoGrassXYZPCP && !render.aoGrassXYZCNP) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin - 1, zMin); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin - 1, zMin); + } + + if (!render.aoGrassXYZPCP && !render.aoGrassXYZCPP) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin + 1, yMin + 1, zMin); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin + 1, yMin + 1, zMin); + } + + if (render.renderMaxZ >= 1.0D) + { + --zMin; + } + + var9 = (render.aoLightValueScratchXZNP + render.aoLightValueScratchXYZNPP + render.aoLightValueZPos + render.aoLightValueScratchYZPP) / 4.0F; + var12 = (render.aoLightValueZPos + render.aoLightValueScratchYZPP + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYZPPP) / 4.0F; + var11 = (render.aoLightValueScratchYZNP + render.aoLightValueZPos + render.aoLightValueScratchXYZPNP + render.aoLightValueScratchXZPP) / 4.0F; + var10 = (render.aoLightValueScratchXYZNNP + render.aoLightValueScratchXZNP + render.aoLightValueScratchYZNP + render.aoLightValueZPos) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYZNPP, render.aoBrightnessYZPP, var25); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessYZPP, render.aoBrightnessXZPP, render.aoBrightnessXYZPPP, var25); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessYZNP, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, var25); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, render.aoBrightnessYZNP, var25); + } + else + { + var12 = render.aoLightValueZPos; + var11 = render.aoLightValueZPos; + var10 = render.aoLightValueZPos; + var9 = render.aoLightValueZPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var25; + } + + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var16 ? xMax : 1.0F) * 0.8F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var16 ? yMax : 1.0F) * 0.8F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var16 ? zMax : 1.0F) * 0.8F; + render.colorRedTopLeft *= var9; + render.colorGreenTopLeft *= var9; + render.colorBlueTopLeft *= var9; + render.colorRedBottomLeft *= var10; + render.colorGreenBottomLeft *= var10; + render.colorBlueBottomLeft *= var10; + render.colorRedBottomRight *= var11; + render.colorGreenBottomRight *= var11; + render.colorBlueBottomRight *= var11; + render.colorRedTopRight *= var12; + render.colorGreenTopRight *= var12; + render.colorBlueTopRight *= var12; + var27 = block.getBlockTextureFromSideAndMetadata(3, metadata); + render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, block.getBlockTexture(render.blockAccess, xMin, yMin, zMin, 3)); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) + { + render.colorRedTopLeft *= xMax; + render.colorRedBottomLeft *= xMax; + render.colorRedBottomRight *= xMax; + render.colorRedTopRight *= xMax; + render.colorGreenTopLeft *= yMax; + render.colorGreenBottomLeft *= yMax; + render.colorGreenBottomRight *= yMax; + render.colorGreenTopRight *= yMax; + render.colorBlueTopLeft *= zMax; + render.colorBlueBottomLeft *= zMax; + render.colorBlueBottomRight *= zMax; + render.colorBlueTopRight *= zMax; + render.renderWestFace(block, (double)xMin, (double)yMin, (double)zMin, 38); + } + + var8 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin - 1, yMin, zMin, 4)) + { + if (render.aoType > 0) + { + if (render.renderMinX <= 0.0D) + { + --xMin; + } + + render.aoLightValueScratchXYNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchXZNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchXZNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXYNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessXZNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessXZNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoBrightnessXYNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNNN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin - 1); + render.aoBrightnessXYZNNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin - 1); + } + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZNNC) + { + render.aoLightValueScratchXYZNNP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNNP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin + 1); + render.aoBrightnessXYZNNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin + 1); + } + + if (!render.aoGrassXYZNCN && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPN = render.aoLightValueScratchXZNN; + render.aoBrightnessXYZNPN = render.aoBrightnessXZNN; + } + else + { + render.aoLightValueScratchXYZNPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin - 1); + render.aoBrightnessXYZNPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin - 1); + } + + if (!render.aoGrassXYZNCP && !render.aoGrassXYZNPC) + { + render.aoLightValueScratchXYZNPP = render.aoLightValueScratchXZNP; + render.aoBrightnessXYZNPP = render.aoBrightnessXZNP; + } + else + { + render.aoLightValueScratchXYZNPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin + 1); + render.aoBrightnessXYZNPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin + 1); + } + + if (render.renderMinX <= 0.0D) + { + ++xMin; + } + + var12 = (render.aoLightValueScratchXYNN + render.aoLightValueScratchXYZNNP + render.aoLightValueXNeg + render.aoLightValueScratchXZNP) / 4.0F; + var9 = (render.aoLightValueXNeg + render.aoLightValueScratchXZNP + render.aoLightValueScratchXYNP + render.aoLightValueScratchXYZNPP) / 4.0F; + var10 = (render.aoLightValueScratchXZNN + render.aoLightValueXNeg + render.aoLightValueScratchXYZNPN + render.aoLightValueScratchXYNP) / 4.0F; + var11 = (render.aoLightValueScratchXYZNNN + render.aoLightValueScratchXYNN + render.aoLightValueScratchXZNN + render.aoLightValueXNeg) / 4.0F; + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXYNN, render.aoBrightnessXYZNNP, render.aoBrightnessXZNP, var20); + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXZNP, render.aoBrightnessXYNP, render.aoBrightnessXYZNPP, var20); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXZNN, render.aoBrightnessXYZNPN, render.aoBrightnessXYNP, var20); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXYZNNN, render.aoBrightnessXYNN, render.aoBrightnessXZNN, var20); + } + else + { + var12 = render.aoLightValueXNeg; + var11 = render.aoLightValueXNeg; + var10 = render.aoLightValueXNeg; + var9 = render.aoLightValueXNeg; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var20; + } + + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var17 ? xMax : 1.0F) * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var17 ? yMax : 1.0F) * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var17 ? zMax : 1.0F) * 0.6F; + render.colorRedTopLeft *= var9; + render.colorGreenTopLeft *= var9; + render.colorBlueTopLeft *= var9; + render.colorRedBottomLeft *= var10; + render.colorGreenBottomLeft *= var10; + render.colorBlueBottomLeft *= var10; + render.colorRedBottomRight *= var11; + render.colorGreenBottomRight *= var11; + render.colorBlueBottomRight *= var11; + render.colorRedTopRight *= var12; + render.colorGreenTopRight *= var12; + render.colorBlueTopRight *= var12; + var27 = block.getBlockTextureFromSideAndMetadata(4, metadata); + render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, var27); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) + { + render.colorRedTopLeft *= xMax; + render.colorRedBottomLeft *= xMax; + render.colorRedBottomRight *= xMax; + render.colorRedTopRight *= xMax; + render.colorGreenTopLeft *= yMax; + render.colorGreenBottomLeft *= yMax; + render.colorGreenBottomRight *= yMax; + render.colorGreenTopRight *= yMax; + render.colorBlueTopLeft *= zMax; + render.colorBlueBottomLeft *= zMax; + render.colorBlueBottomRight *= zMax; + render.colorBlueTopRight *= zMax; + render.renderNorthFace(block, (double)xMin, (double)yMin, (double)zMin, 38); + } + + var8 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, xMin + 1, yMin, zMin, 5)) + { + if (render.aoType > 0) + { + if (render.renderMaxX >= 1.0D) + { + ++xMin; + } + + render.aoLightValueScratchXYPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin); + render.aoLightValueScratchXZPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin - 1); + render.aoLightValueScratchXZPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin, zMin + 1); + render.aoLightValueScratchXYPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin); + render.aoBrightnessXYPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin); + render.aoBrightnessXZPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin - 1); + render.aoBrightnessXZPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin, zMin + 1); + render.aoBrightnessXYPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin); + + if (!render.aoGrassXYZPNC && !render.aoGrassXYZPCN) + { + render.aoLightValueScratchXYZPNN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPNN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPNN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin - 1); + render.aoBrightnessXYZPNN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin - 1); + } + + if (!render.aoGrassXYZPNC && !render.aoGrassXYZPCP) + { + render.aoLightValueScratchXYZPNP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPNP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPNP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin - 1, zMin + 1); + render.aoBrightnessXYZPNP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin - 1, zMin + 1); + } + + if (!render.aoGrassXYZPPC && !render.aoGrassXYZPCN) + { + render.aoLightValueScratchXYZPPN = render.aoLightValueScratchXZPN; + render.aoBrightnessXYZPPN = render.aoBrightnessXZPN; + } + else + { + render.aoLightValueScratchXYZPPN = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin - 1); + render.aoBrightnessXYZPPN = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin - 1); + } + + if (!render.aoGrassXYZPPC && !render.aoGrassXYZPCP) + { + render.aoLightValueScratchXYZPPP = render.aoLightValueScratchXZPP; + render.aoBrightnessXYZPPP = render.aoBrightnessXZPP; + } + else + { + render.aoLightValueScratchXYZPPP = block.getAmbientOcclusionLightValue(render.blockAccess, xMin, yMin + 1, zMin + 1); + render.aoBrightnessXYZPPP = block.getMixedBrightnessForBlock(render.blockAccess, xMin, yMin + 1, zMin + 1); + } + + if (render.renderMaxX >= 1.0D) + { + --xMin; + } + + var9 = (render.aoLightValueScratchXYPN + render.aoLightValueScratchXYZPNP + render.aoLightValueXPos + render.aoLightValueScratchXZPP) / 4.0F; + var12 = (render.aoLightValueXPos + render.aoLightValueScratchXZPP + render.aoLightValueScratchXYPP + render.aoLightValueScratchXYZPPP) / 4.0F; + var11 = (render.aoLightValueScratchXZPN + render.aoLightValueXPos + render.aoLightValueScratchXYZPPN + render.aoLightValueScratchXYPP) / 4.0F; + var10 = (render.aoLightValueScratchXYZPNN + render.aoLightValueScratchXYPN + render.aoLightValueScratchXZPN + render.aoLightValueXPos) / 4.0F; + render.brightnessTopLeft = render.getAoBrightness(render.aoBrightnessXYPN, render.aoBrightnessXYZPNP, render.aoBrightnessXZPP, var23); + render.brightnessTopRight = render.getAoBrightness(render.aoBrightnessXZPP, render.aoBrightnessXYPP, render.aoBrightnessXYZPPP, var23); + render.brightnessBottomRight = render.getAoBrightness(render.aoBrightnessXZPN, render.aoBrightnessXYZPPN, render.aoBrightnessXYPP, var23); + render.brightnessBottomLeft = render.getAoBrightness(render.aoBrightnessXYZPNN, render.aoBrightnessXYPN, render.aoBrightnessXZPN, var23); + } + else + { + var12 = render.aoLightValueXPos; + var11 = render.aoLightValueXPos; + var10 = render.aoLightValueXPos; + var9 = render.aoLightValueXPos; + render.brightnessTopLeft = render.brightnessBottomLeft = render.brightnessBottomRight = render.brightnessTopRight = var23; + } + + render.colorRedTopLeft = render.colorRedBottomLeft = render.colorRedBottomRight = render.colorRedTopRight = (var18 ? xMax : 1.0F) * 0.6F; + render.colorGreenTopLeft = render.colorGreenBottomLeft = render.colorGreenBottomRight = render.colorGreenTopRight = (var18 ? yMax : 1.0F) * 0.6F; + render.colorBlueTopLeft = render.colorBlueBottomLeft = render.colorBlueBottomRight = render.colorBlueTopRight = (var18 ? zMax : 1.0F) * 0.6F; + render.colorRedTopLeft *= var9; + render.colorGreenTopLeft *= var9; + render.colorBlueTopLeft *= var9; + render.colorRedBottomLeft *= var10; + render.colorGreenBottomLeft *= var10; + render.colorBlueBottomLeft *= var10; + render.colorRedBottomRight *= var11; + render.colorGreenBottomRight *= var11; + render.colorBlueBottomRight *= var11; + render.colorRedTopRight *= var12; + render.colorGreenTopRight *= var12; + render.colorBlueTopRight *= var12; + var27 = block.getBlockTextureFromSideAndMetadata(5, metadata); + render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, var27); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var27 == 3 && render.overrideBlockTexture < 0) + { + render.colorRedTopLeft *= xMax; + render.colorRedBottomLeft *= xMax; + render.colorRedBottomRight *= xMax; + render.colorRedTopRight *= xMax; + render.colorGreenTopLeft *= yMax; + render.colorGreenBottomLeft *= yMax; + render.colorGreenBottomRight *= yMax; + render.colorGreenTopRight *= yMax; + render.colorBlueTopLeft *= zMax; + render.colorBlueBottomLeft *= zMax; + render.colorBlueBottomRight *= zMax; + render.colorBlueTopRight *= zMax; + render.renderSouthFace(block, (double)xMin, (double)yMin, (double)zMin, 38); + } + + var8 = true; + } + + render.enableAO = false; + return var8; + } + + static boolean renderMetadataBlockWithColorMultiplier(Block block, int metadata, int minX, int minY, int minZ, float maxX, float maxY, float maxZ, RenderBlocks render, IBlockAccess world) + { + render.enableAO = false; + Tessellator var8 = Tessellator.instance; + boolean var9 = false; + float var10 = 0.5F; + float var11 = 1.0F; + float var12 = 0.8F; + float var13 = 0.6F; + float var14 = var11 * maxX; + float var15 = var11 * maxY; + float var16 = var11 * maxZ; + float var17 = var10; + float var18 = var12; + float var19 = var13; + float var20 = var10; + float var21 = var12; + float var22 = var13; + float var23 = var10; + float var24 = var12; + float var25 = var13; + + if (block != Block.grass) + { + var17 = var10 * maxX; + var18 = var12 * maxX; + var19 = var13 * maxX; + var20 = var10 * maxY; + var21 = var12 * maxY; + var22 = var13 * maxY; + var23 = var10 * maxZ; + var24 = var12 * maxZ; + var25 = var13 * maxZ; + } + + int var26 = block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ); + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY - 1, minZ, 0)) + { + var8.setBrightness(render.renderMinY > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY - 1, minZ)); + var8.setColorOpaque_F(var17, var20, var23); + render.renderBottomFace(block, (double)minX, (double)minY, (double)minZ, block.getBlockTextureFromSideAndMetadata(0, metadata)); + var9 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY + 1, minZ, 1)) + { + var8.setBrightness(render.renderMaxY < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY + 1, minZ)); + var8.setColorOpaque_F(var14, var15, var16); + render.renderTopFace(block, (double)minX, (double)minY, (double)minZ, block.getBlockTextureFromSideAndMetadata(1, metadata)); + var9 = true; + } + + int var28; + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ - 1, 2)) + { + var8.setBrightness(render.renderMinZ > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ - 1)); + var8.setColorOpaque_F(var18, var21, var24); + var28 = block.getBlockTextureFromSideAndMetadata(2, metadata); + render.renderEastFace(block, (double)minX, (double)minY, (double)minZ, var28); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) + { + var8.setColorOpaque_F(var18 * maxX, var21 * maxY, var24 * maxZ); + render.renderEastFace(block, (double)minX, (double)minY, (double)minZ, 38); + } + + var9 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX, minY, minZ + 1, 3)) + { + var8.setBrightness(render.renderMaxZ < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX, minY, minZ + 1)); + var8.setColorOpaque_F(var18, var21, var24); + var28 = block.getBlockTextureFromSideAndMetadata(3, metadata); + render.renderWestFace(block, (double)minX, (double)minY, (double)minZ, var28); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) + { + var8.setColorOpaque_F(var18 * maxX, var21 * maxY, var24 * maxZ); + render.renderWestFace(block, (double)minX, (double)minY, (double)minZ, 38); + } + + var9 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX - 1, minY, minZ, 4)) + { + var8.setBrightness(render.renderMinX > 0.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX - 1, minY, minZ)); + var8.setColorOpaque_F(var19, var22, var25); + var28 = block.getBlockTextureFromSideAndMetadata(4, metadata); + render.renderNorthFace(block, (double)minX, (double)minY, (double)minZ, var28); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) + { + var8.setColorOpaque_F(var19 * maxX, var22 * maxY, var25 * maxZ); + render.renderNorthFace(block, (double)minX, (double)minY, (double)minZ, 38); + } + + var9 = true; + } + + if (render.renderAllFaces || block.shouldSideBeRendered(render.blockAccess, minX + 1, minY, minZ, 5)) + { + var8.setBrightness(render.renderMaxX < 1.0D ? var26 : block.getMixedBrightnessForBlock(render.blockAccess, minX + 1, minY, minZ)); + var8.setColorOpaque_F(var19, var22, var25); + var28 = block.getBlockTextureFromSideAndMetadata(5, metadata); + render.renderSouthFace(block, (double)minX, (double)minY, (double)minZ, var28); + + if (Tessellator.instance.defaultTexture && render.fancyGrass && var28 == 3 && render.overrideBlockTexture < 0) + { + var8.setColorOpaque_F(var19 * maxX, var22 * maxY, var25 * maxZ); + render.renderSouthFace(block, (double)minX, (double)minY, (double)minZ, 38); + } + + var9 = true; + } + + return var9; + } +} diff --git a/tinker/armory/client/RenderDisplay.java b/tinker/armory/client/RenderDisplay.java new file mode 100644 index 00000000..051b3718 --- /dev/null +++ b/tinker/armory/client/RenderDisplay.java @@ -0,0 +1,118 @@ +package tinker.armory.client; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import tinker.armory.content.DisplayLogic; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class RenderDisplay implements ISimpleBlockRenderingHandler +{ + public static int displayModel; + + public RenderDisplay() + { + displayModel = RenderingRegistry.getNextAvailableRenderId(); + } + + public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) + { + if (modelID == displayModel) + { + if (metadata == 5) + { + renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderDo(renderer, block, metadata); + } + else + { + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderDo(renderer, block, metadata); + } + } + } + + @Override + public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) + { + if (modelID == displayModel) + { + int metadata = world.getBlockMetadata(x, y, z); + TileEntity te = world.getBlockTileEntity(x, y, z); + ItemStack topStack = ((DisplayLogic)te).getFrontDisplay(); + Block topSkin = Block.blocksList[topStack.itemID]; + int topMeta = topStack.getItemDamage(); + ItemStack bottomStack = ((DisplayLogic)te).getBackDisplay(); + Block bottomSkin = Block.blocksList[bottomStack.itemID]; + int bottomMeta = bottomStack.getItemDamage(); + + renderer.setRenderBounds(0.125, 0.125F, 0.0F, 0.375, 0.875F, 0.0625); + BlockSkinRenderHelper.renderStandardMetadataBlock(bottomSkin, bottomMeta, x, y, z, renderer, world); + renderer.setRenderBounds(0.6125, 0.125F, 0.0F, 0.875, 0.875F, 0.0625); + BlockSkinRenderHelper.renderStandardMetadataBlock(bottomSkin, bottomMeta, x, y, z, renderer, world); + renderer.setRenderBounds(0.0F, 0.5F, 0.0F, 1.0F, 0.625F, 0.09375); + BlockSkinRenderHelper.renderStandardMetadataBlock(topSkin, topMeta, x, y, z, renderer, world); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 0.125); + BlockSkinRenderHelper.renderStandardMetadataBlock(topSkin, topMeta, x, y, z, renderer, world); + } + return false; + } + + @Override + public boolean shouldRender3DInInventory () + { + return true; + } + + @Override + public int getRenderId () + { + return displayModel; + } + + private void renderDo(RenderBlocks renderblocks, Block block, int meta) + { + Tessellator tessellator = Tessellator.instance; + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, meta)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } +} diff --git a/tinker/armory/client/RenderShelf.java b/tinker/armory/client/RenderShelf.java new file mode 100644 index 00000000..1a72b311 --- /dev/null +++ b/tinker/armory/client/RenderShelf.java @@ -0,0 +1,110 @@ +package tinker.armory.client; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import tinker.armory.content.Shelf; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class RenderShelf implements ISimpleBlockRenderingHandler +{ + public static int shelfModelID; + + public RenderShelf() + { + shelfModelID = RenderingRegistry.getNextAvailableRenderId(); + } + + public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) + { + if (modelID == shelfModelID) + { + if (metadata == 5) + { + renderer.setRenderBounds(0.0F, 0.0, 0.0F, 1.0F, 0.875F, 1.0F); + renderDo(renderer, block, metadata); + } + else + { + renderer.setRenderBounds(0.0F, 0.75F, 0.0F, 1.0F, 1.0F, 1.0F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 0.25F, 0.75F, 0.25F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.75F, 0.0F, 0.0F, 1.0F, 0.75F, 0.25F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.0F, 0.0F, 0.75F, 0.25F, 0.75F, 1.0F); + renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.75F, 0.0F, 0.75F, 1.0F, 0.75F, 1.0F); + renderDo(renderer, block, metadata); + } + } + } + + @Override + public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelID, RenderBlocks renderer) + { + if (modelID == shelfModelID) + { + int metadata = world.getBlockMetadata(x, y, z); + + renderer.setRenderBounds(0.125, 0.125F, 0.0F, 0.375, 0.875F, 0.0625); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.6125, 0.125F, 0.0F, 0.875, 0.875F, 0.0625); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.5F, 0.0F, 1.0F, 0.625F, 0.09375); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.125F, 0.125); + renderer.renderStandardBlock(block, x, y, z); + } + return false; + } + + @Override + public boolean shouldRender3DInInventory () + { + return true; + } + + @Override + public int getRenderId () + { + return shelfModelID; + } + + private void renderDo(RenderBlocks renderblocks, Block block, int meta) + { + Tessellator tessellator = Tessellator.instance; + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, meta)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } +} diff --git a/tinker/armory/client/RenderToolrack.java b/tinker/armory/client/RenderToolrack.java deleted file mode 100644 index eb11981b..00000000 --- a/tinker/armory/client/RenderToolrack.java +++ /dev/null @@ -1,125 +0,0 @@ -package tinker.armory.client; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import tinker.armory.content.Toolrack; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - -public class RenderToolrack implements ISimpleBlockRenderingHandler -{ - public static int rackModel; - private static final float[][] modelCubes = new float[][] { - {0.0F, 0.625F, 0.0F, 1.0F, 0.8125F, 0.125F}, {0.1875F, 0.3125F, 0.0F, 0.25F, 0.9375F, 0.125F}, {0.75f, 0.3125F, 0.0F, 0.8125F, 0.875F, 0.125F}, {0.0F, 0.25F, 0.0F, 1.0F, 0.3125F, 0.3125F}}; - - public RenderToolrack() - { - rackModel = RenderingRegistry.getNextAvailableRenderId(); - } - - public int getRenderId() - { - return this.rackModel; - } - - public boolean shouldRender3DInInventory() - { - return true; - } - - public boolean renderWorldBlock(IBlockAccess var1, int x, int y, int z, Block block, int modelID, RenderBlocks var7) - { - if (modelID == this.rackModel) - return this.renderRackBlock(var7, var1, x, y, z, (Toolrack)block); - else - return false; - } - - public void renderInventoryBlock(Block var1, int var2, int var3, RenderBlocks var4) - { - if (var3 == this.rackModel) - { - this.renderRackItem(var4, (Toolrack)var1, var2); - } - } - - private void renderRackItem(RenderBlocks var1, Toolrack block, int metadata) - { - Tessellator tessellator = Tessellator.instance; - - for (int iter = 0; iter < modelCubes.length; ++iter) - { - float[] var6 = modelCubes[iter]; - block.setBlockBounds(var6[0], var6[1], var6[2], var6[3], var6[4], var6[5]); - GL11.glTranslatef(-0.5F, -0.5F, 0.0F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - var1.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - var1.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - var1.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, metadata)); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.0F); - } - - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - } - - private boolean renderRackBlock(RenderBlocks render, IBlockAccess world, int x, int y, int z, Toolrack block) - { - int meta = world.getBlockMetadata(x, y, z) / 4; - int iter; - float[] size; - - if (meta == 0) - { - for (iter = 0; iter < modelCubes.length; ++iter) - { - size = modelCubes[iter]; - block.setBlockBounds(size[0], size[1], size[2], size[3], size[4], size[5]); - render.renderStandardBlock(block, x, y, z); - } - } - else if (meta == 1) - { - for (iter = 0; iter < modelCubes.length; ++iter) - { - size = modelCubes[iter]; - block.setBlockBounds(size[2], size[1], size[0], size[5], size[4], size[3]); - render.renderStandardBlock(block, x, y, z); - } - } - else if (meta == 2) - { - for (iter = 0; iter < modelCubes.length; ++iter) - { - size = modelCubes[iter]; - block.setBlockBounds(size[0], size[1], 1.0F - size[5], size[3], size[4], 1.0F - size[2]); - render.renderStandardBlock(block, x, y, z); - } - } - else if (meta == 3) - { - for (iter = 0; iter < modelCubes.length; ++iter) - { - size = modelCubes[iter]; - block.setBlockBounds(1.0F - size[5], size[1], size[0], 1.0F - size[2], size[4], size[3]); - render.renderStandardBlock(block, x, y, z); - } - } - - block.setBounds(meta); - return false; - } -} diff --git a/tinker/armory/client/ToolrackSpecialRender.java b/tinker/armory/client/ShelfSpecialRender.java similarity index 88% rename from tinker/armory/client/ToolrackSpecialRender.java rename to tinker/armory/client/ShelfSpecialRender.java index 0c42b85c..d522f316 100644 --- a/tinker/armory/client/ToolrackSpecialRender.java +++ b/tinker/armory/client/ShelfSpecialRender.java @@ -14,8 +14,10 @@ import tinker.armory.content.ToolrackLogic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +/* Special renderer, only used for drawing tools */ + @SideOnly(Side.CLIENT) -public class ToolrackSpecialRender extends TileEntitySpecialRenderer +public class ShelfSpecialRender extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) @@ -25,9 +27,8 @@ public class ToolrackSpecialRender extends TileEntitySpecialRenderer public void render(ToolrackLogic logic, double posX, double posY, double posZ, float var8) { - //System.out.println("Rendering "+logic.getInvName()); GL11.glPushMatrix(); - GL11.glTranslatef((float)posX + 0.3F, (float)posY + 0.5F, (float)posZ + 0.28F); //Center on the block + GL11.glTranslatef((float)posX + 0.25F, (float)posY + 0.5F, (float)posZ + 0.094F); //Center on the block int facing = logic.getBlockMetadata() / 4; GL11.glRotatef(90.0F * (float)facing, 0.0F, 1.0F, 0.0F); //Rotation angle //GL11.glTranslatef(-0.25F, 0.25F, -0.3F); @@ -45,30 +46,32 @@ public class ToolrackSpecialRender extends TileEntitySpecialRenderer //GL11.glRotatef(logic.getAngle(var10), 0.0F, 0.0F, 1.0F); GL11.glRotatef(45f, 0.0F, 0.0F, 1.0F); int iconIndex; - int col; + int color; - if (stack.getItem().requiresMultipleRenderPasses()) + Item item = stack.getItem(); + int damage = stack.getItemDamage(); + if (item.requiresMultipleRenderPasses()) { - for (iconIndex = 0; iconIndex <= 1; ++iconIndex) + for (int renderPass = 0; renderPass <= item.getRenderPasses(damage); ++renderPass) { - col = stack.getItem().getIconFromDamageForRenderPass(stack.getItemDamage(), iconIndex); - int color = stack.getItem().getColorFromItemStack(stack, iconIndex); + iconIndex = item.getIconIndex(stack, renderPass); + color = stack.getItem().getColorFromItemStack(stack, iconIndex); setColor(color); - this.drawItem(col); + this.drawItem(iconIndex); } } else { iconIndex = stack.getIconIndex(); - col = Item.itemsList[stack.itemID].getColorFromItemStack(stack, 0); - setColor(col); + color = Item.itemsList[stack.itemID].getColorFromItemStack(stack, 0); + setColor(color); this.drawItem(iconIndex); } GL11.glPopMatrix(); } - GL11.glTranslatef(0.4F, 0.0F, 0.001F); + GL11.glTranslatef(0.475F, 0.0F, 0.001F); } GL11.glDisable(GL12.GL_RESCALE_NORMAL); diff --git a/tinker/armory/content/DisplayBlock.java b/tinker/armory/content/DisplayBlock.java new file mode 100644 index 00000000..a983cc78 --- /dev/null +++ b/tinker/armory/content/DisplayBlock.java @@ -0,0 +1,53 @@ +package tinker.armory.content; + +import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import tinker.armory.client.RenderDisplay; +import tinker.common.InventoryBlock; + +public class DisplayBlock extends InventoryBlock +{ + + public DisplayBlock(int id, Material material) + { + super(id, material); + } + + @Override + public TileEntity createNewTileEntity (World world, int metadata) + { + return new ShieldrackLogic(); + //return null; + } + + @Override + public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) + { + return null; + } + + @Override + public Object getModInstance () + { + return null; + } + + public int getRenderType() + { + return RenderDisplay.displayModel; + } + + @Override + public boolean renderAsNormalBlock() + { + return false; + } + + @Override + public boolean isOpaqueCube() + { + return false; + } +} diff --git a/tinker/armory/content/DisplayLogic.java b/tinker/armory/content/DisplayLogic.java new file mode 100644 index 00000000..73b077fb --- /dev/null +++ b/tinker/armory/content/DisplayLogic.java @@ -0,0 +1,30 @@ +package tinker.armory.content; + +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import tinker.common.InventoryLogic; + +public abstract class DisplayLogic extends InventoryLogic +{ + public DisplayLogic(int invSize) + { + super(invSize + 2); //Skin blocks + } + + public ItemStack getFrontDisplay() + { + if (inventory[0] == null || !(inventory[0].getItem() instanceof ItemBlock)) + return new ItemStack(Block.planks, 1, 1); + else + return inventory[0]; + } + + public ItemStack getBackDisplay() + { + if (inventory[1] == null || !(inventory[1].getItem() instanceof ItemBlock)) + return new ItemStack(Block.cloth, 1, 3); + else + return inventory[1]; + } +} diff --git a/tinker/armory/content/Toolrack.java b/tinker/armory/content/Shelf.java similarity index 94% rename from tinker/armory/content/Toolrack.java rename to tinker/armory/content/Shelf.java index c0edd817..707498f0 100644 --- a/tinker/armory/content/Toolrack.java +++ b/tinker/armory/content/Shelf.java @@ -2,7 +2,7 @@ package tinker.armory.content; import java.util.List; -import tinker.armory.client.RenderToolrack; +import tinker.armory.client.RenderShelf; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -15,9 +15,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class Toolrack extends BlockContainer +public class Shelf extends BlockContainer { - public Toolrack(int id, Material material) + public Shelf(int id, Material material) { super(id, material); } @@ -36,7 +36,7 @@ public class Toolrack extends BlockContainer public int getRenderType() { - return RenderToolrack.rackModel; + return RenderShelf.shelfModelID; } @Override @@ -174,9 +174,9 @@ public class Toolrack extends BlockContainer if (facing == 0) { - this.setBlockBounds(0.0F, 0.2F, 0.0F, 1.0F, 0.9F, 0.25F); + this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.875F, 0.125F); } - else if (facing == 1) + /*else if (facing == 1) { this.setBlockBounds(0.0F, 0.2F, 0.0F, 0.25F, 0.9F, 1.0F); } @@ -187,6 +187,6 @@ public class Toolrack extends BlockContainer else if (facing == 3) { this.setBlockBounds(0.75F, 0.2F, 0.0F, 1.0F, 0.9F, 1.0F); - } + }*/ } } diff --git a/tinker/armory/content/ShieldrackLogic.java b/tinker/armory/content/ShieldrackLogic.java new file mode 100644 index 00000000..330abb05 --- /dev/null +++ b/tinker/armory/content/ShieldrackLogic.java @@ -0,0 +1,27 @@ +package tinker.armory.content; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.world.World; + +public class ShieldrackLogic extends DisplayLogic +{ + + public ShieldrackLogic() + { + super(3); + } + + @Override + public String getInvName () + { + return "armory.shieldrack"; + } + + @Override + public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) + { + return null; + } + +} diff --git a/tinker/tconstruct/TConstruct.java b/tinker/tconstruct/TConstruct.java index c7fcd4c5..60be763f 100644 --- a/tinker/tconstruct/TConstruct.java +++ b/tinker/tconstruct/TConstruct.java @@ -27,7 +27,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; * @author: mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "mc1.4.7_1.0.6") +@Mod(modid = "TConstruct", name = "TConstruct", version = "mc1.4.7_1.0.7") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels={"TConstruct"}, packetHandler = tinker.tconstruct.TConstructPacketHandler.class) public class TConstruct { diff --git a/tinker/tconstruct/TConstructContent.java b/tinker/tconstruct/TConstructContent.java index 459a07ab..2f7185e2 100644 --- a/tinker/tconstruct/TConstructContent.java +++ b/tinker/tconstruct/TConstructContent.java @@ -110,7 +110,7 @@ public class TConstructContent void createEntities() { - EntityRegistry.registerModEntity(tinker.tconstruct.entity.EntityWagon.class, "Small Wagon", 0, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(tinker.tconstruct.entity.CartEntity.class, "Small Wagon", 0, TConstruct.instance, 32, 5, true); } void createItems () diff --git a/tinker/tconstruct/TConstructPacketHandler.java b/tinker/tconstruct/TConstructPacketHandler.java index 86281560..f7ace639 100644 --- a/tinker/tconstruct/TConstructPacketHandler.java +++ b/tinker/tconstruct/TConstructPacketHandler.java @@ -3,14 +3,18 @@ package tinker.tconstruct; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; +import java.util.List; +import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.WorldServer; +import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import tinker.armory.content.EntityEquipment; import tinker.common.InventoryLogic; +import tinker.tconstruct.entity.CartEntity; import tinker.tconstruct.logic.ToolStationLogic; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.IPacketHandler; @@ -24,61 +28,91 @@ public class TConstructPacketHandler implements IPacketHandler public void onPacketData (INetworkManager manager, Packet250CustomPayload packet, Player player) { Side side = FMLCommonHandler.instance().getEffectiveSide(); - + if (packet.channel.equals("TConstruct")) + { + //System.out.println("Recieved a packet for TConstruct"); if (side == Side.SERVER) handleServerPacket(packet); + else + handleClientPacket(packet); + } } - void handleServerPacket (Packet250CustomPayload packet) + void handleClientPacket (Packet250CustomPayload packet) { + //System.out.println("Handling client packet"); DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); - - byte packetID; + + byte packetType; int dimension; - int x; - int y; - int z; - + byte packetID; try { packetID = inputStream.readByte(); dimension = inputStream.readInt(); - x = inputStream.readInt(); - y = inputStream.readInt(); - z = inputStream.readInt(); - - WorldServer world = DimensionManager.getWorld(dimension); - TileEntity te = world.getBlockTileEntity(x, y, z); - - if (packetID == 1) + + World world = DimensionManager.getWorld(dimension); + } + catch (IOException e) + { + System.out.println("Failed at reading client packet for TConstruct."); + e.printStackTrace(); + return; + } + } + + void handleServerPacket (Packet250CustomPayload packet) + { + //System.out.println("Handling server packet"); + DataInputStream inputStream = new DataInputStream(new ByteArrayInputStream(packet.data)); + + byte packetType; + int dimension; + byte packetID; + + try + { + packetID = inputStream.readByte(); + dimension = inputStream.readInt(); + + World world = DimensionManager.getWorld(dimension); + + if (packetID == 1) //Tool Station { + int x = inputStream.readInt(); + int y = inputStream.readInt(); + int z = inputStream.readInt(); + TileEntity te = world.getBlockTileEntity(x, y, z); + String toolName = inputStream.readUTF(); if (te instanceof ToolStationLogic) { - ((ToolStationLogic)te).setToolname(toolName); + ((ToolStationLogic) te).setToolname(toolName); } } - else if (packetID == 2) + else if (packetID == 2) //Stencil Table { + int x = inputStream.readInt(); + int y = inputStream.readInt(); + int z = inputStream.readInt(); + TileEntity te = world.getBlockTileEntity(x, y, z); + Short itemID = inputStream.readShort(); Short itemDamage = inputStream.readShort(); if (te instanceof InventoryLogic) { - ((InventoryLogic)te).setInventorySlotContents(1, new ItemStack(itemID, 1, itemDamage)); + ((InventoryLogic) te).setInventorySlotContents(1, new ItemStack(itemID, 1, itemDamage)); } } + } catch (IOException e) { - System.out.println("Failed at reading packet for TConstruct. Blarrrrrrrrrgh"); + System.out.println("Failed at reading server packet for TConstruct."); e.printStackTrace(); return; } - - - } - } diff --git a/tinker/tconstruct/client/RenderWagon.java b/tinker/tconstruct/client/CartRender.java similarity index 60% rename from tinker/tconstruct/client/RenderWagon.java rename to tinker/tconstruct/client/CartRender.java index dee11706..1235f586 100644 --- a/tinker/tconstruct/client/RenderWagon.java +++ b/tinker/tconstruct/client/CartRender.java @@ -11,45 +11,43 @@ import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; -import tinker.tconstruct.entity.EntityWagon; +import tinker.tconstruct.entity.CartEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class RenderWagon extends Render +public class CartRender extends Render { - /** instance of ModelMinecart for rendering */ - protected ModelBase modelMinecart; + protected ModelBase modelCart; + RenderBlocks renderblocks; - public RenderWagon() + public CartRender() { this.shadowSize = 0.5F; - this.modelMinecart = new ModelMinecart(); + this.modelCart = new ModelPullcart(); + renderblocks = new RenderBlocks(); } - /** - * Renders the Minecart. - */ - public void renderTheMinecart(EntityWagon wagon, double par2, double par4, double par6, float par8, float par9) + public void renderPullcart(CartEntity cart, double posX, double posY, double posZ, float par8, float par9) { GL11.glPushMatrix(); - long var10 = (long)wagon.entityId * 493286711L; + long var10 = (long)cart.entityId * 493286711L; var10 = var10 * var10 * 4392167121L + var10 * 98761L; float var12 = (((float)(var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var13 = (((float)(var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var14 = (((float)(var10 >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; GL11.glTranslatef(var12, var13, var14); - double var15 = wagon.lastTickPosX + (wagon.posX - wagon.lastTickPosX) * (double)par9; - double var17 = wagon.lastTickPosY + (wagon.posY - wagon.lastTickPosY) * (double)par9; - double var19 = wagon.lastTickPosZ + (wagon.posZ - wagon.lastTickPosZ) * (double)par9; + double var15 = cart.lastTickPosX + (cart.posX - cart.lastTickPosX) * (double)par9; + double var17 = cart.lastTickPosY + (cart.posY - cart.lastTickPosY) * (double)par9; + double var19 = cart.lastTickPosZ + (cart.posZ - cart.lastTickPosZ) * (double)par9; double var21 = 0.30000001192092896D; - Vec3 var23 = wagon.func_70489_a(var15, var17, var19); - float var24 = wagon.prevRotationPitch + (wagon.rotationPitch - wagon.prevRotationPitch) * par9; + Vec3 var23 = cart.func_70489_a(var15, var17, var19); + float var24 = cart.prevRotationPitch + (cart.rotationPitch - cart.prevRotationPitch) * par9; if (var23 != null) { - Vec3 var25 = wagon.func_70495_a(var15, var17, var19, var21); - Vec3 var26 = wagon.func_70495_a(var15, var17, var19, -var21); + Vec3 var25 = cart.func_70495_a(var15, var17, var19, var21); + Vec3 var26 = cart.func_70495_a(var15, var17, var19, -var21); if (var25 == null) { @@ -61,9 +59,9 @@ public class RenderWagon extends Render var26 = var23; } - par2 += var23.xCoord - var15; - par4 += (var25.yCoord + var26.yCoord) / 2.0D - var17; - par6 += var23.zCoord - var19; + posX += var23.xCoord - var15; + posY += (var25.yCoord + var26.yCoord) / 2.0D - var17; + posZ += var23.zCoord - var19; Vec3 var27 = var26.addVector(-var25.xCoord, -var25.yCoord, -var25.zCoord); if (var27.lengthVector() != 0.0D) @@ -74,11 +72,11 @@ public class RenderWagon extends Render } } - GL11.glTranslatef((float)par2, (float)par4, (float)par6); + GL11.glTranslatef((float)posX, (float)posY + 0.3125f, (float)posZ); GL11.glRotatef(180.0F - par8, 0.0F, 1.0F, 0.0F); GL11.glRotatef(-var24, 0.0F, 0.0F, 1.0F); - float var28 = (float)wagon.func_70496_j() - par9; - float var30 = (float)wagon.getDamage() - par9; + float var28 = (float)cart.func_70496_j() - par9; + float var30 = (float)cart.getDamage() - par9; if (var30 < 0.0F) { @@ -87,38 +85,38 @@ public class RenderWagon extends Render if (var28 > 0.0F) { - GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float)wagon.func_70493_k(), 1.0F, 0.0F, 0.0F); + GL11.glRotatef(MathHelper.sin(var28) * var28 * var30 / 10.0F * (float)cart.func_70493_k(), 1.0F, 0.0F, 0.0F); } - if (wagon.minecartType != 0) + if (cart.getCartType() != 0) { this.loadTexture("/terrain.png"); float var29 = 0.75F; GL11.glScalef(var29, var29, var29); - if (wagon.minecartType == 1) + if (cart.getCartType() == 1) { GL11.glTranslatef(0.0F, 0.5F, 0.0F); - (new RenderBlocks()).renderBlockAsItem(Block.chest, 0, wagon.getBrightness(par9)); + renderblocks.renderBlockAsItem(Block.chest, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.5F, 0.0F, -0.5F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } - else if (wagon.minecartType == 2) + else if (cart.getCartType() == 2) { GL11.glTranslatef(0.0F, 0.3125F, 0.0F); - (new RenderBlocks()).renderBlockAsItem(Block.stoneOvenIdle, 0, wagon.getBrightness(par9)); + renderblocks.renderBlockAsItem(Block.stoneOvenIdle, 0, cart.getBrightness(par9)); GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.0F, -0.3125F, 0.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } - GL11.glScalef(1.0F / var29, 1.0F / var29, 1.0F / var29); + //GL11.glScalef(1.0F / var29, 1.0F / var29, 1.0F / var29); } - this.loadTexture("/tinkertextures/entity/wagon.png"); + this.loadTexture("/tinkertextures/entity/pullcart.png"); GL11.glScalef(-1.0F, -1.0F, 1.0F); - this.modelMinecart.render(wagon, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); + this.modelCart.render(cart, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); GL11.glPopMatrix(); } @@ -130,6 +128,6 @@ public class RenderWagon extends Render */ public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - this.renderTheMinecart((EntityWagon)par1Entity, par2, par4, par6, par8, par9); + this.renderPullcart((CartEntity)par1Entity, par2, par4, par6, par8, par9); } } diff --git a/tinker/tconstruct/client/ModelPullcart.java b/tinker/tconstruct/client/ModelPullcart.java new file mode 100644 index 00000000..6f6be2e3 --- /dev/null +++ b/tinker/tconstruct/client/ModelPullcart.java @@ -0,0 +1,281 @@ +package tinker.tconstruct.client; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelPullcart extends ModelBase +{ + ModelRenderer BackPanel; + ModelRenderer FrontPanel; + ModelRenderer RightPanel; + ModelRenderer LeftPanel; + ModelRenderer BottomPanel; + ModelRenderer RightHandle; + ModelRenderer LeftHandle; + ModelRenderer RightSpokeUp; + ModelRenderer RightSpokeRight; + ModelRenderer RightSpokeDown; + ModelRenderer RightSpokeLeft; + ModelRenderer RightAxle; + ModelRenderer WheelRight1; + ModelRenderer WheelRight2; + ModelRenderer WheelRight3; + ModelRenderer WheelRight4; + ModelRenderer WheelRight5; + ModelRenderer WheelRight6; + ModelRenderer WheelRight7; + ModelRenderer WheelRight8; + ModelRenderer WheelRight9; + ModelRenderer WheelRight10; + ModelRenderer WheelRight11; + ModelRenderer WheelRight12; + ModelRenderer LeftSpokeRight; + ModelRenderer LeftSpokeLeft; + ModelRenderer LeftSpokeDown; + ModelRenderer LeftSpokeUp; + ModelRenderer LeftAxle; + ModelRenderer WheelLeft1; + ModelRenderer WheelLeft2; + ModelRenderer WheelLeft3; + ModelRenderer WheelLeft4; + ModelRenderer WheelLeft5; + ModelRenderer WheelLeft6; + ModelRenderer WheelLeft7; + ModelRenderer WheelLeft8; + ModelRenderer WheelLeft9; + ModelRenderer WheelLeft10; + ModelRenderer WheelLeft11; + ModelRenderer WheelLeft12; + + public ModelPullcart() + { + textureWidth = 128; + textureHeight = 64; + + BackPanel = new ModelRenderer(this, 0, 12); + BackPanel.addBox(-10F, 0F, 0F, 20, 10, 2); + BackPanel.setRotationPoint(0F, -8F, 8F); + setRotation(BackPanel, 0F, 0F, 0F); + FrontPanel = new ModelRenderer(this, 0, 0); + FrontPanel.addBox(-10F, 0F, 0F, 20, 10, 2); + FrontPanel.setRotationPoint(0F, -8F, -10F); + setRotation(FrontPanel, 0F, 0F, 0F); + RightPanel = new ModelRenderer(this, 0, 35); + RightPanel.addBox(0F, 0F, -10F, 2, 8, 20); + RightPanel.setRotationPoint(-12F, -6F, 0F); + setRotation(RightPanel, 0F, 0F, 0F); + LeftPanel = new ModelRenderer(this, 24, 15); + LeftPanel.addBox(0F, 0F, -10F, 2, 8, 20); + LeftPanel.setRotationPoint(10F, -6F, 0F); + setRotation(LeftPanel, 0F, 0F, 0F); + BottomPanel = new ModelRenderer(this, 40, 43); + BottomPanel.addBox(-12F, 0F, -10F, 24, 1, 20); + BottomPanel.setRotationPoint(0F, 2F, 0F); + setRotation(BottomPanel, 0F, 0F, 0F); + RightHandle = new ModelRenderer(this, 92, 33); + RightHandle.addBox(0F, 0F, 0F, 16, 2, 2); + RightHandle.setRotationPoint(-28F, 0F, -7F); + setRotation(RightHandle, 0F, 0F, 0F); + LeftHandle = new ModelRenderer(this, 92, 38); + LeftHandle.addBox(0F, 0F, 0F, 16, 2, 2); + LeftHandle.setRotationPoint(-28F, 0F, 5F); + setRotation(LeftHandle, 0F, 0F, 0F); + RightSpokeUp = new ModelRenderer(this, 99, 3); + RightSpokeUp.addBox(-2F, -8F, 0F, 4, 6, 1); + RightSpokeUp.setRotationPoint(0F, 3F, -11F); + setRotation(RightSpokeUp, 0F, 0F, 0F); + RightSpokeRight = new ModelRenderer(this, 112, 15); + RightSpokeRight.addBox(2F, -2F, 0F, 6, 4, 1); + RightSpokeRight.setRotationPoint(0F, 3F, -11F); + setRotation(RightSpokeRight, 0F, 0F, 0F); + RightSpokeDown = new ModelRenderer(this, 99, 25); + RightSpokeDown.addBox(-2F, 2F, 0F, 4, 6, 1); + RightSpokeDown.setRotationPoint(0F, 3F, -11F); + setRotation(RightSpokeDown, 0F, 0F, 0F); + RightSpokeLeft = new ModelRenderer(this, 82, 15); + RightSpokeLeft.addBox(-8F, -2F, 0F, 6, 4, 1); + RightSpokeLeft.setRotationPoint(0F, 3F, -11F); + setRotation(RightSpokeLeft, 0F, 0F, 0F); + RightAxle = new ModelRenderer(this, 98, 14); + RightAxle.addBox(-2F, -2F, 0F, 4, 4, 2); + RightAxle.setRotationPoint(0F, 3F, -12F); + setRotation(RightAxle, 0F, 0F, 0F); + WheelRight1 = new ModelRenderer(this, 110, 3); + WheelRight1.addBox(2F, -7F, 0F, 2, 2, 1); + WheelRight1.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight1, 0F, 0F, 0F); + WheelRight2 = new ModelRenderer(this, 117, 5); + WheelRight2.addBox(4F, -6F, 0F, 2, 2, 1); + WheelRight2.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight2, 0F, 0F, 0F); + WheelRight3 = new ModelRenderer(this, 122, 9); + WheelRight3.addBox(5F, -4F, 0F, 2, 2, 1); + WheelRight3.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight3, 0F, 0F, 0F); + WheelRight4 = new ModelRenderer(this, 122, 23); + WheelRight4.addBox(5F, 2F, 0F, 2, 2, 1); + WheelRight4.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight4, 0F, 0F, 0F); + WheelRight5 = new ModelRenderer(this, 117, 27); + WheelRight5.addBox(4F, 4F, 0F, 2, 2, 1); + WheelRight5.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight5, 0F, 0F, 0F); + WheelRight6 = new ModelRenderer(this, 110, 29); + WheelRight6.addBox(2F, 5F, 0F, 2, 2, 1); + WheelRight6.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight6, 0F, 0F, 0F); + WheelRight7 = new ModelRenderer(this, 92, 29); + WheelRight7.addBox(-4F, 5F, 0F, 2, 2, 1); + WheelRight7.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight7, 0F, 0F, 0F); + WheelRight8 = new ModelRenderer(this, 85, 27); + WheelRight8.addBox(-6F, 4F, 0F, 2, 2, 1); + WheelRight8.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight8, 0F, 0F, 0F); + WheelRight9 = new ModelRenderer(this, 80, 23); + WheelRight9.addBox(-7F, 2F, 0F, 2, 2, 1); + WheelRight9.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight9, 0F, 0F, 0F); + WheelRight10 = new ModelRenderer(this, 80, 9); + WheelRight10.addBox(-7F, -4F, 0F, 2, 2, 1); + WheelRight10.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight10, 0F, 0F, 0F); + WheelRight11 = new ModelRenderer(this, 85, 5); + WheelRight11.addBox(-6F, -6F, 0F, 2, 2, 1); + WheelRight11.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight11, 0F, 0F, 0F); + WheelRight12 = new ModelRenderer(this, 92, 3); + WheelRight12.addBox(-4F, -7F, 0F, 2, 2, 1); + WheelRight12.setRotationPoint(0F, 3F, -11F); + setRotation(WheelRight12, 0F, 0F, 0F); + LeftSpokeRight = new ModelRenderer(this, 82, 15); + LeftSpokeRight.addBox(-8F, -2F, 0F, 6, 4, 1); + LeftSpokeRight.setRotationPoint(0F, 3F, 10F); + setRotation(LeftSpokeRight, 0F, 0F, 0F); + LeftSpokeLeft = new ModelRenderer(this, 112, 15); + LeftSpokeLeft.addBox(2F, -2F, 0F, 6, 4, 1); + LeftSpokeLeft.setRotationPoint(0F, 3F, 10F); + setRotation(LeftSpokeLeft, 0F, 0F, 0F); + LeftSpokeDown = new ModelRenderer(this, 99, 25); + LeftSpokeDown.addBox(-2F, 2F, 0F, 4, 6, 1); + LeftSpokeDown.setRotationPoint(0F, 3F, 10F); + setRotation(LeftSpokeDown, 0F, 0F, 0F); + LeftSpokeUp = new ModelRenderer(this, 99, 3); + LeftSpokeUp.addBox(-2F, -8F, 0F, 4, 6, 1); + LeftSpokeUp.setRotationPoint(0F, 3F, 10F); + setRotation(LeftSpokeUp, 0F, 0F, 0F); + LeftAxle = new ModelRenderer(this, 98, 14); + LeftAxle.addBox(-2F, -2F, 0F, 4, 4, 2); + LeftAxle.setRotationPoint(0F, 3F, 10F); + setRotation(LeftAxle, 0F, 0F, 0F); + WheelLeft1 = new ModelRenderer(this, 92, 3); + WheelLeft1.addBox(-4F, -7F, 0F, 2, 2, 1); + WheelLeft1.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft1, 0F, 0F, 0F); + WheelLeft2 = new ModelRenderer(this, 117, 5); + WheelLeft2.addBox(-6F, -6F, 0F, 2, 2, 1); + WheelLeft2.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft2, 0F, 0F, 0F); + WheelLeft3 = new ModelRenderer(this, 80, 9); + WheelLeft3.addBox(-7F, -4F, 0F, 2, 2, 1); + WheelLeft3.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft3, 0F, 0F, 0F); + WheelLeft4 = new ModelRenderer(this, 80, 23); + WheelLeft4.addBox(-7F, 2F, 0F, 2, 2, 1); + WheelLeft4.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft4, 0F, 0F, 0F); + WheelLeft5 = new ModelRenderer(this, 117, 27); + WheelLeft5.addBox(-6F, 4F, 0F, 2, 2, 1); + WheelLeft5.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft5, 0F, 0F, 0F); + WheelLeft6 = new ModelRenderer(this, 110, 29); + WheelLeft6.addBox(-4F, 5F, 0F, 2, 2, 1); + WheelLeft6.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft6, 0F, 0F, 0F); + WheelLeft7 = new ModelRenderer(this, 92, 29); + WheelLeft7.addBox(2F, 5F, 0F, 2, 2, 1); + WheelLeft7.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft7, 0F, 0F, 0F); + WheelLeft8 = new ModelRenderer(this, 85, 27); + WheelLeft8.addBox(4F, 4F, 0F, 2, 2, 1); + WheelLeft8.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft8, 0F, 0F, 0F); + WheelLeft9 = new ModelRenderer(this, 122, 23); + WheelLeft9.addBox(5F, 2F, 0F, 2, 2, 1); + WheelLeft9.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft9, 0F, 0F, 0F); + WheelLeft10 = new ModelRenderer(this, 122, 9); + WheelLeft10.addBox(5F, -4F, 0F, 2, 2, 1); + WheelLeft10.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft10, 0F, 0F, 0F); + WheelLeft11 = new ModelRenderer(this, 85, 5); + WheelLeft11.addBox(4F, -6F, 0F, 2, 2, 1); + WheelLeft11.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft11, 0F, 0F, 0F); + WheelLeft12 = new ModelRenderer(this, 110, 3); + WheelLeft12.addBox(2F, -7F, 0F, 2, 2, 1); + WheelLeft12.setRotationPoint(0F, 3F, 10F); + setRotation(WheelLeft12, 0F, 0F, 0F); + } + + 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); + BackPanel.render(f5); + FrontPanel.render(f5); + RightPanel.render(f5); + LeftPanel.render(f5); + BottomPanel.render(f5); + RightHandle.render(f5); + LeftHandle.render(f5); + RightSpokeUp.render(f5); + RightSpokeRight.render(f5); + RightSpokeDown.render(f5); + RightSpokeLeft.render(f5); + RightAxle.render(f5); + WheelRight1.render(f5); + WheelRight2.render(f5); + WheelRight3.render(f5); + WheelRight4.render(f5); + WheelRight5.render(f5); + WheelRight6.render(f5); + WheelRight7.render(f5); + WheelRight8.render(f5); + WheelRight9.render(f5); + WheelRight10.render(f5); + WheelRight11.render(f5); + WheelRight12.render(f5); + LeftSpokeRight.render(f5); + LeftSpokeLeft.render(f5); + LeftSpokeDown.render(f5); + LeftSpokeUp.render(f5); + LeftAxle.render(f5); + WheelLeft1.render(f5); + WheelLeft2.render(f5); + WheelLeft3.render(f5); + WheelLeft4.render(f5); + WheelLeft5.render(f5); + WheelLeft6.render(f5); + WheelLeft7.render(f5); + WheelLeft8.render(f5); + WheelLeft9.render(f5); + WheelLeft10.render(f5); + WheelLeft11.render(f5); + WheelLeft12.render(f5); + } + + private void setRotation (ModelRenderer model, float x, float y, float z) + { + model.rotateAngleX = x; + model.rotateAngleY = y; + model.rotateAngleZ = z; + } + + 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/tinker/tconstruct/client/ModelWagon.java b/tinker/tconstruct/client/ModelWagon.java new file mode 100644 index 00000000..ddaaa22f --- /dev/null +++ b/tinker/tconstruct/client/ModelWagon.java @@ -0,0 +1,458 @@ +package tinker.tconstruct.client; + +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; + +public class ModelWagon extends ModelBase +{ + ModelRenderer Bottom; + ModelRenderer Left; + ModelRenderer Right; + ModelRenderer Back; + ModelRenderer Front; + ModelRenderer Leftpull; + ModelRenderer Rightpull; + ModelRenderer LeftWheelAxle; + ModelRenderer LeftWCenterHbeam; + ModelRenderer LeftWCenterVtop; + ModelRenderer LeftWCenterVbottom; + ModelRenderer LeftWnwH; + ModelRenderer LeftWnwM; + ModelRenderer LeftWnwV; + ModelRenderer LeftWnwEye; + ModelRenderer LeftWneH; + ModelRenderer LeftWneM; + ModelRenderer LeftWneV; + ModelRenderer LeftWneEye; + ModelRenderer LeftWswH; + ModelRenderer LeftWswM; + ModelRenderer LeftWswV; + ModelRenderer LeftWswEye; + ModelRenderer LeftWseH; + ModelRenderer LeftWseM; + ModelRenderer LeftWseV; + ModelRenderer LeftWseEye; + ModelRenderer RightWheelAxle; + ModelRenderer RightWCenterHbeam; + ModelRenderer RightWCenterVtop; + ModelRenderer RightWCenterVbottom; + ModelRenderer RightWnwH; + ModelRenderer RightWnwM; + ModelRenderer RightWnwV; + ModelRenderer RightWnwEye; + ModelRenderer RoghtWneH; + ModelRenderer RightWneM; + ModelRenderer RightWneV; + ModelRenderer RightWneEye; + ModelRenderer RightWswH; + ModelRenderer RightWswM; + ModelRenderer RightWswV; + ModelRenderer RightWswEye; + ModelRenderer RightWseH; + ModelRenderer RightWseM; + ModelRenderer RightWseV; + public ModelRenderer RightWseEye; + ModelRenderer HandBrakeMain; + ModelRenderer HandbrakeJamb; + ModelRenderer StandCenterBar; + ModelRenderer StandLeft; + ModelRenderer StandRight; + + public ModelWagon() + { + this.textureWidth = 128; + this.textureHeight = 64; + this.Bottom = new ModelRenderer(this, 26, 46); + this.Bottom.addBox(0.0F, 0.0F, 0.0F, 20, 2, 16); + this.Bottom.setRotationPoint(-10.0F, 4.0F, -8.0F); + this.Bottom.setTextureSize(64, 32); + this.Bottom.mirror = true; + this.setRotation(this.Bottom, 0.0F, 0.0F, 0.0F); + this.Left = new ModelRenderer(this, 0, 35); + this.Left.addBox(0.0F, 0.0F, 0.0F, 20, 8, 2); + this.Left.setRotationPoint(-10.0F, -4.0F, -8.0F); + this.Left.setTextureSize(64, 32); + this.Left.mirror = true; + this.setRotation(this.Left, 0.0F, 0.0F, 0.0F); + this.Right = new ModelRenderer(this, 83, 35); + this.Right.addBox(0.0F, 0.0F, 0.0F, 20, 8, 2); + this.Right.setRotationPoint(-10.0F, -4.0F, 6.0F); + this.Right.setTextureSize(64, 32); + this.Right.mirror = true; + this.setRotation(this.Right, 0.0F, 0.0F, 0.0F); + this.Back = new ModelRenderer(this, 99, 46); + this.Back.addBox(-2.0F, -5.0F, 0.0F, 2, 5, 12); + this.Back.setRotationPoint(10.0F, 4.0F, -6.0F); + this.Back.setTextureSize(64, 32); + this.Back.mirror = true; + this.setRotation(this.Back, 0.0F, 0.0F, 0.0F); + this.Front = new ModelRenderer(this, 50, 1); + this.Front.addBox(0.0F, 0.0F, 0.0F, 2, 8, 12); + this.Front.setRotationPoint(-10.0F, -4.0F, -6.0F); + this.Front.setTextureSize(64, 32); + this.Front.mirror = true; + this.setRotation(this.Front, 0.0F, 0.0F, 0.0F); + this.Leftpull = new ModelRenderer(this, 0, 30); + this.Leftpull.addBox(0.0F, 0.0F, 0.0F, 16, 2, 2); + this.Leftpull.setRotationPoint(-26.0F, 2.0F, -6.0F); + this.Leftpull.setTextureSize(64, 32); + this.Leftpull.mirror = true; + this.setRotation(this.Leftpull, 0.0F, 0.0F, 0.0F); + this.Rightpull = new ModelRenderer(this, 91, 30); + this.Rightpull.addBox(0.0F, 0.0F, 0.0F, 16, 2, 2); + this.Rightpull.setRotationPoint(-26.0F, 2.0F, 4.0F); + this.Rightpull.setTextureSize(64, 32); + this.Rightpull.mirror = true; + this.setRotation(this.Rightpull, 0.0F, 0.0F, 0.0F); + this.HandBrakeMain = new ModelRenderer(this, 1, 59); + this.HandBrakeMain.addBox(-6.0F, 0.0F, 0.0F, 11, 1, 1); + this.HandBrakeMain.setRotationPoint(-9.0F, -3.0F, -9.0F); + this.HandBrakeMain.setTextureSize(64, 32); + this.HandBrakeMain.mirror = true; + this.setRotation(this.HandBrakeMain, 0.0F, 0.0F, 0.0F); + this.HandbrakeJamb = new ModelRenderer(this, 10, 62); + this.HandbrakeJamb.addBox(3.0F, 1.0F, 0.0F, 2, 1, 1); + this.HandbrakeJamb.setRotationPoint(-9.0F, -3.0F, -9.0F); + this.HandbrakeJamb.setTextureSize(64, 32); + this.HandbrakeJamb.mirror = true; + this.setRotation(this.HandbrakeJamb, 0.0F, 0.0F, 0.0F); + this.LeftWheelAxle = new ModelRenderer(this, 0, 12); + this.LeftWheelAxle.addBox(-1.0F, -1.0F, -1.0F, 2, 2, 3); + this.LeftWheelAxle.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWheelAxle.setTextureSize(64, 32); + this.LeftWheelAxle.mirror = true; + this.setRotation(this.LeftWheelAxle, 0.0F, 0.0F, 0.0F); + this.LeftWCenterHbeam = new ModelRenderer(this, 12, 12); + this.LeftWCenterHbeam.addBox(-8.0F, -2.0F, 0.0F, 16, 4, 1); + this.LeftWCenterHbeam.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWCenterHbeam.setTextureSize(64, 32); + this.LeftWCenterHbeam.mirror = true; + this.setRotation(this.LeftWCenterHbeam, 0.0F, 0.0F, 0.0F); + this.LeftWCenterVtop = new ModelRenderer(this, 18, 0); + this.LeftWCenterVtop.addBox(-2.0F, -8.0F, 0.0F, 4, 6, 1); + this.LeftWCenterVtop.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWCenterVtop.setTextureSize(64, 32); + this.LeftWCenterVtop.mirror = true; + this.setRotation(this.LeftWCenterVtop, 0.0F, 0.0F, 0.0F); + this.LeftWCenterVbottom = new ModelRenderer(this, 18, 22); + this.LeftWCenterVbottom.addBox(-2.0F, 2.0F, 0.0F, 4, 6, 1); + this.LeftWCenterVbottom.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWCenterVbottom.setTextureSize(64, 32); + this.LeftWCenterVbottom.mirror = true; + this.setRotation(this.LeftWCenterVbottom, 0.0F, 0.0F, 0.0F); + this.LeftWnwH = new ModelRenderer(this, 0, 7); + this.LeftWnwH.addBox(-7.0F, -4.0F, 0.0F, 3, 2, 1); + this.LeftWnwH.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWnwH.setTextureSize(64, 32); + this.LeftWnwH.mirror = true; + this.setRotation(this.LeftWnwH, 0.0F, 0.0F, 0.0F); + this.LeftWnwM = new ModelRenderer(this, 4, 3); + this.LeftWnwM.addBox(-6.0F, -6.0F, 0.0F, 2, 2, 1); + this.LeftWnwM.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWnwM.setTextureSize(64, 32); + this.LeftWnwM.mirror = true; + this.setRotation(this.LeftWnwM, 0.0F, 0.0F, 0.0F); + this.LeftWnwV = new ModelRenderer(this, 11, 1); + this.LeftWnwV.addBox(-4.0F, -7.0F, 0.0F, 2, 3, 1); + this.LeftWnwV.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWnwV.setTextureSize(64, 32); + this.LeftWnwV.mirror = true; + this.setRotation(this.LeftWnwV, 0.0F, 0.0F, 0.0F); + this.LeftWnwEye = new ModelRenderer(this, 10, 7); + this.LeftWnwEye.addBox(-4.0F, -4.0F, 0.0F, 1, 1, 1); + this.LeftWnwEye.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWnwEye.setTextureSize(64, 32); + this.LeftWnwEye.mirror = true; + this.setRotation(this.LeftWnwEye, 0.0F, 0.0F, 0.0F); + this.LeftWneH = new ModelRenderer(this, 40, 7); + this.LeftWneH.addBox(4.0F, -4.0F, 0.0F, 3, 2, 1); + this.LeftWneH.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWneH.setTextureSize(64, 32); + this.LeftWneH.mirror = true; + this.setRotation(this.LeftWneH, 0.0F, 0.0F, 0.0F); + this.LeftWneM = new ModelRenderer(this, 37, 3); + this.LeftWneM.addBox(4.0F, -6.0F, 0.0F, 2, 2, 1); + this.LeftWneM.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWneM.setTextureSize(64, 32); + this.LeftWneM.mirror = true; + this.setRotation(this.LeftWneM, 0.0F, 0.0F, 0.0F); + this.LeftWneV = new ModelRenderer(this, 29, 1); + this.LeftWneV.addBox(2.0F, -7.0F, 0.0F, 2, 3, 1); + this.LeftWneV.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWneV.setTextureSize(64, 32); + this.LeftWneV.mirror = true; + this.setRotation(this.LeftWneV, 0.0F, 0.0F, 0.0F); + this.LeftWneEye = new ModelRenderer(this, 33, 7); + this.LeftWneEye.addBox(3.0F, -4.0F, 0.0F, 1, 1, 1); + this.LeftWneEye.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWneEye.setTextureSize(64, 32); + this.LeftWneEye.mirror = true; + this.setRotation(this.LeftWneEye, 0.0F, 0.0F, 0.0F); + this.LeftWswH = new ModelRenderer(this, 0, 19); + this.LeftWswH.addBox(-7.0F, 2.0F, 0.0F, 3, 2, 1); + this.LeftWswH.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWswH.setTextureSize(64, 32); + this.LeftWswH.mirror = true; + this.setRotation(this.LeftWswH, 0.0F, 0.0F, 0.0F); + this.LeftWswM = new ModelRenderer(this, 4, 23); + this.LeftWswM.addBox(-6.0F, 4.0F, 0.0F, 2, 2, 1); + this.LeftWswM.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWswM.setTextureSize(64, 32); + this.LeftWswM.mirror = true; + this.setRotation(this.LeftWswM, 0.0F, 0.0F, 0.0F); + this.LeftWswV = new ModelRenderer(this, 11, 24); + this.LeftWswV.addBox(-4.0F, 4.0F, 0.0F, 2, 3, 1); + this.LeftWswV.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWswV.setTextureSize(64, 32); + this.LeftWswV.mirror = true; + this.setRotation(this.LeftWswV, 0.0F, 0.0F, 0.0F); + this.LeftWswEye = new ModelRenderer(this, 10, 20); + this.LeftWswEye.addBox(-4.0F, 3.0F, 0.0F, 1, 1, 1); + this.LeftWswEye.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWswEye.setTextureSize(64, 32); + this.LeftWswEye.mirror = true; + this.setRotation(this.LeftWswEye, 0.0F, 0.0F, 0.0F); + this.LeftWseH = new ModelRenderer(this, 40, 19); + this.LeftWseH.addBox(4.0F, 2.0F, 0.0F, 3, 2, 1); + this.LeftWseH.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWseH.setTextureSize(64, 32); + this.LeftWseH.mirror = true; + this.setRotation(this.LeftWseH, 0.0F, 0.0F, 0.0F); + this.LeftWseM = new ModelRenderer(this, 37, 23); + this.LeftWseM.addBox(4.0F, 4.0F, 0.0F, 2, 2, 1); + this.LeftWseM.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWseM.setTextureSize(64, 32); + this.LeftWseM.mirror = true; + this.setRotation(this.LeftWseM, 0.0F, 0.0F, 0.0F); + this.LeftWseV = new ModelRenderer(this, 29, 24); + this.LeftWseV.addBox(2.0F, 4.0F, 0.0F, 2, 3, 1); + this.LeftWseV.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWseV.setTextureSize(64, 32); + this.LeftWseV.mirror = true; + this.setRotation(this.LeftWseV, 0.0F, 0.0F, 0.0F); + this.LeftWseEye = new ModelRenderer(this, 33, 20); + this.LeftWseEye.addBox(3.0F, 3.0F, 0.0F, 1, 1, 1); + this.LeftWseEye.setRotationPoint(0.0F, 5.0F, -10.0F); + this.LeftWseEye.setTextureSize(64, 32); + this.LeftWseEye.mirror = true; + this.setRotation(this.LeftWseEye, 0.0F, 0.0F, 0.0F); + this.RightWheelAxle = new ModelRenderer(this, 117, 12); + this.RightWheelAxle.addBox(-1.0F, -1.0F, -1.0F, 2, 2, 3); + this.RightWheelAxle.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWheelAxle.setTextureSize(64, 32); + this.RightWheelAxle.mirror = true; + this.setRotation(this.RightWheelAxle, 0.0F, 0.0F, 0.0F); + this.RightWCenterHbeam = new ModelRenderer(this, 80, 12); + this.RightWCenterHbeam.addBox(-8.0F, -2.0F, 0.0F, 16, 4, 1); + this.RightWCenterHbeam.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWCenterHbeam.setTextureSize(64, 32); + this.RightWCenterHbeam.mirror = true; + this.setRotation(this.RightWCenterHbeam, 0.0F, 0.0F, 0.0F); + this.RightWCenterVtop = new ModelRenderer(this, 98, 0); + this.RightWCenterVtop.addBox(-2.0F, -8.0F, 0.0F, 4, 6, 1); + this.RightWCenterVtop.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWCenterVtop.setTextureSize(64, 32); + this.RightWCenterVtop.mirror = true; + this.setRotation(this.RightWCenterVtop, 0.0F, 0.0F, 0.0F); + this.RightWCenterVbottom = new ModelRenderer(this, 98, 22); + this.RightWCenterVbottom.addBox(-2.0F, 2.0F, 0.0F, 4, 6, 1); + this.RightWCenterVbottom.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWCenterVbottom.setTextureSize(64, 32); + this.RightWCenterVbottom.mirror = true; + this.setRotation(this.RightWCenterVbottom, 0.0F, 0.0F, 0.0F); + this.RightWnwH = new ModelRenderer(this, 79, 7); + this.RightWnwH.addBox(4.0F, -4.0F, 0.0F, 3, 2, 1); + this.RightWnwH.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWnwH.setTextureSize(64, 32); + this.RightWnwH.mirror = true; + this.setRotation(this.RightWnwH, 0.0F, 0.0F, 0.0F); + this.RightWnwM = new ModelRenderer(this, 84, 3); + this.RightWnwM.addBox(4.0F, -6.0F, 0.0F, 2, 2, 1); + this.RightWnwM.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWnwM.setTextureSize(64, 32); + this.RightWnwM.mirror = true; + this.setRotation(this.RightWnwM, 0.0F, 0.0F, 0.0F); + this.RightWnwV = new ModelRenderer(this, 91, 1); + this.RightWnwV.addBox(2.0F, -7.0F, 0.0F, 2, 3, 1); + this.RightWnwV.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWnwV.setTextureSize(64, 32); + this.RightWnwV.mirror = true; + this.setRotation(this.RightWnwV, 0.0F, 0.0F, 0.0F); + this.RightWnwEye = new ModelRenderer(this, 90, 7); + this.RightWnwEye.addBox(3.0F, -4.0F, 0.0F, 1, 1, 1); + this.RightWnwEye.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWnwEye.setTextureSize(64, 32); + this.RightWnwEye.mirror = true; + this.setRotation(this.RightWnwEye, 0.0F, 0.0F, 0.0F); + this.RoghtWneH = new ModelRenderer(this, 119, 7); + this.RoghtWneH.addBox(-7.0F, -4.0F, 0.0F, 3, 2, 1); + this.RoghtWneH.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RoghtWneH.setTextureSize(64, 32); + this.RoghtWneH.mirror = true; + this.setRotation(this.RoghtWneH, 0.0F, 0.0F, 0.0F); + this.RightWneM = new ModelRenderer(this, 116, 3); + this.RightWneM.addBox(-6.0F, -6.0F, 0.0F, 2, 2, 1); + this.RightWneM.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWneM.setTextureSize(64, 32); + this.RightWneM.mirror = true; + this.setRotation(this.RightWneM, 0.0F, 0.0F, 0.0F); + this.RightWneV = new ModelRenderer(this, 109, 1); + this.RightWneV.addBox(-4.0F, -7.0F, 0.0F, 2, 3, 1); + this.RightWneV.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWneV.setTextureSize(64, 32); + this.RightWneV.mirror = true; + this.setRotation(this.RightWneV, 0.0F, 0.0F, 0.0F); + this.RightWneEye = new ModelRenderer(this, 113, 7); + this.RightWneEye.addBox(-4.0F, -4.0F, 0.0F, 1, 1, 1); + this.RightWneEye.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWneEye.setTextureSize(64, 32); + this.RightWneEye.mirror = true; + this.setRotation(this.RightWneEye, 0.0F, 0.0F, 0.0F); + this.RightWswH = new ModelRenderer(this, 79, 19); + this.RightWswH.addBox(4.0F, 2.0F, 0.0F, 3, 2, 1); + this.RightWswH.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWswH.setTextureSize(64, 32); + this.RightWswH.mirror = true; + this.setRotation(this.RightWswH, 0.0F, 0.0F, 0.0F); + this.RightWswM = new ModelRenderer(this, 84, 23); + this.RightWswM.addBox(4.0F, 4.0F, 0.0F, 2, 2, 1); + this.RightWswM.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWswM.setTextureSize(64, 32); + this.RightWswM.mirror = true; + this.setRotation(this.RightWswM, 0.0F, 0.0F, 0.0F); + this.RightWswV = new ModelRenderer(this, 91, 24); + this.RightWswV.addBox(2.0F, 4.0F, 0.0F, 2, 3, 1); + this.RightWswV.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWswV.setTextureSize(64, 32); + this.RightWswV.mirror = true; + this.setRotation(this.RightWswV, 0.0F, 0.0F, 0.0F); + this.RightWswEye = new ModelRenderer(this, 90, 20); + this.RightWswEye.addBox(3.0F, 3.0F, 0.0F, 1, 1, 1); + this.RightWswEye.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWswEye.setTextureSize(64, 32); + this.RightWswEye.mirror = true; + this.setRotation(this.RightWswEye, 0.0F, 0.0F, 0.0F); + this.RightWseH = new ModelRenderer(this, 119, 19); + this.RightWseH.addBox(-7.0F, 2.0F, 0.0F, 3, 2, 1); + this.RightWseH.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWseH.setTextureSize(64, 32); + this.RightWseH.mirror = true; + this.setRotation(this.RightWseH, 0.0F, 0.0F, 0.0F); + this.RightWseM = new ModelRenderer(this, 116, 23); + this.RightWseM.addBox(-6.0F, 4.0F, 0.0F, 2, 2, 1); + this.RightWseM.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWseM.setTextureSize(64, 32); + this.RightWseM.mirror = true; + this.setRotation(this.RightWseM, 0.0F, 0.0F, 0.0F); + this.RightWseV = new ModelRenderer(this, 109, 24); + this.RightWseV.addBox(-4.0F, 4.0F, 0.0F, 2, 3, 1); + this.RightWseV.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWseV.setTextureSize(64, 32); + this.RightWseV.mirror = true; + this.setRotation(this.RightWseV, 0.0F, 0.0F, 0.0F); + this.RightWseEye = new ModelRenderer(this, 113, 20); + this.RightWseEye.addBox(-4.0F, 3.0F, 0.0F, 1, 1, 1); + this.RightWseEye.setRotationPoint(0.0F, 5.0F, 9.0F); + this.RightWseEye.setTextureSize(64, 32); + this.RightWseEye.mirror = true; + this.setRotation(this.RightWseEye, 0.0F, 0.0F, 0.0F); + this.StandCenterBar = new ModelRenderer(this, 47, 27); + this.StandCenterBar.addBox(-1.0F, 0.0F, -8.0F, 1, 2, 16); + this.StandCenterBar.setRotationPoint(-9.0F, 6.0F, 0.0F); + this.StandCenterBar.setTextureSize(64, 32); + this.StandCenterBar.mirror = true; + this.setRotation(this.StandCenterBar, 0.0F, 0.0F, 0.0F); + this.StandLeft = new ModelRenderer(this, 37, 27); + this.StandLeft.addBox(-1.0F, 2.0F, -8.0F, 1, 5, 2); + this.StandLeft.setRotationPoint(-9.0F, 6.0F, 0.0F); + this.StandLeft.setTextureSize(64, 32); + this.StandLeft.mirror = true; + this.setRotation(this.StandLeft, 0.0F, 0.0F, 0.0F); + this.StandRight = new ModelRenderer(this, 84, 27); + this.StandRight.addBox(-1.0F, 2.0F, 6.0F, 1, 5, 2); + this.StandRight.setRotationPoint(-9.0F, 6.0F, 0.0F); + this.StandRight.setTextureSize(64, 32); + this.StandRight.mirror = true; + this.setRotation(this.StandRight, 0.0F, 0.0F, 0.0F); + } + + /** + * Sets the models various rotation angles then renders the model. + */ + @Override + public void render(Entity var1, float var2, float var3, float var4, float var5, float var6, float var7) + { + super.render(var1, var2, var3, var4, var5, var6, var7); + this.setRotationAngles(var2, var3, var4, var5, var6, var7, var1); + this.LeftWheelAxle.rotateAngleZ = this.LeftWCenterHbeam.rotateAngleZ = this.LeftWCenterVtop.rotateAngleZ = this.LeftWCenterVbottom.rotateAngleZ = this.LeftWnwH.rotateAngleZ = this.LeftWnwM.rotateAngleZ = this.LeftWnwV.rotateAngleZ = this.LeftWnwEye.rotateAngleZ = this.LeftWneH.rotateAngleZ = this.LeftWneM.rotateAngleZ = this.LeftWneV.rotateAngleZ = this.LeftWneEye.rotateAngleZ = this.LeftWswH.rotateAngleZ = this.LeftWswM.rotateAngleZ = this.LeftWswV.rotateAngleZ = this.LeftWswEye.rotateAngleZ = this.LeftWseH.rotateAngleZ = this.LeftWseM.rotateAngleZ = this.LeftWseV.rotateAngleZ = this.LeftWseEye.rotateAngleZ = this.RightWheelAxle.rotateAngleZ = this.RightWCenterHbeam.rotateAngleZ = this.RightWCenterVtop.rotateAngleZ = this.RightWCenterVbottom.rotateAngleZ = this.RightWnwH.rotateAngleZ = this.RightWnwM.rotateAngleZ = this.RightWnwV.rotateAngleZ = this.RightWnwEye.rotateAngleZ = this.RoghtWneH.rotateAngleZ = this.RightWneM.rotateAngleZ = this.RightWneV.rotateAngleZ = this.RightWneEye.rotateAngleZ = this.RightWswH.rotateAngleZ = this.RightWswM.rotateAngleZ = this.RightWswV.rotateAngleZ = this.RightWswEye.rotateAngleZ = this.RightWseH.rotateAngleZ = this.RightWseM.rotateAngleZ = this.RightWseV.rotateAngleZ = this.RightWseEye.rotateAngleZ; + this.Bottom.render(var7); + this.Left.render(var7); + this.Right.render(var7); + this.Back.render(var7); + this.Front.render(var7); + this.Leftpull.render(var7); + this.Rightpull.render(var7); + this.HandBrakeMain.render(var7); + this.HandbrakeJamb.render(var7); + this.LeftWheelAxle.render(var7); + this.LeftWCenterHbeam.render(var7); + this.LeftWCenterVtop.render(var7); + this.LeftWCenterVbottom.render(var7); + this.LeftWnwH.render(var7); + this.LeftWnwM.render(var7); + this.LeftWnwV.render(var7); + this.LeftWnwEye.render(var7); + this.LeftWneH.render(var7); + this.LeftWneM.render(var7); + this.LeftWneV.render(var7); + this.LeftWneEye.render(var7); + this.LeftWswH.render(var7); + this.LeftWswM.render(var7); + this.LeftWswV.render(var7); + this.LeftWswEye.render(var7); + this.LeftWseH.render(var7); + this.LeftWseM.render(var7); + this.LeftWseV.render(var7); + this.LeftWseEye.render(var7); + this.RightWheelAxle.render(var7); + this.RightWCenterHbeam.render(var7); + this.RightWCenterVtop.render(var7); + this.RightWCenterVbottom.render(var7); + this.RightWnwH.render(var7); + this.RightWnwM.render(var7); + this.RightWnwV.render(var7); + this.RightWnwEye.render(var7); + this.RoghtWneH.render(var7); + this.RightWneM.render(var7); + this.RightWneV.render(var7); + this.RightWneEye.render(var7); + this.RightWswH.render(var7); + this.RightWswM.render(var7); + this.RightWswV.render(var7); + this.RightWswEye.render(var7); + this.RightWseH.render(var7); + this.RightWseM.render(var7); + this.RightWseV.render(var7); + this.RightWseEye.render(var7); + this.StandCenterBar.render(var7); + this.StandLeft.render(var7); + this.StandRight.render(var7); + } + + private void setRotation(ModelRenderer var1, float var2, float var3, float var4) + { + var1.rotateAngleX = var2; + var1.rotateAngleY = var3; + var1.rotateAngleZ = var4; + } + + /** + * Sets the models various rotation angles. + */ + @Override + public void setRotationAngles(float var1, float var2, float var3, float var4, float var5, float var6, Entity par7Entity) + { + super.setRotationAngles(var1, var2, var3, var4, var5, var6, par7Entity); + } +} diff --git a/tinker/tconstruct/client/SuperCustomToolRenderer.java b/tinker/tconstruct/client/SuperCustomToolRenderer.java new file mode 100644 index 00000000..e10f35c3 --- /dev/null +++ b/tinker/tconstruct/client/SuperCustomToolRenderer.java @@ -0,0 +1,534 @@ +package tinker.tconstruct.client; + +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.FIRST_PERSON_MAP; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.RenderPlayer; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemMap; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import net.minecraft.world.storage.MapData; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.MinecraftForgeClient; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.client.TextureFXManager; + +public class SuperCustomToolRenderer implements IItemRenderer +{ + RenderEngine renderEngine; + RenderManager renderManager; + Random random; + float par9 = 0; + + public SuperCustomToolRenderer() + { + renderEngine = Minecraft.getMinecraft().renderEngine;//RenderManager.instance.renderEngine; + renderManager = renderManager.instance; + random = new Random(); + } + + @Override + public boolean handleRenderType (ItemStack item, ItemRenderType type) + { + return true; + } + + @Override + public boolean shouldUseRenderHelper (ItemRenderType type, ItemStack item, ItemRendererHelper helper) + { + if (type == ItemRenderType.EQUIPPED || (type == ItemRenderType.ENTITY && helper == ItemRendererHelper.ENTITY_BOBBING)) + return true; + else + return false; + } + + @Override + public void renderItem (ItemRenderType type, ItemStack item, Object... data) + { + if (type == ItemRenderType.INVENTORY) + renderInventoryItem(item, (RenderBlocks) data[0]); + if (type == ItemRenderType.EQUIPPED) + renderEquippedItem(item, (RenderBlocks) data[0], (EntityLiving) data[1]); + if (type == ItemRenderType.ENTITY) + renderEntityItem(item, (RenderBlocks) data[0], (EntityItem) data[1]); + } + + /* Inventory */ + void renderInventoryItem (ItemStack stack, RenderBlocks renderer) + { + int var6 = stack.itemID; + int var7 = stack.getItemDamage(); + int var8 = stack.getIconIndex(); + float var16; + + int par4 = 0; //What are these? + int par5 = 0; + + GL11.glDisable(GL11.GL_LIGHTING); + renderEngine.bindTexture(renderEngine.getTexture(Item.itemsList[var6].getTextureFile())); + + for (int renderPass = 0; renderPass < Item.itemsList[var6].getRenderPasses(var7); ++renderPass) + { + int var10 = Item.itemsList[var6].getIconIndex(stack, renderPass); + int var11 = Item.itemsList[var6].getColorFromItemStack(stack, renderPass); + float var12 = (float) (var11 >> 16 & 255) / 255.0F; + float var13 = (float) (var11 >> 8 & 255) / 255.0F; + float var14 = (float) (var11 & 255) / 255.0F; + + /*if (this.field_77024_a) + { + GL11.glColor4f(var12, var13, var14, 1.0F); + }*/ + + this.renderTexturedQuad(par4, par5, var10 % 16 * 16, var10 / 16 * 16, 16, 16); + } + + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_CULL_FACE); + } + + double zLevel = 50; + + /** + * Adds a textured quad to the tesselator at the specified position with the specified texture coords, width and + * height. Args: x, y, u, v, width, height + */ + public void renderTexturedQuad (int x, int y, int u, int v, int width, int height) + { + float var7 = 0.00390625F; + float var8 = 0.00390625F; + Tessellator var9 = Tessellator.instance; + var9.startDrawingQuads(); + var9.addVertexWithUV((double) (x + 0), (double) (y + height), (double) this.zLevel, (double) ((float) (u + 0) * var7), (double) ((float) (v + height) * var8)); + var9.addVertexWithUV((double) (x + width), (double) (y + height), (double) this.zLevel, (double) ((float) (u + width) * var7), (double) ((float) (v + height) * var8)); + var9.addVertexWithUV((double) (x + width), (double) (y + 0), (double) this.zLevel, (double) ((float) (u + width) * var7), (double) ((float) (v + 0) * var8)); + var9.addVertexWithUV((double) (x + 0), (double) (y + 0), (double) this.zLevel, (double) ((float) (u + 0) * var7), (double) ((float) (v + 0) * var8)); + var9.draw(); + } + + boolean shouldSpreadItems () + { + return true; + } + + /* Equipped */ + void renderEquippedItem (ItemStack stack, RenderBlocks renderer, EntityLiving living) + { + for (int x = 0; x < stack.getItem().getRenderPasses(stack.getItemDamage()); x++) + { + this.doRenderEquippedItem(stack, living, x); + } + } + + void doRenderEquippedItem (ItemStack stack, EntityLiving living, int pass) + { + GL11.glPushMatrix(); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, renderEngine.getTexture(stack.getItem().getTextureFile())); + + Tessellator var5 = Tessellator.instance; + int var6 = living.getItemIcon(stack, pass); + float var7 = ((float) (var6 % 16 * 16) + 0.0F) / 256.0F; + float var8 = ((float) (var6 % 16 * 16) + 15.99F) / 256.0F; + float var9 = ((float) (var6 / 16 * 16) + 0.0F) / 256.0F; + float var10 = ((float) (var6 / 16 * 16) + 15.99F) / 256.0F; + float var11 = 0.0F; + float var12 = 0.3F; + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glTranslatef(-var11, -var12, 0.0F); + float var13 = 1.5F; + GL11.glScalef(var13, var13, var13); + GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(-1.1875f, 0.25F, 0.45F); //Edited to position properly + renderItemIn2D(var5, var8, var9, var7, var10, 0.0625F); + + if (stack != null && stack.hasEffect()) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + renderEngine.bindTexture(renderEngine.getTexture("%blur%/misc/glint.png")); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float var14 = 0.76F; + GL11.glColor4f(0.5F * var14, 0.25F * var14, 0.8F * var14, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float var15 = 0.125F; + GL11.glScalef(var15, var15, var15); + float var16 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(var16, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + renderItemIn2D(var5, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(var15, var15, var15); + var16 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-var16, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + renderItemIn2D(var5, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + + GL11.glPopMatrix(); + } + + public void doRenderItem (EntityLiving par1EntityLiving, ItemStack par2ItemStack, int par3) + { + + GL11.glBindTexture(GL11.GL_TEXTURE_2D, renderEngine.getTexture(par2ItemStack.getItem().getTextureFile())); + + Tessellator var5 = Tessellator.instance; + int var6 = par1EntityLiving.getItemIcon(par2ItemStack, par3); + float var7 = ((float) (var6 % 16 * 16) + 0.0F) / 256.0F; + float var8 = ((float) (var6 % 16 * 16) + 15.99F) / 256.0F; + float var9 = ((float) (var6 / 16 * 16) + 0.0F) / 256.0F; + float var10 = ((float) (var6 / 16 * 16) + 15.99F) / 256.0F; + float var11 = 0.0F; + float var12 = 0.3F; + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glTranslatef(-var11, -var12, 0.0F); + float var13 = 1.5F; + /*GL11.glScalef(var13, var13, var13); + GL11.glRotatef(50.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(335.0F, 0.0F, 0.0F, 1.0F); + GL11.glTranslatef(-0.9375F, -0.0625F, 0.0F);*/ + renderItemIn2D(var5, var8, var9, var7, var10, 0.0625F); + + /*if (par2ItemStack != null && par2ItemStack.hasEffect() && par3 == 0) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + renderEngine.bindTexture(renderEngine.getTexture("%blur%/misc/glint.png")); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float var14 = 0.76F; + GL11.glColor4f(0.5F * var14, 0.25F * var14, 0.8F * var14, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float var15 = 0.125F; + GL11.glScalef(var15, var15, var15); + float var16 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(var16, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + renderItemIn2D(var5, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(var15, var15, var15); + var16 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-var16, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + renderItemIn2D(var5, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + }*/ + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + + GL11.glPopMatrix(); + } + + public static void renderItemIn2D (Tessellator par0Tessellator, float par1, float par2, float par3, float par4, float par5) + { + float var6 = 1.0F; + par0Tessellator.startDrawingQuads(); + par0Tessellator.setNormal(0.0F, 0.0F, 1.0F); + par0Tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double) par1, (double) par4); + par0Tessellator.addVertexWithUV((double) var6, 0.0D, 0.0D, (double) par3, (double) par4); + par0Tessellator.addVertexWithUV((double) var6, 1.0D, 0.0D, (double) par3, (double) par2); + par0Tessellator.addVertexWithUV(0.0D, 1.0D, 0.0D, (double) par1, (double) par2); + par0Tessellator.draw(); + par0Tessellator.startDrawingQuads(); + par0Tessellator.setNormal(0.0F, 0.0F, -1.0F); + par0Tessellator.addVertexWithUV(0.0D, 1.0D, (double) (0.0F - par5), (double) par1, (double) par2); + par0Tessellator.addVertexWithUV((double) var6, 1.0D, (double) (0.0F - par5), (double) par3, (double) par2); + par0Tessellator.addVertexWithUV((double) var6, 0.0D, (double) (0.0F - par5), (double) par3, (double) par4); + par0Tessellator.addVertexWithUV(0.0D, 0.0D, (double) (0.0F - par5), (double) par1, (double) par4); + par0Tessellator.draw(); + par0Tessellator.startDrawingQuads(); + par0Tessellator.setNormal(-1.0F, 0.0F, 0.0F); + int var7; + float var8; + float var9; + float var10; + + int tileSize = TextureFXManager.instance().getTextureDimensions(GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D)).width / 16; + + float tx = 1.0f / (32 * tileSize); + float tz = 1.0f / tileSize; + + for (var7 = 0; var7 < tileSize; ++var7) + { + var8 = (float) var7 / tileSize; + var9 = par1 + (par3 - par1) * var8 - tx; + var10 = var6 * var8; + par0Tessellator.addVertexWithUV((double) var10, 0.0D, (double) (0.0F - par5), (double) var9, (double) par4); + par0Tessellator.addVertexWithUV((double) var10, 0.0D, 0.0D, (double) var9, (double) par4); + par0Tessellator.addVertexWithUV((double) var10, 1.0D, 0.0D, (double) var9, (double) par2); + par0Tessellator.addVertexWithUV((double) var10, 1.0D, (double) (0.0F - par5), (double) var9, (double) par2); + } + + par0Tessellator.draw(); + par0Tessellator.startDrawingQuads(); + par0Tessellator.setNormal(1.0F, 0.0F, 0.0F); + + for (var7 = 0; var7 < tileSize; ++var7) + { + var8 = (float) var7 / tileSize; + var9 = par1 + (par3 - par1) * var8 - tx; + var10 = var6 * var8 + tz; + par0Tessellator.addVertexWithUV((double) var10, 1.0D, (double) (0.0F - par5), (double) var9, (double) par2); + par0Tessellator.addVertexWithUV((double) var10, 1.0D, 0.0D, (double) var9, (double) par2); + par0Tessellator.addVertexWithUV((double) var10, 0.0D, 0.0D, (double) var9, (double) par4); + par0Tessellator.addVertexWithUV((double) var10, 0.0D, (double) (0.0F - par5), (double) var9, (double) par4); + } + + par0Tessellator.draw(); + par0Tessellator.startDrawingQuads(); + par0Tessellator.setNormal(0.0F, 1.0F, 0.0F); + + for (var7 = 0; var7 < tileSize; ++var7) + { + var8 = (float) var7 / tileSize; + var9 = par4 + (par2 - par4) * var8 - tx; + var10 = var6 * var8 + tz; + par0Tessellator.addVertexWithUV(0.0D, (double) var10, 0.0D, (double) par1, (double) var9); + par0Tessellator.addVertexWithUV((double) var6, (double) var10, 0.0D, (double) par3, (double) var9); + par0Tessellator.addVertexWithUV((double) var6, (double) var10, (double) (0.0F - par5), (double) par3, (double) var9); + par0Tessellator.addVertexWithUV(0.0D, (double) var10, (double) (0.0F - par5), (double) par1, (double) var9); + } + + par0Tessellator.draw(); + par0Tessellator.startDrawingQuads(); + par0Tessellator.setNormal(0.0F, -1.0F, 0.0F); + + for (var7 = 0; var7 < tileSize; ++var7) + { + var8 = (float) var7 / tileSize; + var9 = par4 + (par2 - par4) * var8 - tx; + var10 = var6 * var8; + par0Tessellator.addVertexWithUV((double) var6, (double) var10, 0.0D, (double) par3, (double) var9); + par0Tessellator.addVertexWithUV(0.0D, (double) var10, 0.0D, (double) par1, (double) var9); + par0Tessellator.addVertexWithUV(0.0D, (double) var10, (double) (0.0F - par5), (double) par1, (double) var9); + par0Tessellator.addVertexWithUV((double) var6, (double) var10, (double) (0.0F - par5), (double) par3, (double) var9); + } + + par0Tessellator.draw(); + } + + /* Entity */ + void renderEntityItem (ItemStack stack, RenderBlocks renderer, EntityItem entity) + { + this.random.setSeed(187L); + ItemStack var10 = entity.func_92014_d(); + + if (var10.getItem() != null) + { + GL11.glPushMatrix(); + float var11 = shouldBob() ? MathHelper.sin(((float) entity.age + par9) / 10.0F + entity.hoverStart) * 0.1F + 0.1F : 0F; + float var12 = (((float) entity.age + par9) / 20.0F + entity.hoverStart) * (180F / (float) Math.PI); + byte var13 = getMiniBlockCountForItemStack(var10); + + //GL11.glTranslatef((float) par2, (float) par4 + var11, (float) par6); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + int var16; + float var19; + float var20; + float var24; + + int var15; + float var17; + + for (var15 = 0; var15 <= var10.getItem().getRenderPasses(var10.getItemDamage()); ++var15) + { + renderEngine.bindTexture(renderEngine.getTexture(Item.itemsList[var10.itemID].getTextureFile())); + this.random.setSeed(187L); + var16 = var10.getItem().getIconIndex(var10, var15); + var17 = 1.0F; + + int var18 = Item.itemsList[var10.itemID].getColorFromItemStack(var10, var15); + var19 = (float) (var18 >> 16 & 255) / 255.0F; + var20 = (float) (var18 >> 8 & 255) / 255.0F; + float var21 = (float) (var18 & 255) / 255.0F; + GL11.glColor4f(var19 * var17, var20 * var17, var21 * var17, 1.0F); + this.func_77020_a(entity, var16, var13, par9, var19 * var17, var20 * var17, var21 * var17); + } + + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } + } + + boolean shouldBob () + { + return true; + } + + public byte getMiniBlockCountForItemStack (ItemStack stack) + { + byte var13 = 1; + if (stack.stackSize > 1) + { + var13 = 2; + } + + if (stack.stackSize > 5) + { + var13 = 3; + } + + if (stack.stackSize > 20) + { + var13 = 4; + } + + if (stack.stackSize > 40) + { + var13 = 5; + } + return var13; + } + + private void func_77020_a (EntityItem par1EntityItem, int par2, int par3, float par4, float par5, float par6, float par7) + { + Tessellator var8 = Tessellator.instance; + float var9 = (float) (par2 % 16 * 16 + 0) / 256.0F; + float var10 = (float) (par2 % 16 * 16 + 16) / 256.0F; + float var11 = (float) (par2 / 16 * 16 + 0) / 256.0F; + float var12 = (float) (par2 / 16 * 16 + 16) / 256.0F; + float var13 = 1.0F; + float var14 = 0.5F; + float var15 = 0.25F; + float var17; + + if (this.renderManager.options.fancyGraphics) + { + GL11.glPushMatrix(); + + GL11.glRotatef((((float) par1EntityItem.age + par4) / 20.0F + par1EntityItem.hoverStart) * (180F / (float) Math.PI), 0.0F, 1.0F, 0.0F); + + float var16 = 0.0625F; + var17 = 0.021875F; + ItemStack var18 = par1EntityItem.func_92014_d(); + int var19 = var18.stackSize; + byte var24 = getMiniBlockCountForItemStack(var18); + + GL11.glTranslatef(-var14, -var15, -((var16 + var17) * (float) var24 / 2.0F)); + + for (int var20 = 0; var20 < var24; ++var20) + { + // Makes items offset when in 3D, like when in 2D, looks much better. Considered a vanilla bug... + if (var20 > 0 && shouldSpreadItems()) + { + float x = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; + float y = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; + float z = (random.nextFloat() * 2.0F - 1.0F) * 0.3F / 0.5F; + GL11.glTranslatef(x, y, var16 + var17); + } + else + { + GL11.glTranslatef(0f, 0f, var16 + var17); + } + + renderEngine.bindTexture(renderEngine.getTexture(Item.itemsList[var18.itemID].getTextureFile())); + + GL11.glColor4f(par5, par6, par7, 1.0F); + ItemRenderer.renderItemIn2D(var8, var10, var11, var9, var12, var16); + + if (var18 != null && var18.hasEffect()) + { + GL11.glDepthFunc(GL11.GL_EQUAL); + GL11.glDisable(GL11.GL_LIGHTING); + this.renderManager.renderEngine.bindTexture(this.renderManager.renderEngine.getTexture("%blur%/misc/glint.png")); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); + float var21 = 0.76F; + GL11.glColor4f(0.5F * var21, 0.25F * var21, 0.8F * var21, 1.0F); + GL11.glMatrixMode(GL11.GL_TEXTURE); + GL11.glPushMatrix(); + float var22 = 0.125F; + GL11.glScalef(var22, var22, var22); + float var23 = (float) (Minecraft.getSystemTime() % 3000L) / 3000.0F * 8.0F; + GL11.glTranslatef(var23, 0.0F, 0.0F); + GL11.glRotatef(-50.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, var16); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glScalef(var22, var22, var22); + var23 = (float) (Minecraft.getSystemTime() % 4873L) / 4873.0F * 8.0F; + GL11.glTranslatef(-var23, 0.0F, 0.0F); + GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); + ItemRenderer.renderItemIn2D(var8, 0.0F, 0.0F, 1.0F, 1.0F, 0.0625F); + GL11.glPopMatrix(); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDepthFunc(GL11.GL_LEQUAL); + } + } + + GL11.glPopMatrix(); + } + else + { + for (int var25 = 0; var25 < par3; ++var25) + { + GL11.glPushMatrix(); + + if (var25 > 0) + { + var17 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; + float var27 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; + float var26 = (this.random.nextFloat() * 2.0F - 1.0F) * 0.3F; + GL11.glTranslatef(var17, var27, var26); + } + + if (!false) + { + GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + } + + GL11.glColor4f(par5, par6, par7, 1.0F); + var8.startDrawingQuads(); + var8.setNormal(0.0F, 1.0F, 0.0F); + var8.addVertexWithUV((double) (0.0F - var14), (double) (0.0F - var15), 0.0D, (double) var9, (double) var12); + var8.addVertexWithUV((double) (var13 - var14), (double) (0.0F - var15), 0.0D, (double) var10, (double) var12); + var8.addVertexWithUV((double) (var13 - var14), (double) (1.0F - var15), 0.0D, (double) var10, (double) var11); + var8.addVertexWithUV((double) (0.0F - var14), (double) (1.0F - var15), 0.0D, (double) var9, (double) var11); + var8.draw(); + GL11.glPopMatrix(); + } + } + } +} diff --git a/tinker/tconstruct/client/TProxyClient.java b/tinker/tconstruct/client/TProxyClient.java index 7e86ac7f..77af8760 100644 --- a/tinker/tconstruct/client/TProxyClient.java +++ b/tinker/tconstruct/client/TProxyClient.java @@ -21,25 +21,10 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerBlockHandler(new FrypanRender()); //RenderingRegistry.registerBlockHandler(new AxleRender()); - MinecraftForgeClient.preloadTexture(TConstructContent.craftingTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.baseHeads); - MinecraftForgeClient.preloadTexture(TConstructContent.baseAccessories); - MinecraftForgeClient.preloadTexture(TConstructContent.patternTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.swordparts); - MinecraftForgeClient.preloadTexture(TConstructContent.jokeparts); - - MinecraftForgeClient.preloadTexture(TConstructContent.pickaxeTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.broadswordTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.shovelTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.axeTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.longswordTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.rapierTexture); - - MinecraftForgeClient.preloadTexture(TConstructContent.frypanTexture); - MinecraftForgeClient.preloadTexture(TConstructContent.signTexture); MinecraftForgeClient.preloadTexture(TConstructContent.blockTexture); + MinecraftForgeClient.registerItemRenderer(TConstructContent.pickaxe.itemID, new SuperCustomToolRenderer()); - RenderingRegistry.registerEntityRenderingHandler(tinker.tconstruct.entity.EntityWagon.class, new RenderWagon()); + RenderingRegistry.registerEntityRenderingHandler(tinker.tconstruct.entity.CartEntity.class, new CartRender()); } diff --git a/tinker/tconstruct/client/gui/PartCrafterChestContainer.java b/tinker/tconstruct/client/gui/PartCrafterChestContainer.java index 80730dc0..e4a7c3b3 100644 --- a/tinker/tconstruct/client/gui/PartCrafterChestContainer.java +++ b/tinker/tconstruct/client/gui/PartCrafterChestContainer.java @@ -74,13 +74,11 @@ public class PartCrafterChestContainer extends PartCrafterContainer if (slotStack.stackSize == 0) { slot.putStack((ItemStack)null); + logic.tryBuildPart(slotID); } - else - { - slot.onSlotChanged(); - } + slot.onSlotChanged(); } - + System.out.println("Returning stack"); return stack; } } diff --git a/tinker/tconstruct/client/gui/PartCrafterContainer.java b/tinker/tconstruct/client/gui/PartCrafterContainer.java index 4ec0e0f3..97742e2f 100644 --- a/tinker/tconstruct/client/gui/PartCrafterContainer.java +++ b/tinker/tconstruct/client/gui/PartCrafterContainer.java @@ -75,11 +75,9 @@ public class PartCrafterContainer extends Container if (slotStack.stackSize == 0) { slot.putStack((ItemStack)null); + logic.tryBuildPart(slotID); } - else - { - slot.onSlotChanged(); - } + slot.onSlotChanged(); } return stack; diff --git a/tinker/tconstruct/client/gui/SlotPartBuilder.java b/tinker/tconstruct/client/gui/SlotPartBuilder.java new file mode 100644 index 00000000..ea127c4f --- /dev/null +++ b/tinker/tconstruct/client/gui/SlotPartBuilder.java @@ -0,0 +1,19 @@ +package tinker.tconstruct.client.gui; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class SlotPartBuilder extends Slot +{ + + public SlotPartBuilder(IInventory inv, int index, int posX, int posY) + { + super(inv, index, posX, posY); + } + + protected void onCrafting(ItemStack par1ItemStack, int par2) + { + + } +} diff --git a/tinker/tconstruct/entity/EntityWagon.java b/tinker/tconstruct/entity/CartEntity.java similarity index 78% rename from tinker/tconstruct/entity/EntityWagon.java rename to tinker/tconstruct/entity/CartEntity.java index 28d1ab1a..dd3ebd92 100644 --- a/tinker/tconstruct/entity/EntityWagon.java +++ b/tinker/tconstruct/entity/CartEntity.java @@ -3,6 +3,9 @@ package tinker.tconstruct.entity; import java.util.ArrayList; import java.util.List; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + import net.minecraft.block.Block; import net.minecraft.block.BlockRail; import net.minecraft.entity.Entity; @@ -23,14 +26,12 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.IMinecartCollisionHandler; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.minecart.MinecartCollisionEvent; -import net.minecraftforge.event.entity.minecart.MinecartInteractEvent; -import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class EntityWagon extends Entity implements IInventory +public class CartEntity extends Entity + implements IInventory, IEntityAdditionalSpawnData { /** Array of item stacks stored in minecart (for storage minecarts). */ protected ItemStack[] cargoItems; @@ -38,7 +39,7 @@ public class EntityWagon extends Entity implements IInventory protected boolean field_70499_f; /** The type of minecart, 2 for powered, 1 for storage. */ - public int minecartType; + private int pullcartType; public double pushX; public double pushZ; protected boolean field_82345_h; @@ -70,7 +71,6 @@ public class EntityWagon extends Entity implements IInventory public static double defaultDragAir = 0.94999998807907104D; protected boolean canUseRail = true; protected boolean canBePushed = true; - private static IMinecartCollisionHandler collisionHandler = null; /* Instance versions of the above physics properties */ protected float maxSpeedRail; @@ -78,8 +78,10 @@ public class EntityWagon extends Entity implements IInventory protected float maxSpeedAirLateral; protected float maxSpeedAirVertical; protected double dragAir; + + Entity entityFollowing; - public EntityWagon(World par1World) + public CartEntity(World par1World) { super(par1World); this.cargoItems = new ItemStack[36]; @@ -89,6 +91,7 @@ public class EntityWagon extends Entity implements IInventory this.preventEntitySpawning = true; this.setSize(0.98F, 0.7F); this.yOffset = this.height / 2.0F; + this.stepHeight = 1.0f; maxSpeedRail = defaultMaxSpeedRail; maxSpeedGround = defaultMaxSpeedGround; @@ -97,10 +100,24 @@ public class EntityWagon extends Entity implements IInventory dragAir = defaultDragAir; } - public EntityWagon(World world, int type) + public CartEntity(World world, int type) { this(world); - minecartType = type; + pullcartType = type; + } + + public CartEntity(World world, double x, double y, double z, int type) + { + this(world); + this.setPosition(x, y + (double)this.yOffset, z); + this.motionX = 0.0D; + this.motionY = 0.0D; + this.motionZ = 0.0D; + this.prevPosX = x; + this.prevPosY = y; + this.prevPosZ = z; + this.pullcartType = type; + this.stepHeight = 1.0f; } /** @@ -145,19 +162,6 @@ public class EntityWagon extends Entity implements IInventory return canBePushed; } - public EntityWagon(World par1World, double par2, double par4, double par6, int par8) - { - this(par1World); - this.setPosition(par2, par4 + (double)this.yOffset, par6); - this.motionX = 0.0D; - this.motionY = 0.0D; - this.motionZ = 0.0D; - this.prevPosX = par2; - this.prevPosY = par4; - this.prevPosZ = par6; - this.minecartType = par8; - } - /** * Returns the Y offset from the entity's position for any entity riding this one. */ @@ -290,7 +294,6 @@ public class EntityWagon extends Entity implements IInventory */ public void onUpdate() { - if (this.func_70496_j() > 0) { this.func_70497_h(this.func_70496_j() - 1); @@ -306,7 +309,7 @@ public class EntityWagon extends Entity implements IInventory this.kill(); } - if (this.isMinecartPowered() && this.rand.nextInt(4) == 0 && minecartType == 2 && getClass() == EntityWagon.class) + if (this.isMinecartPowered() && this.rand.nextInt(4) == 0 && pullcartType == 2 && getClass() == CartEntity.class) { this.worldObj.spawnParticle("largesmoke", this.posX, this.posY + 0.8D, this.posZ, 0.0D, 0.0D, 0.0D); } @@ -404,196 +407,9 @@ public class EntityWagon extends Entity implements IInventory double var6 = 0.0078125D; int var8 = this.worldObj.getBlockId(var45, var2, var47); - /*if (canUseRail() && BlockRail.isRailBlock(var8)) - { - this.fallDistance = 0.0F; - Vec3 var9 = this.func_70489_a(this.posX, this.posY, this.posZ); - int var10 = ((BlockRail)Block.blocksList[var8]).getBasicRailMetadata(worldObj, this, var45, var2, var47); - this.posY = (double)var2; - boolean var11 = false; - boolean var12 = false; - - if (var8 == Block.railPowered.blockID) - { - var11 = (worldObj.getBlockMetadata(var45, var2, var47) & 8) != 0; - var12 = !var11; - } - - if (((BlockRail)Block.blocksList[var8]).isPowered()) - { - var10 &= 7; - } - - if (var10 >= 2 && var10 <= 5) - { - this.posY = (double)(var2 + 1); - } - - adjustSlopeVelocities(var10); - - int[][] var13 = matrix[var10]; - double var14 = (double)(var13[1][0] - var13[0][0]); - double var16 = (double)(var13[1][2] - var13[0][2]); - double var18 = Math.sqrt(var14 * var14 + var16 * var16); - double var20 = this.motionX * var14 + this.motionZ * var16; - - if (var20 < 0.0D) - { - var14 = -var14; - var16 = -var16; - } - - double var22 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.motionX = var22 * var14 / var18; - this.motionZ = var22 * var16 / var18; - double var24; - double var26; - - if (this.riddenByEntity != null) - { - var24 = this.riddenByEntity.motionX * this.riddenByEntity.motionX + this.riddenByEntity.motionZ * this.riddenByEntity.motionZ; - var26 = this.motionX * this.motionX + this.motionZ * this.motionZ; - - if (var24 > 1.0E-4D && var26 < 0.01D) - { - this.motionX += this.riddenByEntity.motionX * 0.1D; - this.motionZ += this.riddenByEntity.motionZ * 0.1D; - var12 = false; - } - } - - if (var12 && shouldDoRailFunctions()) - { - var24 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - - if (var24 < 0.03D) - { - this.motionX *= 0.0D; - this.motionY *= 0.0D; - this.motionZ *= 0.0D; - } - else - { - this.motionX *= 0.5D; - this.motionY *= 0.0D; - this.motionZ *= 0.5D; - } - } - - var24 = 0.0D; - var26 = (double)var45 + 0.5D + (double)var13[0][0] * 0.5D; - double var28 = (double)var47 + 0.5D + (double)var13[0][2] * 0.5D; - double var30 = (double)var45 + 0.5D + (double)var13[1][0] * 0.5D; - double var32 = (double)var47 + 0.5D + (double)var13[1][2] * 0.5D; - var14 = var30 - var26; - var16 = var32 - var28; - double var34; - double var36; - - if (var14 == 0.0D) - { - this.posX = (double)var45 + 0.5D; - var24 = this.posZ - (double)var47; - } - else if (var16 == 0.0D) - { - this.posZ = (double)var47 + 0.5D; - var24 = this.posX - (double)var45; - } - else - { - var34 = this.posX - var26; - var36 = this.posZ - var28; - var24 = (var34 * var14 + var36 * var16) * 2.0D; - } - - this.posX = var26 + var14 * var24; - this.posZ = var28 + var16 * var24; - this.setPosition(this.posX, this.posY + (double)this.yOffset, this.posZ); - - moveMinecartOnRail(var45, var2, var47); - - if (var13[0][1] != 0 && MathHelper.floor_double(this.posX) - var45 == var13[0][0] && MathHelper.floor_double(this.posZ) - var47 == var13[0][2]) - { - this.setPosition(this.posX, this.posY + (double)var13[0][1], this.posZ); - } - else if (var13[1][1] != 0 && MathHelper.floor_double(this.posX) - var45 == var13[1][0] && MathHelper.floor_double(this.posZ) - var47 == var13[1][2]) - { - this.setPosition(this.posX, this.posY + (double)var13[1][1], this.posZ); - } - - applyDragAndPushForces(); - - Vec3 var54 = this.func_70489_a(this.posX, this.posY, this.posZ); - - if (var54 != null && var9 != null) - { - double var39 = (var9.yCoord - var54.yCoord) * 0.05D; - var22 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - - if (var22 > 0.0D) - { - this.motionX = this.motionX / var22 * (var22 + var39); - this.motionZ = this.motionZ / var22 * (var22 + var39); - } - - this.setPosition(this.posX, var54.yCoord, this.posZ); - } - - int var53 = MathHelper.floor_double(this.posX); - int var55 = MathHelper.floor_double(this.posZ); - - if (var53 != var45 || var55 != var47) - { - var22 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - this.motionX = var22 * (double)(var53 - var45); - this.motionZ = var22 * (double)(var55 - var47); - } - - double var41; - - updatePushForces(); - - if(shouldDoRailFunctions()) - { - ((BlockRail)Block.blocksList[var8]).onMinecartPass(worldObj, this, var45, var2, var47); - } - - if (var11 && shouldDoRailFunctions()) - { - var41 = Math.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ); - - if (var41 > 0.01D) - { - double var43 = 0.06D; - this.motionX += this.motionX / var41 * var43; - this.motionZ += this.motionZ / var41 * var43; - } - else if (var10 == 1) - { - if (this.worldObj.isBlockNormalCube(var45 - 1, var2, var47)) - { - this.motionX = 0.02D; - } - else if (this.worldObj.isBlockNormalCube(var45 + 1, var2, var47)) - { - this.motionX = -0.02D; - } - } - else if (var10 == 0) - { - if (this.worldObj.isBlockNormalCube(var45, var2, var47 - 1)) - { - this.motionZ = 0.02D; - } - else if (this.worldObj.isBlockNormalCube(var45, var2, var47 + 1)) - { - this.motionZ = -0.02D; - } - } - } - }*/ moveMinecartOffRail(var45, var2, var47); + if (entityFollowing != null) + moveTowardsEntity(entityFollowing); this.doBlockCollisions(); this.rotationPitch = 0.0F; @@ -630,7 +446,7 @@ public class EntityWagon extends Entity implements IInventory { Entity var17 = (Entity)var15.get(var52); - if (var17 != this.riddenByEntity && var17.canBePushed() && var17 instanceof EntityWagon) + if (var17 != this.riddenByEntity && var17.canBePushed() && var17 instanceof CartEntity) { var17.applyEntityCollision(this); } @@ -650,6 +466,95 @@ public class EntityWagon extends Entity implements IInventory updateFuel(); } } + + void moveTowardsEntity(Entity entity) + { + //System.out.println("Moving towards entity"); + /*double distX = this.posX - entity.posX; + double distZ = this.posZ - entity.posZ; + //posY = posY + 0.1; + + if (entity.posY > this.posY) + motionY += 0.1; + if (distX > 0.5 && distZ > 0.5) + { + motionX = -distX; + motionZ = -distZ; + }*/ + + double var15 = entity.posX; + double var19 = entity.posZ; + + if (this.calculateDistance(this.prevPosX, var15) > 1.5D || this.calculateDistance(this.prevPosZ, var19) > 1.5D) + { + double var28 = this.prevPosX; + double var30 = this.prevPosZ; + double var36 = this.calculateDistance(var28, var15); + double var38 = this.calculateDistance(var30, var19); + double var40 = 1.0D; + double var42 = 1.0D; + double var46; + double var44; + + if (var36 > var38) + { + var46 = 1.0D; + var44 = var38 / var36; + var42 = var44 / 3.0D; + var40 = var46 / 3.0D; + } + else if (var38 > var36) + { + var44 = 1.0D; + var46 = var36 / var38; + var40 = var46 / 3.0D; + var42 = var44 / 3.0D; + } + + if (var15 > var28) + { + this.motionX = var40;// * var26; + } + else + { + this.motionX = -var40;// * var26; + } + + if (var19 > var30) + { + this.motionZ = var42;// * var26; + } + else + { + this.motionZ = -var42;// * var26; + } + } + + /*if (entity.posY > this.posY) + motionY += 0.1;*/ + } + + public double calculateDistance(double pos1, double pos2) + { + double distance = Math.abs(pos1 - pos2); //0.0D; + /*double absPos1 = Math.abs(pos1); + double absPos2 = Math.abs(pos2); + + if ((pos1 <= 0.0D || pos2 <= 0.0D) && (pos1 >= 0.0D || pos2 >= 0.0D)) + { + distance = absPos1 + absPos2; + } + else if (absPos1 > absPos2) + { + distance = absPos1 - absPos2; + } + else if (absPos2 > absPos1) + { + distance = absPos2 - absPos1; + }*/ + + return distance; + } @SideOnly(Side.CLIENT) public Vec3 func_70495_a(double par1, double par3, double par5, double par7) @@ -745,9 +650,10 @@ public class EntityWagon extends Entity implements IInventory /** * (abstract) Protected helper method to write subclass entity data to NBT. */ + @Override protected void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) { - par1NBTTagCompound.setInteger("Type", this.minecartType); + par1NBTTagCompound.setInteger("Type", pullcartType); if (isPoweredCart()) { @@ -778,10 +684,11 @@ public class EntityWagon extends Entity implements IInventory /** * (abstract) Protected helper method to read subclass entity data from NBT. */ + @Override protected void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) { - this.minecartType = par1NBTTagCompound.getInteger("Type"); - + pullcartType = par1NBTTagCompound.getInteger("Type"); + if (isPoweredCart()) { this.pushX = par1NBTTagCompound.getDouble("PushX"); @@ -817,7 +724,7 @@ public class EntityWagon extends Entity implements IInventory @SideOnly(Side.CLIENT) public float getShadowSize() { - return 0.0F; + return 0.5F; } /** @@ -859,7 +766,7 @@ public class EntityWagon extends Entity implements IInventory var2 *= 0.5D; var4 *= 0.5D; - if (par1Entity instanceof EntityWagon) + if (par1Entity instanceof CartEntity) { double var10 = par1Entity.posX - this.posX; double var12 = par1Entity.posZ - this.posZ; @@ -867,7 +774,7 @@ public class EntityWagon extends Entity implements IInventory Vec3 var15 = this.worldObj.getWorldVec3Pool().getVecFromPool((double)MathHelper.cos(this.rotationYaw * (float)Math.PI / 180.0F), 0.0D, (double)MathHelper.sin(this.rotationYaw * (float)Math.PI / 180.0F)).normalize(); double var16 = Math.abs(var14.dotProduct(var15)); - if (var16 < 0.800000011920929D) + if (var16 < 0.8D) { return; } @@ -875,7 +782,7 @@ public class EntityWagon extends Entity implements IInventory double var18 = par1Entity.motionX + this.motionX; double var20 = par1Entity.motionZ + this.motionZ; - if (((EntityWagon)par1Entity).isPoweredCart() && !isPoweredCart()) + if (((CartEntity)par1Entity).isPoweredCart() && !isPoweredCart()) { this.motionX *= 0.20000000298023224D; this.motionZ *= 0.20000000298023224D; @@ -883,7 +790,7 @@ public class EntityWagon extends Entity implements IInventory par1Entity.motionX *= 0.949999988079071D; par1Entity.motionZ *= 0.949999988079071D; } - else if (!((EntityWagon)par1Entity).isPoweredCart() && isPoweredCart()) + else if (!((CartEntity)par1Entity).isPoweredCart() && isPoweredCart()) { par1Entity.motionX *= 0.20000000298023224D; par1Entity.motionZ *= 0.20000000298023224D; @@ -918,7 +825,7 @@ public class EntityWagon extends Entity implements IInventory */ public int getSizeInventory() { - return (minecartType == 1 && getClass() == EntityWagon.class ? 27 : 0); + return (pullcartType == 1 && getClass() == CartEntity.class ? 27 : 0); } /** @@ -1019,44 +926,59 @@ public class EntityWagon extends Entity implements IInventory /** * Called when a player interacts with a mob. e.g. gets milk from a cow, gets into the saddle on a pig. */ - public boolean interact(EntityPlayer par1EntityPlayer) + public boolean interact(EntityPlayer player) { - + if (player.isSneaking()) + { + if (entityFollowing == null) + { + entityFollowing = player; + //if (!worldObj.isRemote) + //player.addChatMessage("The cart is following you"); + } + else + { + entityFollowing = null; + //if (!worldObj.isRemote) + //player.addChatMessage("The cart has stopped following you"); + } + return true; + } if (canBeRidden()) { - if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != par1EntityPlayer) + if (this.riddenByEntity != null && this.riddenByEntity instanceof EntityPlayer && this.riddenByEntity != player) { return true; } if (!this.worldObj.isRemote) { - par1EntityPlayer.mountEntity(this); + player.mountEntity(this); } } else if (getSizeInventory() > 0) { if (!this.worldObj.isRemote) { - par1EntityPlayer.displayGUIChest(this); + player.displayGUIChest(this); } } - else if (this.minecartType == 2 && getClass() == EntityWagon.class) + else if (this.pullcartType == 2 && getClass() == CartEntity.class) { - ItemStack var2 = par1EntityPlayer.inventory.getCurrentItem(); + ItemStack var2 = player.inventory.getCurrentItem(); if (var2 != null && var2.itemID == Item.coal.itemID) { if (--var2.stackSize == 0) { - par1EntityPlayer.inventory.setInventorySlotContents(par1EntityPlayer.inventory.currentItem, (ItemStack)null); + player.inventory.setInventorySlotContents(player.inventory.currentItem, (ItemStack)null); } this.fuel += 3600; } - this.pushX = this.posX - par1EntityPlayer.posX; - this.pushZ = this.posZ - par1EntityPlayer.posZ; + this.pushX = this.posX - player.posX; + this.pushZ = this.posZ - player.posZ; } return true; @@ -1185,10 +1107,10 @@ public class EntityWagon extends Entity implements IInventory */ public List getItemsDropped() { - List items = new ArrayList(); + /*List items = new ArrayList(); items.add(new ItemStack(Item.minecartEmpty)); - switch(minecartType) + switch(cartType) { case 1: items.add(new ItemStack(Block.chest)); @@ -1197,7 +1119,8 @@ public class EntityWagon extends Entity implements IInventory items.add(new ItemStack(Block.stoneOvenIdle)); break; } - return items; + return items;*/ + return new ArrayList(); } /** @@ -1219,7 +1142,7 @@ public class EntityWagon extends Entity implements IInventory */ public boolean isPoweredCart() { - return minecartType == 2 && getClass() == EntityWagon.class; + return pullcartType == 2 && getClass() == CartEntity.class; } /** @@ -1230,7 +1153,7 @@ public class EntityWagon extends Entity implements IInventory */ public boolean isStorageCart() { - return minecartType == 1 && getClass() == EntityWagon.class; + return pullcartType == 1 && getClass() == CartEntity.class; } /** @@ -1239,7 +1162,7 @@ public class EntityWagon extends Entity implements IInventory */ public boolean canBeRidden() { - if(minecartType == 0 && getClass() == EntityWagon.class) + if(pullcartType == 0 && getClass() == CartEntity.class) { return true; } @@ -1253,7 +1176,7 @@ public class EntityWagon extends Entity implements IInventory */ public boolean canUseRail() { - return canUseRail; + return false; } /** @@ -1279,9 +1202,9 @@ public class EntityWagon extends Entity implements IInventory * Simply returns the minecartType variable. * @return minecartType */ - public int getMinecartType() + public int getCartType() { - return minecartType; + return pullcartType; } /** @@ -1489,4 +1412,18 @@ public class EntityWagon extends Entity implements IInventory { dragAir = value; } + + @Override + public void writeSpawnData (ByteArrayDataOutput data) + { + data.writeInt(pullcartType); + + } + + @Override + public void readSpawnData (ByteArrayDataInput data) + { + pullcartType = data.readInt(); + + } } diff --git a/tinker/tconstruct/entity/FakeBlockEntity.java b/tinker/tconstruct/entity/FakeBlockEntity.java new file mode 100644 index 00000000..a568c8d8 --- /dev/null +++ b/tinker/tconstruct/entity/FakeBlockEntity.java @@ -0,0 +1,51 @@ +package tinker.tconstruct.entity; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; + +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; + +public class FakeBlockEntity extends Entity + implements IEntityAdditionalSpawnData +{ + + public FakeBlockEntity(World world) + { + super(world); + preventEntitySpawning = true; + } + + @Override + protected void entityInit () + { + + } + + @Override + public void writeSpawnData (ByteArrayDataOutput data) + { + + } + + @Override + public void readSpawnData (ByteArrayDataInput data) + { + + } + + @Override + protected void readEntityFromNBT (NBTTagCompound var1) + { + + } + + @Override + protected void writeEntityToNBT (NBTTagCompound var1) + { + + } + +} diff --git a/tinker/tconstruct/logic/PartCrafterLogic.java b/tinker/tconstruct/logic/PartCrafterLogic.java index d9a1deff..2368ea82 100644 --- a/tinker/tconstruct/logic/PartCrafterLogic.java +++ b/tinker/tconstruct/logic/PartCrafterLogic.java @@ -49,11 +49,16 @@ public class PartCrafterLogic extends InventoryLogic } //Called when emptying a slot, not when another item is placed in it - public ItemStack decrStackSize (int slot, int quantity) + public ItemStack decrStackSize (int slotID, int quantity) { - ItemStack returnStack = super.decrStackSize(slot, quantity); - - if (slot == 4 || slot == 5) + ItemStack returnStack = super.decrStackSize(slotID, quantity); + tryBuildPart(slotID); + return returnStack; + } + + public void tryBuildPart(int slotID) + { + if (slotID == 4 || slotID == 5) { if (!craftedTop) { @@ -77,7 +82,7 @@ public class PartCrafterLogic extends InventoryLogic if (!craftedTop) buildTopPart(); - if (slot == 6 || slot == 7) + if (slotID == 6 || slotID == 7) { if (!craftedBottom) { @@ -100,8 +105,6 @@ public class PartCrafterLogic extends InventoryLogic if (!craftedBottom) buildBottomPart(); - - return returnStack; } //Called when a slot has something placed into it.