From 14a94d72d860e590bf9731a9a3d1ce89d7592f24 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Mon, 22 Jun 2020 16:58:17 +0200 Subject: added textures for hex tiles, fixed hex tile name, fixed hex tile recipe --- src/main/java/common/Recipes.java | 10 +++++----- src/main/java/common/blocks/Block_LargeHexPlate.java | 10 +++++++--- src/main/resources/assets/kekztech/lang/en_US.lang | 2 +- .../kekztech/textures/blocks/LargeHexTile_0_0.png | Bin 0 -> 212902 bytes .../kekztech/textures/blocks/LargeHexTile_0_1.png | Bin 0 -> 194679 bytes .../kekztech/textures/blocks/LargeHexTile_0_2.png | Bin 0 -> 188252 bytes .../kekztech/textures/blocks/LargeHexTile_0_3.png | Bin 0 -> 202085 bytes .../kekztech/textures/blocks/LargeHexTile_1_0.png | Bin 0 -> 203604 bytes .../kekztech/textures/blocks/LargeHexTile_1_1.png | Bin 0 -> 202723 bytes .../kekztech/textures/blocks/LargeHexTile_1_2.png | Bin 0 -> 184021 bytes .../kekztech/textures/blocks/LargeHexTile_1_3.png | Bin 0 -> 185686 bytes .../kekztech/textures/blocks/LargeHexTile_2_0.png | Bin 0 -> 183484 bytes .../kekztech/textures/blocks/LargeHexTile_2_1.png | Bin 0 -> 189460 bytes .../kekztech/textures/blocks/LargeHexTile_2_2.png | Bin 0 -> 205600 bytes .../kekztech/textures/blocks/LargeHexTile_2_3.png | Bin 0 -> 197674 bytes .../kekztech/textures/blocks/LargeHexTile_3_0.png | Bin 0 -> 193911 bytes .../kekztech/textures/blocks/LargeHexTile_3_1.png | Bin 0 -> 205189 bytes .../kekztech/textures/blocks/LargeHexTile_3_2.png | Bin 0 -> 198508 bytes .../kekztech/textures/blocks/LargeHexTile_3_3.png | Bin 0 -> 202600 bytes 19 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.png create mode 100644 src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.png (limited to 'src/main') 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_0.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_1.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_2.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_0_3.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_0.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_1.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_2.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_1_3.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_0.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_1.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_2.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_2_3.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_0.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_1.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_2.png 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 Binary files /dev/null and b/src/main/resources/assets/kekztech/textures/blocks/LargeHexTile_3_3.png differ -- cgit