diff --git a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f index e11fbdcf7..e6988b53e 100644 --- a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f +++ b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f @@ -1,9 +1,9 @@ -// 1.21.1 2025-03-27T21:38:30.5594453 Block States: superbwarfare +// 1.21.1 2025-03-30T16:40:47.8135072 Block States: superbwarfare f3b778ca36ca78c3d80f1b778078897f59bdb0c5 assets/superbwarfare/blockstates/barbed_wire.json 0cfad4f53a8047c402edf978d0c8cf6269f063cb assets/superbwarfare/blockstates/cemented_carbide_block.json 472c06e6b43ad09925edaa88e9376bfd27ab267f assets/superbwarfare/blockstates/charging_station.json 921500c7cf6c92da0e656486126068bbf5e30348 assets/superbwarfare/blockstates/container.json -05f0cdee0936354ef2bf904037fe09ff7d5e0bc7 assets/superbwarfare/blockstates/creative_charging_station.json +5bf16a7ce938f4bbd94c2c2bd19f664140bf8427 assets/superbwarfare/blockstates/creative_charging_station.json 62fb0464ca59ac21693639c406e08730427d87b3 assets/superbwarfare/blockstates/deepslate_galena_ore.json b8b7cdea6c8626c74d652d0b300b3afe19c60674 assets/superbwarfare/blockstates/deepslate_scheelite_ore.json 2b24b703de4821bebe71ba53043e6a1a23d71c17 assets/superbwarfare/blockstates/deepslate_silver_ore.json diff --git a/src/generated/resources/assets/superbwarfare/blockstates/creative_charging_station.json b/src/generated/resources/assets/superbwarfare/blockstates/creative_charging_station.json index 83abf3346..2085968e1 100644 --- a/src/generated/resources/assets/superbwarfare/blockstates/creative_charging_station.json +++ b/src/generated/resources/assets/superbwarfare/blockstates/creative_charging_station.json @@ -1,17 +1,32 @@ { "variants": { - "facing=east": { + "facing=east,show_range=false": { "model": "superbwarfare:block/creative_charging_station", "y": 90 }, - "facing=north": { + "facing=east,show_range=true": { + "model": "superbwarfare:block/creative_charging_station", + "y": 90 + }, + "facing=north,show_range=false": { "model": "superbwarfare:block/creative_charging_station" }, - "facing=south": { + "facing=north,show_range=true": { + "model": "superbwarfare:block/creative_charging_station" + }, + "facing=south,show_range=false": { "model": "superbwarfare:block/creative_charging_station", "y": 180 }, - "facing=west": { + "facing=south,show_range=true": { + "model": "superbwarfare:block/creative_charging_station", + "y": 180 + }, + "facing=west,show_range=false": { + "model": "superbwarfare:block/creative_charging_station", + "y": 270 + }, + "facing=west,show_range=true": { "model": "superbwarfare:block/creative_charging_station", "y": 270 } diff --git a/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java b/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java index ad2d59f86..08766834d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java +++ b/src/main/java/com/atsuishio/superbwarfare/block/ContainerBlock.java @@ -111,7 +111,8 @@ public class ContainerBlock extends BaseEntityBlock { continue; } - if (level.getBlockState(pos.offset(i, j, k)).canOcclude()) { + var state = level.getBlockState(pos.offset(i, j, k)); + if (state.canOcclude() && !state.is(Blocks.SNOW)) { flag = false; } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java index 99785bc59..7304486a2 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/AnimationHelper.java @@ -21,7 +21,9 @@ public class AnimationHelper { public static void renderPartOverBone(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float r, float g, float b, float a) { setupModelFromBone(model, bone); var color = FastColor.ARGB32.color((int) (a * 255), (int) (r * 255), (int) (g * 255), (int) (b * 255)); - model.render(stack, buffer, packedLightIn, packedOverlayIn, color); + + // TODO model.render ? +// model.render(stack, buffer, packedLightIn, packedOverlayIn, color); } public static void setupModelFromBone(ModelPart model, GeoBone bone) { @@ -38,7 +40,8 @@ public class AnimationHelper { public static void renderPartOverBone2(ModelPart model, GeoBone bone, PoseStack stack, VertexConsumer buffer, int packedLightIn, int packedOverlayIn, float r, float g, float b, float a) { setupModelFromBone2(model, bone); var color = FastColor.ARGB32.color((int) (a * 255), (int) (r * 255), (int) (g * 255), (int) (b * 255)); - model.render(stack, buffer, packedLightIn, packedOverlayIn, color); + // TODO model.render +// model.render(stack, buffer, packedLightIn, packedOverlayIn, color); } public static void setupModelFromBone2(ModelPart model, GeoBone bone) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java b/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java index 0281cca5a..88f8a5e03 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ItemModelHelper.java @@ -8,14 +8,17 @@ import software.bernie.geckolib.cache.object.GeoBone; public class ItemModelHelper { public static void handleGunAttachments(GeoBone bone, ItemStack stack, String name) { - var rootTag = NBTTool.getTag(stack); - CompoundTag tag = rootTag.getCompound("Attachments"); - splitBoneName(bone, name, "Scope", tag); - splitBoneName(bone, name, "Magazine", tag); - splitBoneName(bone, name, "Barrel", tag); - splitBoneName(bone, name, "Stock", tag); - splitBoneName(bone, name, "Grip", tag); + // TODO 正确隐藏渲染无关配件 + return; +// var rootTag = NBTTool.getTag(stack); +// CompoundTag tag = rootTag.getCompound("Attachments"); +// +// splitBoneName(bone, name, "Scope", tag); +// splitBoneName(bone, name, "Magazine", tag); +// splitBoneName(bone, name, "Barrel", tag); +// splitBoneName(bone, name, "Stock", tag); +// splitBoneName(bone, name, "Grip", tag); } private static void splitBoneName(GeoBone bone, String boneName, String tagName, CompoundTag tag) { diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java index 34e48cb98..747259478 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/BocekItemRenderer.java @@ -131,7 +131,8 @@ public class BocekItemRenderer extends GeoItemRenderer { this.currentBuffer.getBuffer(this.renderType); stack.popPose(); } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); + // TODO bocek renderer +// super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java index 368a42bfe..5bf6561fc 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/VectorItemRenderer.java @@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; import com.atsuishio.superbwarfare.client.ItemModelHelper; -import com.atsuishio.superbwarfare.client.layer.gun.VectorLayer; import com.atsuishio.superbwarfare.client.model.item.VectorItemModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -19,7 +18,6 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.entity.player.PlayerRenderer; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.cache.object.BakedGeoModel; @@ -32,29 +30,32 @@ import java.util.Set; public class VectorItemRenderer extends GeoItemRenderer { - public VectorItemRenderer() { - super(new VectorItemModel()); - this.addRenderLayer(new VectorLayer(this)); - } - - @Override - public RenderType getRenderType(VectorItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; + private static final float SCALE_RECIPROCAL = 0.0625f; + protected boolean renderArms; protected MultiBufferSource currentBuffer; protected RenderType renderType; public ItemDisplayContext transformType; protected VectorItem animatable; - private final Set hiddenBones = new HashSet<>(); + private final Set hiddenBones; + private final Set suppressedBones; + + + public VectorItemRenderer() { + super(new VectorItemModel()); + this.renderArms = false; + this.hiddenBones = new HashSet<>(); + this.suppressedBones = new HashSet<>(); + + } + + public RenderType getRenderType(VectorItem animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { + return RenderType.entityTranslucent(getTextureLocation(animatable)); + } + @Override public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); } @@ -82,7 +83,7 @@ public class VectorItemRenderer extends GeoItemRenderer { bone.setHidden(this.hiddenBones.contains(name)); } - Player player = mc.player; + var player = mc.player; if (player == null) return; ItemStack itemStack = player.getMainHandItem(); if (!itemStack.is(ModTags.Items.GUN)) return; @@ -151,8 +152,87 @@ public class VectorItemRenderer extends GeoItemRenderer { super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); } - @Override - public ResourceLocation getTextureLocation(VectorItem instance) { - return super.getTextureLocation(instance); - } + +// @Override +// public void renderRecursively(PoseStack stack, VectorItem animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, int color) { +// Minecraft mc = Minecraft.getInstance(); +// String name = bone.getName(); +// boolean renderingArms = false; +// if (name.equals("Lefthand") || name.equals("Righthand")) { +// bone.setHidden(true); +// renderingArms = true; +// } else { +// bone.setHidden(this.hiddenBones.contains(name)); +// } +// +// Player player = mc.player; +// if (player == null) return; +// ItemStack itemStack = player.getMainHandItem(); +// if (!itemStack.is(ModTags.Items.GUN)) return; +// +// if (name.equals("Cross1")) { +// bone.setHidden(NBTTool.getTag(itemStack).getBoolean("HoloHidden") +// || !ClientEventHandler.zoom +// || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 1); +// } +// +// if (name.equals("Cross2")) { +// bone.setHidden(NBTTool.getTag(itemStack).getBoolean("HoloHidden") +// || !ClientEventHandler.zoom +// || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.SCOPE) != 2); +// } +// +// if (name.equals("tuoxin")) { +// bone.setHidden(GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.STOCK) == 0); +// } +// +// if (name.equals("flare")) { +// if (ClientEventHandler.firePosTimer == 0 || Clientdom() - 0.5))); +//// bone.setScaleY((float) (0.55 + 0.5 * (Math.random() - 0.5))); +//// bone.setRotZ((float) (0.5 * (Math.random() - 0.5))); +//// } +//// } +//// +//// ItemModelHelper.handleGunAttachments(bone, itemStack, name);EventHandler.firePosTimer > 0.5 || GunsTool.getAttachmentType(itemStack, GunsTool.AttachmentType.BARREL) == 2) { +// bone.setHidden(true); +// } else { +// bone.setHidden(false); +// bone.setScaleX((float) (0.55 + 0.5 * (Math.ran +// +//// type. +// if (this.transformType.firstPerson() && renderingArms) { +// AbstractClientPlayer localPlayer = mc.player; +// +// if (localPlayer == null) { +// return; +// } +// +// PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(localPlayer); +// PlayerModel model = playerRenderer.getModel(); +// stack.pushPose(); +// +// RenderUtil.translateMatrixToBone(stack, bone); +// RenderUtil.translateToPivotPoint(stack, bone); +// RenderUtil.rotateMatrixAroundBone(stack, bone); +// RenderUtil.scaleMatrixForBone(stack, bone); +// RenderUtil.translateAwayFromPivotPoint(stack, bone); +// ResourceLocation loc = localPlayer.getSkin().texture(); +// VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); +// VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); +// if (name.equals("Lefthand")) { +// stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); +// AnimationHelper.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); +// AnimationHelper.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); +// } else { +// stack.translate(SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); +// AnimationHelper.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); +// AnimationHelper.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, 1); +// } +// +// this.currentBuffer.getBuffer(this.renderType); +// stack.popPose(); +// } +// super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, color); +// } + } diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index baebc21a7..389470f2b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -524,12 +524,12 @@ public class GunEventHandler { tag.putDouble("finish", tag.getDouble("finish") - 1); } - player.displayClientMessage(Component.literal("prepare: " + new DecimalFormat("##.#").format(tag.getDouble("prepare")) - + " prepare_load: " + new DecimalFormat("##.#").format(tag.getDouble("prepare_load")) - + " iterative: " + new DecimalFormat("##.#").format(tag.getDouble("iterative")) - + " finish: " + new DecimalFormat("##.#").format(tag.getDouble("finish")) - + " reload_stage: " + new DecimalFormat("##.#").format(tag.getDouble("reload_stage")) - ), true); +// player.displayClientMessage(Component.literal("prepare: " + new DecimalFormat("##.#").format(tag.getDouble("prepare")) +// + " prepare_load: " + new DecimalFormat("##.#").format(tag.getDouble("prepare_load")) +// + " iterative: " + new DecimalFormat("##.#").format(tag.getDouble("iterative")) +// + " finish: " + new DecimalFormat("##.#").format(tag.getDouble("finish")) +// + " reload_stage: " + new DecimalFormat("##.#").format(tag.getDouble("reload_stage")) +// ), true); // 一阶段 if (tag.getBoolean("start_single_reload")) { diff --git a/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java b/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java index 9b7c8e9d5..15d7e42ad 100644 --- a/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java +++ b/src/main/java/com/atsuishio/superbwarfare/mixins/CameraMixin.java @@ -5,6 +5,7 @@ import com.atsuishio.superbwarfare.entity.vehicle.base.CannonEntity; import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModItems; +import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.tools.EntityFindUtil; import com.atsuishio.superbwarfare.tools.NBTTool; import com.mojang.math.Axis; @@ -14,6 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.util.Mth; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import org.joml.Matrix4f; @@ -146,29 +148,29 @@ public abstract class CameraMixin { return transform.transform(new Vector4f(x, y, z, 1)); } - // TODO camera mixin -// @Inject(method = "setup", at = @At("TAIL")) -// public void superbWarfare$setup(BlockGetter area, Entity entity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) { -// if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK -// && entity instanceof Player player -// && player.getMainHandItem().is(ModTags.Items.GUN) -// && Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos) > 0 -// ) { -// move((float) -getMaxZoom(-2.9 * Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos)), 0, (float) (-ClientEventHandler.cameraLocation * Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos))); -// return; -// } -// -// if (!thirdPerson || !(entity.getVehicle() instanceof VehicleEntity vehicle)) return; -// -// var cameraPosition = vehicle.getThirdPersonCameraPosition(vehicle.getSeatIndex(entity)); -// if (cameraPosition != null) { -// move((float) -getMaxZoom(cameraPosition.distance()), (float) cameraPosition.y(), (float) cameraPosition.z()); -// } -// } + // TODO camera mixin, maybe use CalculateDetachedCameraDistanceEvent instead? + @Inject(method = "setup", at = @At("TAIL")) + public void superbWarfare$setup(BlockGetter area, Entity entity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) { + if (Minecraft.getInstance().options.getCameraType() == CameraType.THIRD_PERSON_BACK + && entity instanceof Player player + && player.getMainHandItem().is(ModTags.Items.GUN) + && Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos) > 0 + ) { + move(-getMaxZoom((float) (-2.9 * Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos))), 0, (float) (-ClientEventHandler.cameraLocation * Math.max(ClientEventHandler.pullPos, ClientEventHandler.zoomPos))); + return; + } + + if (!thirdPerson || !(entity.getVehicle() instanceof VehicleEntity vehicle)) return; + + var cameraPosition = vehicle.getThirdPersonCameraPosition(vehicle.getSeatIndex(entity)); + if (cameraPosition != null) { + move(-getMaxZoom((float) cameraPosition.distance()), (float) cameraPosition.y(), (float) cameraPosition.z()); + } + } @Shadow protected abstract void move(float x, float y, float z); -// @Shadow -// protected abstract double getMaxZoom(double desiredCameraDistance); + @Shadow + protected abstract float getMaxZoom(float maxZoom); } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.json b/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.json index c43bfac37..fa6f37ab7 100644 --- a/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.json +++ b/src/main/resources/assets/superbwarfare/models/block/dragon_teeth.json @@ -1,9 +1,9 @@ { - "parent": "forge:item/default", - "loader": "forge:composite", + "parent": "neoforge:item/default", + "loader": "neoforge:composite", "children": { "part1": { - "loader": "forge:obj", + "loader": "neoforge:obj", "model": "superbwarfare:models/block/dragon_teeth.obj", "emissive_ambient": true, "textures": { diff --git a/src/main/resources/assets/superbwarfare/models/item/aa_12.json b/src/main/resources/assets/superbwarfare/models/item/aa_12.json index 2f899ff7e..4bad6fbeb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/aa_12.json +++ b/src/main/resources/assets/superbwarfare/models/item/aa_12.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/aa_12_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/ak_12.json b/src/main/resources/assets/superbwarfare/models/item/ak_12.json index 1019b6b0c..702056b20 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ak_12.json +++ b/src/main/resources/assets/superbwarfare/models/item/ak_12.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/ak_12_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/ak_47.json b/src/main/resources/assets/superbwarfare/models/item/ak_47.json index 08877add9..57e206a79 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ak_47.json +++ b/src/main/resources/assets/superbwarfare/models/item/ak_47.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/ak_47_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/bocek.json b/src/main/resources/assets/superbwarfare/models/item/bocek.json index 49604cd78..ff4762490 100644 --- a/src/main/resources/assets/superbwarfare/models/item/bocek.json +++ b/src/main/resources/assets/superbwarfare/models/item/bocek.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/bocek_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/devotion.json b/src/main/resources/assets/superbwarfare/models/item/devotion.json index bd55571ea..f65c8ee8d 100644 --- a/src/main/resources/assets/superbwarfare/models/item/devotion.json +++ b/src/main/resources/assets/superbwarfare/models/item/devotion.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/devotion_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/glock_17.json b/src/main/resources/assets/superbwarfare/models/item/glock_17.json index 5985a1093..5b5bdfc77 100644 --- a/src/main/resources/assets/superbwarfare/models/item/glock_17.json +++ b/src/main/resources/assets/superbwarfare/models/item/glock_17.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/glock_17_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/glock_18.json b/src/main/resources/assets/superbwarfare/models/item/glock_18.json index 5985a1093..5b5bdfc77 100644 --- a/src/main/resources/assets/superbwarfare/models/item/glock_18.json +++ b/src/main/resources/assets/superbwarfare/models/item/glock_18.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/glock_17_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/hk_416.json b/src/main/resources/assets/superbwarfare/models/item/hk_416.json index 1bf15d1b0..43f1470dd 100644 --- a/src/main/resources/assets/superbwarfare/models/item/hk_416.json +++ b/src/main/resources/assets/superbwarfare/models/item/hk_416.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/hk416_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun.json b/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun.json index 0299c2164..e2027f8d8 100644 --- a/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun.json +++ b/src/main/resources/assets/superbwarfare/models/item/homemade_shotgun.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/homemade_shotgun_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json b/src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json index 2e55c40d3..b2e8e5d5e 100644 --- a/src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json +++ b/src/main/resources/assets/superbwarfare/models/item/hunting_rifle.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/hunting_rifle_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/javelin.json b/src/main/resources/assets/superbwarfare/models/item/javelin.json index ba1706136..6e913737c 100644 --- a/src/main/resources/assets/superbwarfare/models/item/javelin.json +++ b/src/main/resources/assets/superbwarfare/models/item/javelin.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/javelin_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/k_98.json b/src/main/resources/assets/superbwarfare/models/item/k_98.json index f3536d987..cf352edfd 100644 --- a/src/main/resources/assets/superbwarfare/models/item/k_98.json +++ b/src/main/resources/assets/superbwarfare/models/item/k_98.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/k98_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/lunge_mine.json b/src/main/resources/assets/superbwarfare/models/item/lunge_mine.json index 22547664a..052ee783b 100644 --- a/src/main/resources/assets/superbwarfare/models/item/lunge_mine.json +++ b/src/main/resources/assets/superbwarfare/models/item/lunge_mine.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/lunge_mine_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/m_1911.json b/src/main/resources/assets/superbwarfare/models/item/m_1911.json index 8c5792733..877c5d236 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_1911.json +++ b/src/main/resources/assets/superbwarfare/models/item/m_1911.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/m_1911_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/m_4.json b/src/main/resources/assets/superbwarfare/models/item/m_4.json index e7ee41262..b6091dcc5 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_4.json +++ b/src/main/resources/assets/superbwarfare/models/item/m_4.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/m_4_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/m_60.json b/src/main/resources/assets/superbwarfare/models/item/m_60.json index 74719940a..7ef400db9 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_60.json +++ b/src/main/resources/assets/superbwarfare/models/item/m_60.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/m_60_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/m_79.json b/src/main/resources/assets/superbwarfare/models/item/m_79.json index 22c3d3db7..ec204055d 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_79.json +++ b/src/main/resources/assets/superbwarfare/models/item/m_79.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/m79_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/m_870.json b/src/main/resources/assets/superbwarfare/models/item/m_870.json index ec5587823..7f49854f5 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_870.json +++ b/src/main/resources/assets/superbwarfare/models/item/m_870.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/m_870_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/m_98b.json b/src/main/resources/assets/superbwarfare/models/item/m_98b.json index 1f7a56b73..5b7d76ba7 100644 --- a/src/main/resources/assets/superbwarfare/models/item/m_98b.json +++ b/src/main/resources/assets/superbwarfare/models/item/m_98b.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/m_98b_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/marlin.json b/src/main/resources/assets/superbwarfare/models/item/marlin.json index db617176e..0ff382b42 100644 --- a/src/main/resources/assets/superbwarfare/models/item/marlin.json +++ b/src/main/resources/assets/superbwarfare/models/item/marlin.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/marlin_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/minigun.json b/src/main/resources/assets/superbwarfare/models/item/minigun.json index a27baf700..0d228af02 100644 --- a/src/main/resources/assets/superbwarfare/models/item/minigun.json +++ b/src/main/resources/assets/superbwarfare/models/item/minigun.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/minigun_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/mk_14.json b/src/main/resources/assets/superbwarfare/models/item/mk_14.json index cc2a85ec5..ee5c8aa43 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mk_14.json +++ b/src/main/resources/assets/superbwarfare/models/item/mk_14.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/mk_14_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/mosin_nagant.json b/src/main/resources/assets/superbwarfare/models/item/mosin_nagant.json index a05eceaa0..4636bdddb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mosin_nagant.json +++ b/src/main/resources/assets/superbwarfare/models/item/mosin_nagant.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/mosin_nagant_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/mp_443.json b/src/main/resources/assets/superbwarfare/models/item/mp_443.json index 2dbcc4426..4ca84b1cb 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mp_443.json +++ b/src/main/resources/assets/superbwarfare/models/item/mp_443.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/glock_17_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/ntw_20.json b/src/main/resources/assets/superbwarfare/models/item/ntw_20.json index 2b62d8289..d06c6eb72 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ntw_20.json +++ b/src/main/resources/assets/superbwarfare/models/item/ntw_20.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/ntw_20_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/qbz_95.json b/src/main/resources/assets/superbwarfare/models/item/qbz_95.json index 7c823bf14..f1935311e 100644 --- a/src/main/resources/assets/superbwarfare/models/item/qbz_95.json +++ b/src/main/resources/assets/superbwarfare/models/item/qbz_95.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/qbz_95_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/rpg.json b/src/main/resources/assets/superbwarfare/models/item/rpg.json index 0313fcecb..508d3e86a 100644 --- a/src/main/resources/assets/superbwarfare/models/item/rpg.json +++ b/src/main/resources/assets/superbwarfare/models/item/rpg.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/rpg_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/rpk.json b/src/main/resources/assets/superbwarfare/models/item/rpk.json index fbf4973b2..7be6e9386 100644 --- a/src/main/resources/assets/superbwarfare/models/item/rpk.json +++ b/src/main/resources/assets/superbwarfare/models/item/rpk.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/rpk_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json b/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json index 5a55a5e59..d696ca8d7 100644 --- a/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json +++ b/src/main/resources/assets/superbwarfare/models/item/secondary_cataclysm.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/secondary_cataclysm_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/sentinel.json b/src/main/resources/assets/superbwarfare/models/item/sentinel.json index adbea5ef8..611fa2b96 100644 --- a/src/main/resources/assets/superbwarfare/models/item/sentinel.json +++ b/src/main/resources/assets/superbwarfare/models/item/sentinel.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/sentinel_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/sks.json b/src/main/resources/assets/superbwarfare/models/item/sks.json index caa6f6cc6..e744cb0dd 100644 --- a/src/main/resources/assets/superbwarfare/models/item/sks.json +++ b/src/main/resources/assets/superbwarfare/models/item/sks.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/sks_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/svd.json b/src/main/resources/assets/superbwarfare/models/item/svd.json index 08af87e75..49458e317 100644 --- a/src/main/resources/assets/superbwarfare/models/item/svd.json +++ b/src/main/resources/assets/superbwarfare/models/item/svd.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/svd_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/taser.json b/src/main/resources/assets/superbwarfare/models/item/taser.json index cae847e9a..83826a4b0 100644 --- a/src/main/resources/assets/superbwarfare/models/item/taser.json +++ b/src/main/resources/assets/superbwarfare/models/item/taser.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/taser_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/trachelium.json b/src/main/resources/assets/superbwarfare/models/item/trachelium.json index ee44b3fdd..f7fb02958 100644 --- a/src/main/resources/assets/superbwarfare/models/item/trachelium.json +++ b/src/main/resources/assets/superbwarfare/models/item/trachelium.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/trachelium_base" diff --git a/src/main/resources/assets/superbwarfare/models/item/vector.json b/src/main/resources/assets/superbwarfare/models/item/vector.json index 6119dc5c8..bff82e7cd 100644 --- a/src/main/resources/assets/superbwarfare/models/item/vector.json +++ b/src/main/resources/assets/superbwarfare/models/item/vector.json @@ -1,5 +1,5 @@ { - "loader": "forge:separate_transforms", + "loader": "neoforge:separate_transforms", "gui_light": "front", "base": { "parent": "superbwarfare:item/vector_base" diff --git a/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_galena_ore_biome_modifier.json b/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_galena_ore_biome_modifier.json index 995abf2a1..9257ffb3d 100644 --- a/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_galena_ore_biome_modifier.json +++ b/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_galena_ore_biome_modifier.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#is_overworld", "features": "superbwarfare:deepslate_galena_ore", "step": "underground_ores" diff --git a/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_scheelite_ore_biome_modifier.json b/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_scheelite_ore_biome_modifier.json index afede97ad..19f5d898a 100644 --- a/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_scheelite_ore_biome_modifier.json +++ b/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_scheelite_ore_biome_modifier.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#is_overworld", "features": "superbwarfare:deepslate_scheelite_ore", "step": "underground_ores" diff --git a/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_silver_ore_biome_modifier.json b/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_silver_ore_biome_modifier.json index 416cd96a8..24bd99e1f 100644 --- a/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_silver_ore_biome_modifier.json +++ b/src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_silver_ore_biome_modifier.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#is_overworld", "features": "superbwarfare:deepslate_silver_ore", "step": "underground_ores" diff --git a/src/main/resources/data/superbwarfare/forge/biome_modifier/galena_ore_biome_modifier.json b/src/main/resources/data/superbwarfare/forge/biome_modifier/galena_ore_biome_modifier.json index 2ff46b894..242b28f33 100644 --- a/src/main/resources/data/superbwarfare/forge/biome_modifier/galena_ore_biome_modifier.json +++ b/src/main/resources/data/superbwarfare/forge/biome_modifier/galena_ore_biome_modifier.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#is_overworld", "features": "superbwarfare:galena_ore", "step": "underground_ores" diff --git a/src/main/resources/data/superbwarfare/forge/biome_modifier/scheelite_ore_biome_modifier.json b/src/main/resources/data/superbwarfare/forge/biome_modifier/scheelite_ore_biome_modifier.json index 10213b388..9cd7f1551 100644 --- a/src/main/resources/data/superbwarfare/forge/biome_modifier/scheelite_ore_biome_modifier.json +++ b/src/main/resources/data/superbwarfare/forge/biome_modifier/scheelite_ore_biome_modifier.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#is_overworld", "features": "superbwarfare:scheelite_ore", "step": "underground_ores" diff --git a/src/main/resources/data/superbwarfare/forge/biome_modifier/senpai_biome_modifier.json b/src/main/resources/data/superbwarfare/forge/biome_modifier/senpai_biome_modifier.json index e20d1bc05..a8922723e 100644 --- a/src/main/resources/data/superbwarfare/forge/biome_modifier/senpai_biome_modifier.json +++ b/src/main/resources/data/superbwarfare/forge/biome_modifier/senpai_biome_modifier.json @@ -1,5 +1,5 @@ { - "type": "forge:add_spawns", + "type": "neoforge:add_spawns", "biomes": [ "badlands", "bamboo_jungle", diff --git a/src/main/resources/data/superbwarfare/forge/biome_modifier/silver_ore_biome_modifier.json b/src/main/resources/data/superbwarfare/forge/biome_modifier/silver_ore_biome_modifier.json index 5d46ee661..4de70d3c1 100644 --- a/src/main/resources/data/superbwarfare/forge/biome_modifier/silver_ore_biome_modifier.json +++ b/src/main/resources/data/superbwarfare/forge/biome_modifier/silver_ore_biome_modifier.json @@ -1,5 +1,5 @@ { - "type": "forge:add_features", + "type": "neoforge:add_features", "biomes": "#is_overworld", "features": "superbwarfare:silver_ore", "step": "underground_ores" diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json index f9e961f6f..c49425b03 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/ancient_cpu_chest.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/ancient_city" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json index 6eac262cd..2dd3ed7fa 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/simple_dungeon" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json index 92c3722a8..5818a6913 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_2.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/abandoned_mineshaft" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json index 37089956b..856b2e2c7 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_3.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/shipwreck_map" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json index 528b22125..bfdffe88d 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_4.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/shipwreck_supply" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json index 88a01365b..6c182b4bd 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_5.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/shipwreck_treasure" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json index 8e287bb57..f423ed607 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/common_chest_6.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/ruined_portal" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json index ee271983c..9c5d87cae 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/pillager_outpost" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json index 2d0fdbd82..0c93e242f 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_2.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_library" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json index 5c22c6487..bd305bd57 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_3.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/woodland_mansion" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json index 202564653..33b6c47d4 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/epic_chest_4.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/end_city_treasure" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json index 59f49a5b9..9083df0a1 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/ancient_city" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json index e44fa44c9..e16fabf68 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_2.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/ancient_city_ice_box" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json index 1af7fa87e..e3fa7c765 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_3.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/bastion_bridge" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json index 66a8d3fcf..9ed5a592c 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_4.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/bastion_hoglin_stable" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json index 14961f80c..8be406ce1 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_5.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/bastion_other" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json index fbfb48e22..043188154 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_6.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/buried_treasure" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json index e65178eab..d7756ac2f 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_7.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/desert_pyramid" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json index fb1ee4871..01cc84914 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_8.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/igloo" } ], diff --git a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json index ed461bdf5..d99f37b5d 100644 --- a/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json +++ b/src/main/resources/data/superbwarfare/loot_modifiers/rare_chest_9.json @@ -2,7 +2,7 @@ "type": "superbwarfare:superbwarfare_loot_modifier", "conditions": [ { - "condition": "forge:loot_table_id", + "condition": "neoforge:loot_table_id", "loot_table_id": "minecraft:chests/jungle_temple" } ], diff --git a/src/main/resources/data/superbwarfare/recipes/ammo_box_crafting.json b/src/main/resources/data/superbwarfare/recipes/ammo_box_crafting.json index 29f1c8565..ecdd50811 100644 --- a/src/main/resources/data/superbwarfare/recipes/ammo_box_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ammo_box_crafting.json @@ -10,7 +10,7 @@ "item": "minecraft:iron_ingot" }, "b": { - "tag": "forge:dyes/green" + "tag": "c:dyes/green" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/battery_crafting_2.json b/src/main/resources/data/superbwarfare/recipes/battery_crafting_2.json index d02f1e7ec..2f2007790 100644 --- a/src/main/resources/data/superbwarfare/recipes/battery_crafting_2.json +++ b/src/main/resources/data/superbwarfare/recipes/battery_crafting_2.json @@ -8,10 +8,10 @@ ], "key": { "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { - "tag": "forge:glass_panes" + "tag": "c:glass_panes" }, "d": { "item": "minecraft:redstone" diff --git a/src/main/resources/data/superbwarfare/recipes/charging_station_crafting.json b/src/main/resources/data/superbwarfare/recipes/charging_station_crafting.json index 007ab288d..706cd46d9 100644 --- a/src/main/resources/data/superbwarfare/recipes/charging_station_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/charging_station_crafting.json @@ -8,7 +8,7 @@ ], "key": { "a": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "b": { "item": "minecraft:iron_ingot" diff --git a/src/main/resources/data/superbwarfare/recipes/coal_iron_powder_crafting.json b/src/main/resources/data/superbwarfare/recipes/coal_iron_powder_crafting.json index 0226c5177..d397ba9f7 100644 --- a/src/main/resources/data/superbwarfare/recipes/coal_iron_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/coal_iron_powder_crafting.json @@ -3,10 +3,10 @@ "category": "misc", "ingredients": [ { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, { - "tag": "forge:dusts/coal_coke" + "tag": "c:dusts/coal_coke" } ], "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_lead_blasting.json b/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_lead_blasting.json index 56de86895..158dfbfeb 100644 --- a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_lead_blasting.json +++ b/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_lead_blasting.json @@ -9,7 +9,7 @@ "result": "superbwarfare:lead_ingot", "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ] diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_silver_blasting.json b/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_silver_blasting.json index 03c71c4bf..e98661a0a 100644 --- a/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_silver_blasting.json +++ b/src/main/resources/data/superbwarfare/recipes/compat/create/blasting/crushed_raw_silver_blasting.json @@ -9,7 +9,7 @@ "result": "superbwarfare:silver_ingot", "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ] diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/iron_powder.json b/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/iron_powder.json index 261b24af7..b641d99f9 100644 --- a/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/iron_powder.json +++ b/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/iron_powder.json @@ -14,7 +14,7 @@ ], "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ] diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/tungsten_powder.json b/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/tungsten_powder.json index dd4995e8e..3c35cad68 100644 --- a/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/tungsten_powder.json +++ b/src/main/resources/data/superbwarfare/recipes/compat/create/crushing/tungsten_powder.json @@ -2,7 +2,7 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:ingots/tungsten" + "tag": "c:ingots/tungsten" } ], "processingTime": 150, @@ -14,7 +14,7 @@ ], "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ] diff --git a/src/main/resources/data/superbwarfare/recipes/compat/create/mixing/high_energy_explosives.json b/src/main/resources/data/superbwarfare/recipes/compat/create/mixing/high_energy_explosives.json index c02b2c9ab..4b04a71b6 100644 --- a/src/main/resources/data/superbwarfare/recipes/compat/create/mixing/high_energy_explosives.json +++ b/src/main/resources/data/superbwarfare/recipes/compat/create/mixing/high_energy_explosives.json @@ -8,7 +8,7 @@ "item": "minecraft:gunpowder" }, { - "tag": "forge:sand" + "tag": "c:sand" }, { "item": "minecraft:sugar" @@ -22,7 +22,7 @@ ], "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "create" } ] diff --git a/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json b/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json index 5b091665b..8910c4d52 100644 --- a/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ge_helmet_m_35_crafting.json @@ -10,7 +10,7 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:dyes/black" + "tag": "c:dyes/black" }, "c": { "item": "superbwarfare:steel_ingot" diff --git a/src/main/resources/data/superbwarfare/recipes/grain_crafting.json b/src/main/resources/data/superbwarfare/recipes/grain_crafting.json index f4edbdad6..03862bc7a 100644 --- a/src/main/resources/data/superbwarfare/recipes/grain_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/grain_crafting.json @@ -8,7 +8,7 @@ ], "key": { "a": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "b": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/superbwarfare/recipes/handgun_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipes/handgun_ammo_crafting.json index 4e4cbef85..0ee25ffee 100644 --- a/src/main/resources/data/superbwarfare/recipes/handgun_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/handgun_ammo_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:copper_ingot" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json index 94d24b4b9..37a1cf3aa 100644 --- a/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/heavy_ammo_crafting.json @@ -11,7 +11,7 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "c": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json b/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json index 5c8b55c14..9d554dc28 100644 --- a/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/high_energy_explosives_crafting.json @@ -14,7 +14,7 @@ "item": "minecraft:sugar" }, "c": { - "tag": "forge:sand" + "tag": "c:sand" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/knife_crafting.json b/src/main/resources/data/superbwarfare/recipes/knife_crafting.json index cfa24cc7c..6a4fe2df3 100644 --- a/src/main/resources/data/superbwarfare/recipes/knife_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/knife_crafting.json @@ -7,7 +7,7 @@ ], "key": { "a": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "b": { "item": "minecraft:stick" diff --git a/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json index b1c04ef31..72c313eff 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json @@ -11,7 +11,7 @@ "item": "superbwarfare:lead_ingot" }, "b": { - "tag":"forge:ingots/lead" + "tag": "neoforge:ingots/lead" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json b/src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json index 5a0af7559..27bec4fab 100644 --- a/src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json +++ b/src/main/resources/data/superbwarfare/recipes/lead_powder_blasting.json @@ -3,7 +3,7 @@ "cookingtime": 100, "experience": 0.3, "ingredient": { - "tag": "forge:dusts/lead" + "tag": "c:dusts/lead" }, "result": "superbwarfare:lead_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/monitor_crafting.json b/src/main/resources/data/superbwarfare/recipes/monitor_crafting.json index 1a900469b..5956ef53b 100644 --- a/src/main/resources/data/superbwarfare/recipes/monitor_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/monitor_crafting.json @@ -20,7 +20,7 @@ "item": "minecraft:amethyst_shard" }, "e": { - "tag": "forge:glass_panes" + "tag": "c:glass_panes" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json index 8f7fd9206..7e57d3ed1 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json @@ -11,10 +11,10 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag":"forge:storage_blocks/tungsten" + "tag": "neoforge:storage_blocks/tungsten" }, "c": { - "tag":"forge:ingots/tungsten" + "tag": "neoforge:ingots/tungsten" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/perk/blade_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/blade_bullet_perk_crafting.json index 1f89327f6..e322b954c 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/blade_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/blade_bullet_perk_crafting.json @@ -1,7 +1,7 @@ { "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "dreamaticvoyage" } ], diff --git a/src/main/resources/data/superbwarfare/recipes/perk/butterfly_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/butterfly_bullet_perk_crafting.json index eacf10eca..c0e1e5c9b 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/butterfly_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/butterfly_bullet_perk_crafting.json @@ -1,7 +1,7 @@ { "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "virtuarealcraft" } ], diff --git a/src/main/resources/data/superbwarfare/recipes/perk/curse_flame_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/curse_flame_bullet_perk_crafting.json index 1230aef4b..3e89c2cb4 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/curse_flame_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/curse_flame_bullet_perk_crafting.json @@ -1,7 +1,7 @@ { "conditions": [ { - "type": "forge:mod_loaded", + "type": "neoforge:mod_loaded", "modid": "virtuarealcraft" } ], diff --git a/src/main/resources/data/superbwarfare/recipes/perk/jhp_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/jhp_bullet_perk_crafting.json index 4115b1d34..e19f8dd10 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/jhp_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/jhp_bullet_perk_crafting.json @@ -11,10 +11,10 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag":"forge:storage_blocks/copper" + "tag": "neoforge:storage_blocks/copper" }, "c": { - "tag":"forge:ingots/copper" + "tag": "neoforge:ingots/copper" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json index 46040b175..e7f99e9c4 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json @@ -11,7 +11,7 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag":"forge:storage_blocks/lead" + "tag": "neoforge:storage_blocks/lead" }, "c": { "item":"minecraft:spider_eye" diff --git a/src/main/resources/data/superbwarfare/recipes/perk/powerful_attraction_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/powerful_attraction_perk_crafting.json index c106f6138..dda957b54 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/powerful_attraction_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/powerful_attraction_perk_crafting.json @@ -11,16 +11,16 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag": "forge:ender_pearls" + "tag": "c:ender_pearls" }, "c": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "d": { - "tag": "forge:dusts/redstone" + "tag": "c:dusts/redstone" }, "e": { - "tag": "forge:gems/lapis" + "tag": "c:gems/lapis" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json index 94e2d39cf..26d411cf2 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json @@ -11,10 +11,10 @@ "item": "superbwarfare:empty_perk" }, "b": { - "tag":"forge:storage_blocks/silver" + "tag":"neoforge:storage_blocks/silver" }, "c": { - "tag":"forge:ingots/silver" + "tag":"neoforge:ingots/silver" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json b/src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json index 67bae3af5..9ee79a5cd 100644 --- a/src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json @@ -17,7 +17,7 @@ "item": "minecraft:lightning_rod" }, "d": { - "tag": "forge:dusts/coal_coke" + "tag": "c:dusts/coal_coke" }, "e": { "item": "minecraft:iron_ingot" diff --git a/src/main/resources/data/superbwarfare/recipes/primer_crafting.json b/src/main/resources/data/superbwarfare/recipes/primer_crafting.json index b1a298973..98abef684 100644 --- a/src/main/resources/data/superbwarfare/recipes/primer_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/primer_crafting.json @@ -7,7 +7,7 @@ ], "key": { "a": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "b": { "item": "minecraft:flint" diff --git a/src/main/resources/data/superbwarfare/recipes/raw_cemented_carbide_powder_crafting.json b/src/main/resources/data/superbwarfare/recipes/raw_cemented_carbide_powder_crafting.json index 435b48542..54bab22f7 100644 --- a/src/main/resources/data/superbwarfare/recipes/raw_cemented_carbide_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/raw_cemented_carbide_powder_crafting.json @@ -8,13 +8,13 @@ ], "key": { "a": { - "tag": "forge:dusts/tungsten" + "tag": "c:dusts/tungsten" }, "b": { - "tag": "forge:dusts/iron" + "tag": "c:dusts/iron" }, "c": { - "tag": "forge:dusts/coal_coke" + "tag": "c:dusts/coal_coke" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json index 033fd4813..f81e03370 100644 --- a/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/rifle_ammo_crafting.json @@ -11,7 +11,7 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json b/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json index e262cf5a3..24b431c73 100644 --- a/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ru_chest_6b43_crafting.json @@ -11,7 +11,7 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { - "tag": "forge:dyes/green" + "tag": "c:dyes/green" }, "c": { "item": "superbwarfare:cemented_carbide_ingot" diff --git a/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json b/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json index fa625b7c2..08b509e3c 100644 --- a/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ru_helmet_6b47_crafting.json @@ -10,7 +10,7 @@ "tag": "superbwarfare:ingots/cemented_carbide" }, "b": { - "tag": "forge:dyes/green" + "tag": "c:dyes/green" }, "c": { "item": "superbwarfare:cemented_carbide_ingot" diff --git a/src/main/resources/data/superbwarfare/recipes/shotgun_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipes/shotgun_ammo_crafting.json index 255babb4c..f92d04d59 100644 --- a/src/main/resources/data/superbwarfare/recipes/shotgun_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/shotgun_ammo_crafting.json @@ -8,10 +8,10 @@ ], "key": { "a": { - "tag": "forge:ingots/lead" + "tag": "c:ingots/lead" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json index 51cd9eba1..64846575b 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json @@ -11,7 +11,7 @@ "item": "superbwarfare:silver_ingot" }, "b": { - "tag":"forge:ingots/silver" + "tag":"neoforge:ingots/silver" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/silver_powder_blasting.json b/src/main/resources/data/superbwarfare/recipes/silver_powder_blasting.json index 496b37db8..8785fa49a 100644 --- a/src/main/resources/data/superbwarfare/recipes/silver_powder_blasting.json +++ b/src/main/resources/data/superbwarfare/recipes/silver_powder_blasting.json @@ -3,7 +3,7 @@ "cookingtime": 100, "experience": 0.3, "ingredient": { - "tag": "forge:dusts/silver" + "tag": "c:dusts/silver" }, "result": "superbwarfare:silver_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json b/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json index 7efe312b1..0bec96cf4 100644 --- a/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/small_shell_crafting.json @@ -11,7 +11,7 @@ "tag": "superbwarfare:ingots/steel" }, "b": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "c": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/superbwarfare/recipes/sniper_ammo_crafting.json b/src/main/resources/data/superbwarfare/recipes/sniper_ammo_crafting.json index 8238926fc..a8c8f9f04 100644 --- a/src/main/resources/data/superbwarfare/recipes/sniper_ammo_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/sniper_ammo_crafting.json @@ -8,10 +8,10 @@ ], "key": { "a": { - "tag": "forge:ingots/tungsten" + "tag": "c:ingots/tungsten" }, "b": { - "tag": "forge:plates/copper" + "tag": "c:plates/copper" }, "c": { "item": "minecraft:gunpowder" diff --git a/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json index 77c51f87d..16cd5397d 100644 --- a/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json @@ -8,7 +8,7 @@ ], "key": { "a": { - "tag": "forge:ingots/steel" + "tag": "c:ingots/steel" }, "b": { "item": "superbwarfare:steel_ingot" diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json index c11280950..9d9e6eff3 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json @@ -11,7 +11,7 @@ "item": "superbwarfare:tungsten_ingot" }, "b": { - "tag":"forge:ingots/tungsten" + "tag":"neoforge:ingots/tungsten" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_powder_blasting.json b/src/main/resources/data/superbwarfare/recipes/tungsten_powder_blasting.json index 9360066ff..0a9476782 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_powder_blasting.json +++ b/src/main/resources/data/superbwarfare/recipes/tungsten_powder_blasting.json @@ -3,7 +3,7 @@ "cookingtime": 100, "experience": 0.3, "ingredient": { - "tag": "forge:dusts/tungsten" + "tag": "c:dusts/tungsten" }, "result": "superbwarfare:tungsten_ingot" } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_powder_crafting.json b/src/main/resources/data/superbwarfare/recipes/tungsten_powder_crafting.json index 08019d316..52e976ff1 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_powder_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/tungsten_powder_crafting.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:ingots/tungsten" + "tag": "c:ingots/tungsten" }, { "item": "superbwarfare:hammer" diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json b/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json index 0af6c3481..1439b606e 100644 --- a/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/tungsten_rod_crafting.json @@ -7,7 +7,7 @@ ], "key": { "a": { - "tag": "forge:ingots/tungsten" + "tag": "c:ingots/tungsten" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/wheel_crafting.json b/src/main/resources/data/superbwarfare/recipes/wheel_crafting.json index e3692eb20..a6d69d187 100644 --- a/src/main/resources/data/superbwarfare/recipes/wheel_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/wheel_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:black_wool" }, "b": { - "tag":"forge:ingots/iron" + "tag":"neoforge:ingots/iron" } }, "result": {