Revert "Create 1.18.2/feature/scripting with some code"

CHANGELOG.md

@@ -5,4 +5,3 @@ Changelog
 First Ogden version! Keep in mind that many things are still in development.
 - Added default bullets that can be illuminated and adapted to multiple ammunition types
 - Added ammunition configuration
-- Added firearm ammunition configuration

README.md

@@ -8,14 +8,13 @@ More to come...
 
 - Firearm data packing
     - Firearm action script
-       - Key handling
        - Boilerplate
        - Start of action
        - End of action
        - NBT modification
        - NBT querying
        - Functions
-    - Firearm action properties
+   - Firearm action properties
         - Boilerplate
     - Firearm damage properties
         - Boilerplate
@@ -41,7 +40,3 @@ More to come...
 
 - Damage mods compat
     - First Aid
-
-
-- Documentation for content creation
-

settings.gradle

@@ -12,7 +12,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }
 
 rootProject.name = 'Ogden'

src/main/java/rbasamoyai/ogden/OgdenClient.java

@@ -1,10 +1,6 @@
 package rbasamoyai.ogden;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.client.event.EntityRenderersEvent;
-import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import rbasamoyai.ogden.entities.OgdenBulletRenderer;
 import rbasamoyai.ogden.index.OgdenEntityTypes;
@@ -13,20 +9,10 @@ public class OgdenClient {
 
     public static void init(IEventBus modBus, IEventBus forgeBus) {
         modBus.addListener(OgdenClient::setupRenderers);
-
-        forgeBus.addListener(OgdenClient::onInput);
     }
 
     public static void setupRenderers(final EntityRenderersEvent.RegisterRenderers evt) {
         evt.registerEntityRenderer(OgdenEntityTypes.BULLET.get(), OgdenBulletRenderer::new);
     }
 
-    public static void onInput(final InputEvent evt) {
-        Minecraft mc = Minecraft.getInstance();
-        if (mc.player == null) return;
-
-        ItemStack stack = mc.player.getUseItem();
-        InteractionHand hand = mc.player.getUsedItemHand();
-    }
-
 }

src/main/java/rbasamoyai/ogden/OgdenMod.java

@@ -7,39 +7,24 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.monster.Monster;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.LevelAccessor;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.AddReloadListenerEvent;
 import net.minecraftforge.event.OnDatapackSyncEvent;
-import net.minecraftforge.event.entity.living.LivingGetProjectileEvent;
-import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.config.ModConfigEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.registries.NewRegistryEvent;
 import rbasamoyai.ogden.ammunition.AmmunitionPropertiesHandler;
-import rbasamoyai.ogden.ammunition.clips.ClipPropertiesHandler;
-import rbasamoyai.ogden.firearms.OgdenFirearmItem;
-import rbasamoyai.ogden.firearms.config.FirearmAcceptedAmmunitionHandler;
-import rbasamoyai.ogden.firearms.config.FirearmAmmoPredicate;
-import rbasamoyai.ogden.firearms.scripting.FirearmScriptHandler;
 import rbasamoyai.ogden.index.OgdenAmmoGroup;
 import rbasamoyai.ogden.index.OgdenBaseGroup;
 import rbasamoyai.ogden.index.OgdenEntityTypes;
 import rbasamoyai.ogden.index.OgdenFirearmsGroup;
 import rbasamoyai.ogden.index.OgdenItems;
 import rbasamoyai.ogden.index.OgdenProjectilePropertiesRegistry;
-import rbasamoyai.ogden.index.OgdenRegistries;
-import rbasamoyai.ogden.index.OgdenScriptInstructionTypes;
 import rbasamoyai.ogden.network.OgdenNetwork;
 
 @Mod(OgdenMod.MOD_ID)
