merge and resolve conflicts

SteelCodeTeam · Nov 24, 2022 · 9ef543a · 9ef543a
2 parents a886632 + 9327120
commit 9ef543a
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Metallics Arts 1.19.2-1.3.2
+# Metallics Arts 1.19.2-1.3.4
 
 
 ## Index 📋
@@ -92,8 +92,8 @@ CurseForge page:
 - ~~Vials GUI, its not drawing correctly how much metal you have.~~ [v1.3.1]
 - ~~Bug with ctrl+space steel flying, nuggets drops doesnt sinchronyze with server~~[v1.3.2]
 - ~~Bendalloy do weird things in server~~[v1.3.2]
-- Bronze allomantic is not drawing lines in multiplayer.
-- Beacons its not working with our custom metals.
+- ~~Bronze allomantic is not drawing lines in multiplayer.~~ [v1.3.2]
+- ~~Beacons its not working with our custom metals.~~ [v1.3.4]
 - Names consistency are bad.
 
 **Improvements**

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 
-version = '1.19.2-1.3.2'
+version = '1.19.2-1.3.3'
 
 group = 'net.rudahee.metallics_arts' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'metallics_arts'

diff --git a/src/main/java/net/rudahee/metallics_arts/data/network/RemoveNuggetPacket.java b/src/main/java/net/rudahee/metallics_arts/data/network/RemoveNuggetPacket.java
@@ -25,7 +25,6 @@ public class RemoveNuggetPacket {
     public RemoveNuggetPacket(int slot, Player player) {
         this.uuid = player.getUUID();
         this.slot = slot;
-
     }
 
     private RemoveNuggetPacket(UUID uuid, int slot) {

diff --git a/...allics_arts/data/providers/BannerTag.java → .../data/providers/ModBannerTagProvider.java b/...allics_arts/data/providers/BannerTag.java → .../data/providers/ModBannerTagProvider.java
@@ -8,9 +8,9 @@
 import net.rudahee.metallics_arts.modules.items.banners.Banners;
 import net.rudahee.metallics_arts.setup.enums.extras.MetalsNBTData;
 
-public class BannerTag extends TagsProvider<BannerPattern> {
+public class ModBannerTagProvider extends TagsProvider<BannerPattern> {
 
-    public BannerTag(DataGenerator pGenerator, net.minecraftforge.common.data.ExistingFileHelper existingFileHelper) {
+    public ModBannerTagProvider(DataGenerator pGenerator, net.minecraftforge.common.data.ExistingFileHelper existingFileHelper) {
         super(pGenerator, Registry.BANNER_PATTERN, MetallicsArts.MOD_ID, existingFileHelper);
     }
 

diff --git a/src/main/java/net/rudahee/metallics_arts/data/providers/ModBeaconTagProvider.java b/src/main/java/net/rudahee/metallics_arts/data/providers/ModBeaconTagProvider.java
@@ -0,0 +1,26 @@
+package net.rudahee.metallics_arts.data.providers;
+
+import net.minecraft.core.Registry;
+import net.minecraft.data.DataGenerator;
+import net.minecraft.data.tags.TagsProvider;
+import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.Block;
+import net.rudahee.metallics_arts.MetallicsArts;
+import net.rudahee.metallics_arts.setup.registries.ModBlock;
+
+public class ModBeaconTagProvider extends TagsProvider<Block> {
+    public ModBeaconTagProvider(DataGenerator gen, net.minecraftforge.common.data.ExistingFileHelper existingFileHelper) {
+        super(gen,Registry.BLOCK,MetallicsArts.MOD_ID,existingFileHelper);
+    }
+
+    @Override
+    protected void addTags() {
+        for (Block block: ModBlock.BLOCK_METAL_BLOCKS.values()) {
+            this.tag(BlockTags.BEACON_BASE_BLOCKS).add(block);
+        }
+        for (Block block: ModBlock.BLOCK_GEMS_BLOCKS.values()) {
+            this.tag(BlockTags.BEACON_BASE_BLOCKS).add(block);
+        }
+
+    }
+}
diff --git a/src/main/java/net/rudahee/metallics_arts/modules/powers/client/PowersClientEventHandler.java b/src/main/java/net/rudahee/metallics_arts/modules/powers/client/PowersClientEventHandler.java
@@ -56,6 +56,7 @@ public class PowersClientEventHandler {
     private final Set<Player> nearby_allomancers = new HashSet<>();
     private final Set<MetalBlockHelpers> metal_blobs = new HashSet<>();
     private int tickOffset = 0;
+    boolean count = true;
 
     BlockPos otherPlayerDeathPos = null;
 
@@ -241,26 +242,27 @@ public void onClientTick(final TickEvent.ClientTickEvent event) {
                                         }
                                     }
 
-                                    if (!player.level.getBlockState(blockPos).is(Blocks.AIR) && controlTick == 0) {
+                                    if (!player.level.getBlockState(blockPos).is(Blocks.AIR)) {
                                         // IF ITS A BLOCK
                                         BlockPos blockPosition = blockPos;
 
                                         int slot = IronAndSteelHelpers.haveNuggets(player);
 
+
                                         if (IronAndSteelHelpers.isBlockStateMetal(this.mc.level.getBlockState(blockPosition))) {
                                             ModNetwork.sendToServer(new PullAndPushBlockPacket(blockPosition,
                                                     Math.round(IronAndSteelHelpers.PUSH * IronAndSteelHelpers.getMultiplier(player,playerCapability.getEnhanced(),
                                                             playerCapability.isBurning(MetalsNBTData.LERASIUM)))));
 
                                         } else if (slot != -1) {
                                             //player.getInventory().removeItem(slot, 1);
-                                            ModNetwork.sendToServer(new RemoveNuggetPacket(slot, player));
                                             ModNetwork.sendToServer(new PullAndPushNuggetPacket(blockPosition,
                                                     Math.round(IronAndSteelHelpers.PUSH * IronAndSteelHelpers.getMultiplier(player,playerCapability.getEnhanced(),
                                                             playerCapability.isBurning(MetalsNBTData.LERASIUM)))));
-                                            if (controlTick == 0 ){
 
-                                                controlTick = 10;
+                                            if (controlTick == 0 ){
+                                                ModNetwork.sendToServer(new RemoveNuggetPacket(slot, player));
+                                                controlTick = 18;
                                             }
                                         }
                                     }

diff --git a/src/main/java/net/rudahee/metallics_arts/setup/DataGenerators.java b/src/main/java/net/rudahee/metallics_arts/setup/DataGenerators.java
@@ -22,7 +22,9 @@ public static void  gatherData (GatherDataEvent event){
         gen.addProvider(true, new ModBlockTagsProvider(gen, MetallicsArts.MOD_ID, event.getExistingFileHelper()));
         gen.addProvider(true, new ModLootTableProvider(gen));
         gen.addProvider(true, new ModRecipeProvider(gen));
-        gen.addProvider(event.includeServer(), new BannerTag(gen, event.getExistingFileHelper()));
         gen.addProvider(true, new ModLanguageProviderES_ES(gen, MetallicsArts.MOD_ID, "es_es"));
+        gen.addProvider(event.includeServer(), new ModBannerTagProvider(gen, event.getExistingFileHelper()));
+        gen.addProvider(true,new ModBeaconTagProvider(gen,event.getExistingFileHelper()));
+
     }
 }