* Fix render bug with repeaters, add repeater item

ReMinecraftPE · Apr 8, 2024 · 855def5 · 855def5
1 parent 711461d
commit 855def5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 16 deletions.
diff --git a/platforms/windows/projects/World/World.vcxproj b/platforms/windows/projects/World/World.vcxproj
@@ -464,7 +464,7 @@
     <ClInclude Include="$(MC_ROOT)\source\world\entity\Creeper.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\entity\Pig.hpp" />
     <ClInclude Include="$(MC_ROOT)\source\world\entity\Rocket.hpp" />
-    <ClInclude Include="..\..\..\..\source\world\item\RedstoneItem.hpp" />
+    <ClInclude Include="..\..\..\..\source\world\item\RepeaterItem.hpp" />
     <ClInclude Include="..\..\..\..\source\world\tile\ButtonTile.hpp" />
     <ClInclude Include="..\..\..\..\source\world\tile\DiodeTile.hpp" />
     <ClInclude Include="..\..\..\..\source\world\tile\LeverTile.hpp" />

diff --git a/platforms/windows/projects/World/World.vcxproj.filters b/platforms/windows/projects/World/World.vcxproj.filters
@@ -826,11 +826,11 @@
     <ClInclude Include="..\..\..\..\source\world\tile\ButtonTile.hpp">
       <Filter>Header Files\Tile</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\source\world\item\RedstoneItem.hpp">
-      <Filter>Header Files\Item</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\source\world\tile\DiodeTile.hpp">
       <Filter>Header Files\Tile</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\source\world\item\RepeaterItem.hpp">
+      <Filter>Header Files\Item</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/source/client/renderer/TileRenderer.cpp b/source/client/renderer/TileRenderer.cpp
@@ -1666,8 +1666,8 @@ bool TileRenderer::tesselateDiodeInWorld(Tile* tile, int x, int y, int z)
 		case 3:
 			v4x = v1x = float(x + 0);
 			v3x = v2x = float(x + 1);
-			v4z = v3z = float(x + 0);
-			v2z = v1z = float(x + 1);
+			v4z = v3z = float(z + 0);
+			v2z = v1z = float(z + 1);
 			break;
 		case 1:
 			v4x = v1x = float(x + 1);

diff --git a/source/world/item/Inventory.cpp b/source/world/item/Inventory.cpp
@@ -87,8 +87,7 @@ void Inventory::prepareCreativeInventory()
 	addCreativeItem(Tile::button->m_ID);
 	addCreativeItem(Tile::plate_stone->m_ID);
 	addCreativeItem(Tile::plate_wood->m_ID);
-	addCreativeItem(Tile::repeater_off->m_ID);
-	addCreativeItem(Tile::repeater_on->m_ID);
+	addCreativeItem(Item::diode->m_itemID);
 
 	for (int i = 0; i < C_MAX_HOTBAR_ITEMS; i++)
 		m_hotbar[i] = i;

diff --git a/source/world/item/Item.cpp b/source/world/item/Item.cpp
@@ -15,6 +15,8 @@
 #include "RocketItem.hpp"
 #include "RedstoneItem.hpp"
 
+#include "world/tile/Tile.hpp"
+
 #define ITEM(x) ((x) - 256)
 
 #define NEW_ITEM(id) (new Item(ITEM(id)))
@@ -159,7 +161,7 @@ void Item::initItems()
 		->setIcon(9, 3)
 		->setDescriptionId("clay");
 
-	Item::reeds = NEW_X_ITEM(TilePlanterItem, ITEM_REEDS, TILE_REEDS)
+	Item::reeds = NEW_X_ITEM(TilePlanterItem, ITEM_REEDS, Tile::reeds->m_ID)
 		->setIcon(11, 1)
 		->setDescriptionId("reeds");
 
@@ -204,6 +206,10 @@ void Item::initItems()
 	Item::redStone = NEW_X_ITEMN(RedstoneItem, ITEM_REDSTONE)
 		->setIcon(8, 3)
 		->setDescriptionId("redstone");
+
+	Item::diode = NEW_X_ITEM(TilePlanterItem, ITEM_DIODE, Tile::repeater_off->m_ID) // Yeah, I found that weird too.
+		->setIcon(6, 5)
+		->setDescriptionId("diode");
 }
 
 int Item::getIcon(ItemInstance* pInstance)

diff --git a/source/world/tile/DiodeTile.cpp b/source/world/tile/DiodeTile.cpp
@@ -182,13 +182,6 @@ bool DiodeTile::isSolidRender()
 
 int DiodeTile::getResource(int data, Random* random)
 {
-	// TODO: Remove once done
-#ifndef _DEBUG
-#error bruh
-#endif
-	if (!Item::diode)
-		return 0;
-
 	return Item::diode->m_itemID;
 }