Add BasicScreenHandler

Add CustomScreenHandlerType Add ScreenHandlerTypeRegistrable
MModding · Aug 3, 2023 · cec2fe6 · cec2fe6
1 parent 0654d6e
commit cec2fe6
Show file tree

Hide file tree

Showing 25 changed files with 133 additions and 32 deletions.
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/enchantments/CustomEnchantedBookItem.java b/src/main/java/com/mmodding/mmodding_lib/library/enchantments/CustomEnchantedBookItem.java
@@ -63,7 +63,7 @@ public void appendStacks(ItemGroup group, DefaultedList<ItemStack> stacks) {
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/enchantments/CustomEnchantment.java b/src/main/java/com/mmodding/mmodding_lib/library/enchantments/CustomEnchantment.java
@@ -26,7 +26,7 @@ public EnchantmentType getType() {
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomArmorItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomArmorItem.java
@@ -16,7 +16,7 @@ public CustomArmorItem(ArmorMaterial material, EquipmentSlot slot, Settings sett
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomAxeItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomAxeItem.java
@@ -15,7 +15,7 @@ public CustomAxeItem(ToolMaterial material, float attackDamage, float attackSpee
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomFishingRodItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomFishingRodItem.java
@@ -14,11 +14,11 @@ public CustomFishingRodItem(Settings settings) {
 
     @Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomHoeItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomHoeItem.java
@@ -15,7 +15,7 @@ public CustomHoeItem(ToolMaterial material, int attackDamage, float attackSpeed,
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomItem.java
@@ -14,11 +14,11 @@ public CustomItem(Settings settings) {
 
     @Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+        this.registered.set(true);
     }
 }
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomItemWithInventory.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomItemWithInventory.java
@@ -141,11 +141,11 @@ public ScreenHandler createMenu(int syncId, PlayerInventory playerInventory, Pla
 
 	@Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomMusicDiscItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomMusicDiscItem.java
@@ -15,7 +15,7 @@ public CustomMusicDiscItem(Settings settings, SoundEvent soundEvent, int compara
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomPickaxeItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomPickaxeItem.java
@@ -15,7 +15,7 @@ public CustomPickaxeItem(ToolMaterial material, int attackDamage, float attackSp
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomShovelItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomShovelItem.java
@@ -15,7 +15,7 @@ public CustomShovelItem(ToolMaterial material, float attackDamage, float attackS
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSpawnEggItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSpawnEggItem.java
@@ -16,11 +16,11 @@ public CustomSpawnEggItem(EntityType<? extends MobEntity> entityType, int primar
 
     @Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+        this.registered.set(true);
     }
 }
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSwordItem.java b/src/main/java/com/mmodding/mmodding_lib/library/items/CustomSwordItem.java
@@ -15,7 +15,7 @@ public CustomSwordItem(ToolMaterial toolMaterial, int attackDamage, float attack
 
 	@Override
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	@Override

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/pois/CustomPOI.java b/src/main/java/com/mmodding/mmodding_lib/library/pois/CustomPOI.java
@@ -32,11 +32,11 @@ public PointOfInterestType getType() {
 
     @Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/portals/CustomSquaredPortalKeyItem.java b/src/main/java/com/mmodding/mmodding_lib/library/portals/CustomSquaredPortalKeyItem.java
@@ -48,11 +48,11 @@ public ActionResult useOnBlock(ItemUsageContext context) {
 
 	@Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/screenhandlers/BasicScreenHandler.java b/src/main/java/com/mmodding/mmodding_lib/library/screenhandlers/BasicScreenHandler.java
@@ -0,0 +1,54 @@
+package com.mmodding.mmodding_lib.library.screenhandlers;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.SimpleInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.screen.slot.Slot;
+import org.jetbrains.annotations.Nullable;
+
+public class BasicScreenHandler extends ScreenHandler {
+
+	protected final Inventory inventory;
+
+	protected BasicScreenHandler(int inventorySize, @Nullable ScreenHandlerType<?> type, int syncId, PlayerInventory playerInventory) {
+		super(type, syncId);
+		this.inventory = new SimpleInventory(inventorySize);
+		this.inventory.onOpen(playerInventory.player);
+	}
+
+	@Override
+	public boolean canUse(PlayerEntity player) {
+		return this.inventory.canPlayerUse(player);
+	}
+
+	@Override
+	public ItemStack quickTransfer(PlayerEntity player, int fromIndex) {
+		ItemStack itemStack = ItemStack.EMPTY;
+		Slot slot = this.slots.get(fromIndex);
+
+		if (slot.hasStack()) {
+			ItemStack slotStack = slot.getStack();
+			itemStack = slotStack.copy();
+
+			if (fromIndex < this.inventory.size()) {
+				if (!this.insertItem(slotStack, this.inventory.size(), this.slots.size(), true)) {
+					return ItemStack.EMPTY;
+				}
+			} else if (!this.insertItem(slotStack, 0, this.inventory.size(), false)) {
+				return ItemStack.EMPTY;
+			}
+
+			if (slotStack.isEmpty()) {
+				slot.setStack(ItemStack.EMPTY);
+			} else {
+				slot.markDirty();
+			}
+		}
+
+		return itemStack;
+	}
+}
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/screenhandlers/CustomScreenHandlerType.java b/src/main/java/com/mmodding/mmodding_lib/library/screenhandlers/CustomScreenHandlerType.java
@@ -0,0 +1,25 @@
+package com.mmodding.mmodding_lib.library.screenhandlers;
+
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class CustomScreenHandlerType<T extends ScreenHandler> extends ScreenHandlerType<T> implements ScreenHandlerTypeRegistrable {
+
+	private final AtomicBoolean registered = new AtomicBoolean(false);
+
+	public CustomScreenHandlerType(Factory<T> factory) {
+		super(factory);
+	}
+
+	@Override
+	public boolean isNotRegistered() {
+		return !this.registered.get();
+	}
+
+	@Override
+	public void setRegistered() {
+		this.registered.set(true);
+	}
+}
diff --git a/...n/java/com/mmodding/mmodding_lib/library/screenhandlers/ScreenHandlerTypeRegistrable.java b/...n/java/com/mmodding/mmodding_lib/library/screenhandlers/ScreenHandlerTypeRegistrable.java
@@ -0,0 +1,16 @@
+package com.mmodding.mmodding_lib.library.screenhandlers;
+
+import com.mmodding.mmodding_lib.library.utils.Registrable;
+import com.mmodding.mmodding_lib.library.utils.RegistrationUtils;
+import net.minecraft.screen.ScreenHandlerType;
+import net.minecraft.util.Identifier;
+
+public interface ScreenHandlerTypeRegistrable extends Registrable {
+
+	default void register(Identifier identifier) {
+		if (this instanceof ScreenHandlerType<?> screenHandlerType && this.isNotRegistered()) {
+			RegistrationUtils.registerScreenHandlerType(identifier, screenHandlerType);
+			this.setRegistered();
+		}
+	}
+}
diff --git a/src/main/java/com/mmodding/mmodding_lib/library/utils/RegistrationUtils.java b/src/main/java/com/mmodding/mmodding_lib/library/utils/RegistrationUtils.java
@@ -9,6 +9,8 @@
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.potion.Potion;
+import net.minecraft.screen.ScreenHandler;
+import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Pair;
 import net.minecraft.util.registry.BuiltinRegistries;
@@ -66,6 +68,10 @@ public static <T extends Entity> void registerEntityType(Identifier identifier,
 		Registry.register(Registry.ENTITY_TYPE, identifier, entityType);
 	}
 
+	public static <T extends ScreenHandler> void registerScreenHandlerType(Identifier identifier, ScreenHandlerType<T> screenHandlerType) {
+		Registry.register(Registry.SCREEN_HANDLER, identifier, screenHandlerType);
+	}
+
 	public static void registerBiome(Identifier identifier, Biome biome) {
 		BuiltinRegistries.register(BuiltinRegistries.BIOME, identifier, biome);
 	}

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/worldgen/biomes/CustomBiome.java b/src/main/java/com/mmodding/mmodding_lib/library/worldgen/biomes/CustomBiome.java
@@ -17,12 +17,12 @@ public CustomBiome(Supplier<Biome> biome) {
 
     @Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 
 	public Biome getBiome() {

diff --git a/src/main/java/com/mmodding/mmodding_lib/library/worldgen/features/AdvancedFeature.java b/src/main/java/com/mmodding/mmodding_lib/library/worldgen/features/AdvancedFeature.java
@@ -30,7 +30,7 @@ public void register(Identifier identifier) {
 	}
 
 	public boolean isNotRegistered() {
-		return !registered.get();
+		return !this.registered.get();
 	}
 
 	public void setRegistered() {

diff --git a/...n/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomFoliagePlacer.java b/...n/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomFoliagePlacer.java
@@ -35,11 +35,11 @@ public CustomFoliagePlacer(IntProvider radius, IntProvider offset, IntProvider f
 
     @Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }
diff --git a/...main/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomRootPlacer.java b/...main/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomRootPlacer.java
@@ -28,11 +28,11 @@ public CustomRootPlacer(IntProvider trunkOffsetY, BlockStateProvider rootProvide
 
 	@Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }
diff --git a/...n/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomTreeDecorator.java b/...n/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomTreeDecorator.java
@@ -23,11 +23,11 @@ public CustomTreeDecorator() {
 
 	@Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }
diff --git a/...ain/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomTrunkPlacer.java b/...ain/java/com/mmodding/mmodding_lib/library/worldgen/features/trees/CustomTrunkPlacer.java
@@ -24,11 +24,11 @@ public CustomTrunkPlacer(int baseHeight, int firstRandomHeight, int secondRandom
 
 	@Override
     public boolean isNotRegistered() {
-        return !registered.get();
+        return !this.registered.get();
     }
 
     @Override
     public void setRegistered() {
-        registered.set(true);
+		this.registered.set(true);
     }
 }