MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove distmarker annotations

Browse Source
This commit is contained in:
Marcel Konrad
2021-09-20 21:02:37 +02:00
parent e10832a285
commit 36dadd84a2
183 changed files with 3 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/exopandora/worldhandler/util/ActionHandler.java
View File

@@ -1,10 +1,6 @@
package exopandora.worldhandler.util;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@FunctionalInterface
@OnlyIn(Dist.CLIENT)
public interface ActionHandler
{
void run() throws Exception;

3
src/main/java/exopandora/worldhandler/util/ActionHelper.java
View File

@@ -25,10 +25,7 @@ import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.Difficulty;
import net.minecraft.world.level.block.NoteBlock;
import net.minecraft.world.level.block.SignBlock;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class ActionHelper
{
public static void backToGame()

3
src/main/java/exopandora/worldhandler/util/AdvancementHelper.java
View File

@@ -18,10 +18,7 @@ import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
import net.minecraft.util.Unit;
import net.minecraft.util.profiling.ProfilerFiller;
import net.minecraft.world.level.storage.loot.PredicateManager;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class AdvancementHelper implements PreparableReloadListener
{
private static final AdvancementHelper INSTANCE = new AdvancementHelper();

3
src/main/java/exopandora/worldhandler/util/BlockHelper.java
View File

@@ -29,10 +29,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.HitResult.Type;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class BlockHelper
{
private static BlockPos pos1 = BlockPos.ZERO;

4
src/main/java/exopandora/worldhandler/util/CommandHelper.java
View File

@@ -10,8 +10,6 @@ import exopandora.worldhandler.command.CommandWorldHandler;
import net.minecraft.client.Minecraft;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public class CommandHelper
{
@@ -36,13 +34,11 @@ public class CommandHelper
CommandWH.register(dispatcher);
}
@OnlyIn(Dist.CLIENT)
public static void sendCommand(String player, ICommandBuilder builder)
{
CommandHelper.sendCommand(player, builder, false);
}
@OnlyIn(Dist.CLIENT)
public static void sendCommand(String player, ICommandBuilder builder, boolean special)
{
if(builder != null)

4
src/main/java/exopandora/worldhandler/util/EnumHelper.java
View File

@@ -2,10 +2,6 @@ package exopandora.worldhandler.util;
import javax.annotation.Nullable;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class EnumHelper
{
@Nullable

4
src/main/java/exopandora/worldhandler/util/IConnection.java
View File

@@ -3,12 +3,9 @@ package exopandora.worldhandler.util;
import net.minecraft.client.multiplayer.ServerData;
import net.minecraft.world.level.LevelSettings;
import net.minecraft.world.level.levelgen.WorldGenSettings;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public interface IConnection
{
@OnlyIn(Dist.CLIENT)
public static class IntegratedConnection implements IConnection
{
private final String folder;
@@ -38,7 +35,6 @@ public interface IConnection
}
}
@OnlyIn(Dist.CLIENT)
public static class DedicatedConnection implements IConnection
{
private final ServerData data;

4
src/main/java/exopandora/worldhandler/util/ILogic.java
View File

@@ -1,9 +1,5 @@
package exopandora.worldhandler.util;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public interface ILogic
{
String getId();

3
src/main/java/exopandora/worldhandler/util/MutableTextComponent.java
View File

@@ -7,10 +7,7 @@ import net.minecraft.nbt.Tag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.util.FormattedCharSequence;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class MutableTextComponent extends TextComponent implements INBTWritable
{
public MutableTextComponent()

3
src/main/java/exopandora/worldhandler/util/NBTHelper.java
View File

@@ -15,10 +15,7 @@ import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class NBTHelper
{
public static Tag serialize(BlockState blockState)

4
src/main/java/exopandora/worldhandler/util/Node.java
View File

@@ -10,10 +10,6 @@ import java.util.function.BiPredicate;
import javax.annotation.Nullable;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class Node
{
private final String key;

3
src/main/java/exopandora/worldhandler/util/RegistryHelper.java
View File

@@ -17,14 +17,11 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.Block;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.ForgeRegistryEntry;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.IForgeRegistryEntry;
@OnlyIn(Dist.CLIENT)
public class RegistryHelper
{
private static final Map<IForgeRegistry<?>, Function<? extends ForgeRegistryEntry<?>, String>> FORGE = new HashMap<IForgeRegistry<?>, Function<? extends ForgeRegistryEntry<?>, String>>();

3
src/main/java/exopandora/worldhandler/util/RenderUtils.java
View File

@@ -6,10 +6,7 @@ import com.mojang.math.Vector3f;
import exopandora.worldhandler.config.Config;
import net.minecraft.client.gui.GuiComponent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class RenderUtils
{
public static void drawWatchIntoGui(PoseStack matrix, GuiComponent gui, int width, int height, long worldTicks, boolean smooth)

3
src/main/java/exopandora/worldhandler/util/ResourceHelper.java
View File

@@ -7,11 +7,8 @@ import exopandora.worldhandler.builder.types.BlockResourceLocation;
import exopandora.worldhandler.builder.types.ItemResourceLocation;
import exopandora.worldhandler.config.Config;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.IForgeRegistry;
@OnlyIn(Dist.CLIENT)
public class ResourceHelper
{
private static final ResourceLocation BACKGROUND = new ResourceLocation("textures/gui/demo_background.png");

3
src/main/java/exopandora/worldhandler/util/ScoreboardHelper.java
View File

@@ -14,11 +14,8 @@ import net.minecraft.stats.Stats;
import net.minecraft.world.scores.Team.CollisionRule;
import net.minecraft.world.scores.Team.Visibility;
import net.minecraft.world.scores.criteria.ObjectiveCriteria;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.registries.ForgeRegistries;
@OnlyIn(Dist.CLIENT)
public class ScoreboardHelper
{
private final Node objectives = new Node();

3
src/main/java/exopandora/worldhandler/util/SignText.java
View File

@@ -7,10 +7,7 @@ import net.minecraft.nbt.StringTag;
import net.minecraft.nbt.Tag;
import net.minecraft.network.chat.ClickEvent;
import net.minecraft.network.chat.ClickEvent.Action;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class SignText implements INBTWritable
{
private MutableTextComponent text = new MutableTextComponent();

3
src/main/java/exopandora/worldhandler/util/TextUtils.java
View File

@@ -6,10 +6,7 @@ import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.util.Mth;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public class TextUtils
{
public static final TextComponent ARROW_LEFT = new TextComponent("<");