@@ -57,15 +42,12 @@ public OgdenMod() {
         IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
         IEventBus forgeBus = MinecraftForge.EVENT_BUS;
 
-        modBus.addListener(this::onNewRegistry);
         modBus.addListener(this::commonSetup);
         modBus.addListener(this::onLoadConfig);
         modBus.addListener(this::onReloadConfig);
 
         forgeBus.addListener(this::registerResourceListeners);
         forgeBus.addListener(this::onDatapackSync);
-        forgeBus.addListener(this::onLoadLevel);
-        forgeBus.addListener(this::getProjectileItem);
 
         OgdenConfigs.registerConfigs();
 
@@ -75,12 +57,6 @@ public OgdenMod() {
         DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> OgdenClient.init(modBus, forgeBus));
     }
 
-    private void onNewRegistry(final NewRegistryEvent evt) {
-        OgdenRegistries.initRegistries();
-
-        OgdenScriptInstructionTypes.register();
-    }
-
     private void commonSetup(final FMLCommonSetupEvent evt) {
         evt.enqueueWork(() -> {
             OgdenNetwork.init();
@@ -90,36 +66,15 @@ private void commonSetup(final FMLCommonSetupEvent evt) {
 
     private void registerResourceListeners(final AddReloadListenerEvent evt) {
         evt.addListener(AmmunitionPropertiesHandler.ReloadListener.INSTANCE);
-        evt.addListener(ClipPropertiesHandler.AcceptedAmmoReloadListener.INSTANCE);
-        evt.addListener(ClipPropertiesHandler.CapacityReloadListener.INSTANCE);
-        evt.addListener(FirearmAcceptedAmmunitionHandler.ReloadListener.INSTANCE);
-        evt.addListener(FirearmScriptHandler.ReloadListener.INSTANCE);}
-
-    public void loadTags() {
-        ClipPropertiesHandler.loadTags();
-        FirearmAcceptedAmmunitionHandler.loadTags();
     }
 
     public void onDatapackSync(final OnDatapackSyncEvent evt) {
         if (evt.getPlayer() == null) {
-            this.loadTags();
-
             MinecraftServer server = evt.getPlayerList().getServer();
-            AmmunitionPropertiesHandler.syncToAll(server);
-            ClipPropertiesHandler.syncToAll(server);
-            FirearmAcceptedAmmunitionHandler.syncToAll(server);
+            AmmunitionPropertiesHandler.syncToServer(server);
         } else {
             ServerPlayer player = evt.getPlayer();
             AmmunitionPropertiesHandler.syncToPlayer(player);
-            ClipPropertiesHandler.syncToPlayer(player);
-            FirearmAcceptedAmmunitionHandler.syncToPlayer(player);
-        }
-    }
-
-    public void onLoadLevel(final WorldEvent.Load evt) {
-        LevelAccessor level = evt.getWorld();
-        if (level.getServer() != null && !level.isClientSide() && level.getServer().overworld() == level) {
-            this.loadTags();
         }
     }
 
@@ -131,27 +86,6 @@ public void onReloadConfig(final ModConfigEvent.Reloading evt) {
         OgdenConfigs.onModConfigReload(evt.getConfig());
     }
 
-    public void getProjectileItem(final LivingGetProjectileEvent evt) {
-        ItemStack shootable = evt.getProjectileWeaponItemStack();
-        LivingEntity entity = evt.getEntityLiving();
-        ItemStack projectile = evt.getProjectileItemStack();
-        if (shootable.getItem() instanceof OgdenFirearmItem firearm) {
-            FirearmAmmoPredicate predicate = firearm.getFirearmPredicate();
-            if (predicate.test(projectile))
-                return;
-            ItemStack creativeStack = predicate.getCreativeItemStack();
-            // TODO registry
-            if (entity instanceof Monster monster) {
-                evt.setProjectileItemStack(creativeStack);
-                return;
-            }
-            if (entity instanceof Player player) {
-                evt.setProjectileItemStack(player.isCreative() ? creativeStack : ItemStack.EMPTY);
-                return;
-            }
-        }
-    }
-
     public static ResourceLocation resource(String path) { return new ResourceLocation(MOD_ID, path); }
 
 }