Merge remote-tracking branch 'origin/develop' into develop

PoiCraft · Jan 14, 2023 · 7f48435 · 7f48435
2 parents 0408312 + 9e6114d
commit 7f48435
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/LiteLoader/include/llapi/mc/Recipes.hpp b/LiteLoader/include/llapi/mc/Recipes.hpp
@@ -13,6 +13,7 @@
 #include "RecipeIngredient.hpp"
 #include "Item.hpp"
 #include "Block.hpp"
+#include  "HashedString.hpp"
 
 #undef BEFORE_EXTRA
 
@@ -25,23 +26,47 @@ class Recipes {
 #define AFTER_EXTRA
 // Add Member There
 public:
+public:
+struct FurnaceRecipeKey {
+public:
+    int mID;
+    HashedString mTag;
+
+public:
+    inline FurnaceRecipeKey(int aux, HashedString tag) : mID(aux), mTag(tag) {}
+};
+
 class Type {
-    Item const* item;
-    Block const* block;
-    RecipeIngredient ingredient;
-    char label;
 public:
-    inline Type(string const& name, char label, int aux, unsigned short count) :ingredient(name, aux, count), label(label) {
-        item = ingredient.descriptor.getItem();
-        block = ingredient.descriptor.getBlock();
+    const Item* mItem;
+    const Block* mBlock;
+    RecipeIngredient mIngredient;
+    char mLabel;
+
+public:
+    class Type& operator=(class Type const&) = default;
+
+    inline Type(string const& name, char label, int aux, unsigned short count)
+    : mIngredient(name, aux, count), mLabel(label) {
+        mItem = mIngredient.getItem();
+        mBlock = mIngredient.getBlock();
     }
 };
+
 struct NormalizedRectangularRecipeResults {
+public:
+    int mWidth;
+    int mHeight;
+    std::string mNormalizedResult;
+    std::string mWarning;
+
     NormalizedRectangularRecipeResults() = delete;
     NormalizedRectangularRecipeResults(NormalizedRectangularRecipeResults const&) = delete;
     NormalizedRectangularRecipeResults(NormalizedRectangularRecipeResults const&&) = delete;
 };
 
+
+
 #undef AFTER_EXTRA
 #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RECIPES
 public:

diff --git a/ScriptEngine/src/api/EventAPI.cpp b/ScriptEngine/src/api/EventAPI.cpp
@@ -555,7 +555,7 @@ void EnableEventListener(int eventId) {
                 IF_LISTENED(EVENT_TYPES::onUseItemOn) {
                     CallEvent(EVENT_TYPES::onUseItemOn, PlayerClass::newPlayer((Player*)ev.mPlayer),
                               ItemClass::newItem(ev.mItemStack), BlockClass::newBlock(ev.mBlockInstance),
-                              Number::newNumber(ev.mFace), FloatPos::newPos(ev.mClickPos));
+                              Number::newNumber(ev.mFace), FloatPos::newPos(ev.mClickPos, ev.mPlayer->getDimensionId()));
                 }
                 IF_LISTENED_END(EVENT_TYPES::onUseItemOn);
             });
@@ -568,19 +568,19 @@ void EnableEventListener(int eventId) {
                     IF_LISTENED(EVENT_TYPES::onUseBucketPlace) {
                         CallEvent(EVENT_TYPES::onUseBucketPlace, PlayerClass::newPlayer((Player*)ev.mPlayer),
                                   ItemClass::newItem(ev.mBucket), BlockClass::newBlock(ev.mBlockInstance),
-                                  Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos));
+                                  Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos, ev.mPlayer->getDimensionId()));
                     }
                     IF_LISTENED_END(EVENT_TYPES::onUseBucketPlace);
                 } else if (ev.mEventType == PlayerUseBucketEvent::EventType::Take) {
                     IF_LISTENED(EVENT_TYPES::onUseBucketTake) {
                         if (ev.mTargetActor) {
                             CallEvent(EVENT_TYPES::onUseBucketTake, PlayerClass::newPlayer((Player*)ev.mPlayer),
                                       ItemClass::newItem(ev.mBucket), EntityClass::newEntity(ev.mTargetActor),
-                                      Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos));
+                                      Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos, ev.mPlayer->getDimensionId()));
                         } else {
                             CallEvent(EVENT_TYPES::onUseBucketTake, PlayerClass::newPlayer((Player*)ev.mPlayer),
                                       ItemClass::newItem(ev.mBucket), BlockClass::newBlock(ev.mBlockInstance),
-                                      Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos));
+                                      Number::newNumber(ev.mFace), FloatPos::newPos(ev.mTargetPos, ev.mPlayer->getDimensionId()));
                         }
                     }
                     IF_LISTENED_END(EVENT_TYPES::onUseBucketTake);