aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorkekzdealer <kekzdealer@gmail.com>2020-06-22 16:58:17 +0200
committerkekzdealer <kekzdealer@gmail.com>2020-06-22 16:58:17 +0200
commit14a94d72d860e590bf9731a9a3d1ce89d7592f24 (patch)
tree752ab66c0f5107de5ba0b40e76dbaeff27c57fe8 /src/main
parent8d5175f8845ff593ff46d54e10de57559a43b37e (diff)
downloadGT5-Unofficial-14a94d72d860e590bf9731a9a3d1ce89d7592f24.tar.gz
GT5-Unofficial-14a94d72d860e590bf9731a9a3d1ce89d7592f24.tar.bz2
GT5-Unofficial-14a94d72d860e590bf9731a9a3d1ce89d7592f24.zip
added textures for hex tiles, fixed hex tile name, fixed hex tile recipe
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/common/Recipes.java10
-rw-r--r--src/main/java/common/blocks/Block_LargeHexPlate.java10
-rw-r--r--src/main/resources/assets/kekztech/lang/en_US.lang2
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.pngbin0 -> 212902 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.pngbin0 -> 194679 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.pngbin0 -> 188252 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.pngbin0 -> 202085 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.pngbin0 -> 203604 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.pngbin0 -> 202723 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.pngbin0 -> 184021 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.pngbin0 -> 185686 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.pngbin0 -> 183484 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.pngbin0 -> 189460 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.pngbin0 -> 205600 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.pngbin0 -> 197674 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.pngbin0 -> 193911 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.pngbin0 -> 205189 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.pngbin0 -> 198508 bytes
-rw-r--r--src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.pngbin0 -> 202600 bytes
19 files changed, 13 insertions, 9 deletions
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 5255d4dbb2..90aca7b09e 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -600,14 +600,14 @@ public class Recipes {
// Hex Tiles
final ItemStack[] hexTiles = {
GT_Utility.getIntegratedCircuit(6),
- GT_OreDictUnificator.get(OrePrefixes.block, Materials.Concrete, 4),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 4),
- GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 8)
+ GT_OreDictUnificator.get(OrePrefixes.stone, Materials.Concrete, 1),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1),
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.DarkSteel, 2)
};
GT_Values.RA.addAssemblerRecipe(
hexTiles,
- FluidRegistry.getFluidStack("molten.plastic", 144),
- new ItemStack(Blocks.largeHexPlate, 8),
+ FluidRegistry.getFluidStack("molten.plastic", 36),
+ new ItemStack(Blocks.largeHexPlate, 2),
600, 120);
}
}
diff --git a/src/main/java/common/blocks/Block_LargeHexPlate.java b/src/main/java/common/blocks/Block_LargeHexPlate.java
index c046c3a9ab..8bdad56323 100644
--- a/src/main/java/common/blocks/Block_LargeHexPlate.java
+++ b/src/main/java/common/blocks/Block_LargeHexPlate.java
@@ -41,12 +41,16 @@ public class Block_LargeHexPlate extends Block {
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
+ final int xMod = x >= 0 ? Math.abs(x % BATCH_SIZE) : Math.abs((Math.abs(x) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ final int yMod = y >= 0 ? Math.abs(y % BATCH_SIZE) : Math.abs((Math.abs(y) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ final int zMod = z >= 0 ? Math.abs(z % BATCH_SIZE) : Math.abs((Math.abs(z) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+
if(side == 0 || side == 1) {
- return parts[Math.abs(x % BATCH_SIZE)][Math.abs(z % BATCH_SIZE)];
+ return parts[xMod][zMod];
} else if(side == 2 || side == 3) {
- return parts[Math.abs(x % BATCH_SIZE)][Math.abs(y % BATCH_SIZE)];
+ return parts[xMod][yMod];
} else {
- return parts[Math.abs(z % BATCH_SIZE)][Math.abs(y % BATCH_SIZE)];
+ return parts[zMod][yMod];
}
}
diff --git a/src/main/resources/assets/kekztech/lang/en_US.lang b/src/main/resources/assets/kekztech/lang/en_US.lang
index 92021f3ec9..f4a97bd101 100644
--- a/src/main/resources/assets/kekztech/lang/en_US.lang
+++ b/src/main/resources/assets/kekztech/lang/en_US.lang
@@ -173,4 +173,4 @@ tile.kekztech_spaceelevatorcapacitor_block.desc=The see-through is good for your
tile.kekztech_spaceelevatortether_block.name=Space Elevator Tether
# -------- Cosmetic Blocks
-tile.kekztech_largehexttile_block=Large Hex Tile \ No newline at end of file
+tile.kekztech_largehextile_block=Large Hex Tile \ No newline at end of file
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.png
new file mode 100644
index 0000000000..066845e231
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.png
new file mode 100644
index 0000000000..7da38a599a
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.png
new file mode 100644
index 0000000000..b71361b6e6
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.png
new file mode 100644
index 0000000000..6dde5d88ce
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.png
new file mode 100644
index 0000000000..c59f06e48b
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.png
new file mode 100644
index 0000000000..15ada67d51
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.png
new file mode 100644
index 0000000000..fa7cb6610d
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.png
new file mode 100644
index 0000000000..9802f4c45f
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.png
new file mode 100644
index 0000000000..b96eae723e
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.png
new file mode 100644
index 0000000000..30023e5987
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.png
new file mode 100644
index 0000000000..496fb235cb
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.png
new file mode 100644
index 0000000000..03544d84d1
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.png
new file mode 100644
index 0000000000..cc9a5f89da
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.png
new file mode 100644
index 0000000000..2586c16072
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.png
new file mode 100644
index 0000000000..7bc5006d3d
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.png
Binary files differ
diff --git a/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.png b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.png
new file mode 100644
index 0000000000..2966ccb079
--- /dev/null
+++ b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.png
Binary files differ