更新资源文件

This commit is contained in:
Light_Quanta 2025-04-02 02:21:35 +08:00
parent 44d33495db
commit 22ed5dfbd0
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
115 changed files with 293 additions and 188 deletions

View file

@ -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

View file

@ -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
}

View file

@ -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;
}
}

View file

@ -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) {

View file

@ -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) {

View file

@ -131,7 +131,8 @@ public class BocekItemRenderer extends GeoItemRenderer<BocekItem> {
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

View file

@ -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<VectorItem> {
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<String> hiddenBones = new HashSet<>();
private final Set<String> hiddenBones;
private final Set<String> 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<VectorItem> {
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<VectorItem> {
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<AbstractClientPlayer> 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);
// }
}

View file

@ -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")) {

View file

@ -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);
}

View file

@ -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": {

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/aa_12_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/ak_12_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/ak_47_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/bocek_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/devotion_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/glock_17_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/glock_17_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/hk416_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/homemade_shotgun_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/hunting_rifle_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/javelin_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/k98_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/lunge_mine_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/m_1911_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/m_4_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/m_60_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/m79_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/m_870_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/m_98b_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/marlin_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/minigun_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/mk_14_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/mosin_nagant_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/glock_17_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/ntw_20_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/qbz_95_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/rpg_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/rpk_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/secondary_cataclysm_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/sentinel_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/sks_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/svd_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/taser_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/trachelium_base"

View file

@ -1,5 +1,5 @@
{
"loader": "forge:separate_transforms",
"loader": "neoforge:separate_transforms",
"gui_light": "front",
"base": {
"parent": "superbwarfare:item/vector_base"

View file

@ -1,5 +1,5 @@
{
"type": "forge:add_features",
"type": "neoforge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:deepslate_galena_ore",
"step": "underground_ores"

View file

@ -1,5 +1,5 @@
{
"type": "forge:add_features",
"type": "neoforge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:deepslate_scheelite_ore",
"step": "underground_ores"

View file

@ -1,5 +1,5 @@
{
"type": "forge:add_features",
"type": "neoforge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:deepslate_silver_ore",
"step": "underground_ores"

View file

@ -1,5 +1,5 @@
{
"type": "forge:add_features",
"type": "neoforge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:galena_ore",
"step": "underground_ores"

View file

@ -1,5 +1,5 @@
{
"type": "forge:add_features",
"type": "neoforge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:scheelite_ore",
"step": "underground_ores"

View file

@ -1,5 +1,5 @@
{
"type": "forge:add_spawns",
"type": "neoforge:add_spawns",
"biomes": [
"badlands",
"bamboo_jungle",

View file

@ -1,5 +1,5 @@
{
"type": "forge:add_features",
"type": "neoforge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:silver_ore",
"step": "underground_ores"

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -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"
}
],

View file

@ -10,7 +10,7 @@
"item": "minecraft:iron_ingot"
},
"b": {
"tag": "forge:dyes/green"
"tag": "c:dyes/green"
}
},
"result": {

View file

@ -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"

View file

@ -8,7 +8,7 @@
],
"key": {
"a": {
"tag": "forge:ingots/copper"
"tag": "c:ingots/copper"
},
"b": {
"item": "minecraft:iron_ingot"

View file

@ -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": {

View file

@ -9,7 +9,7 @@
"result": "superbwarfare:lead_ingot",
"conditions": [
{
"type": "forge:mod_loaded",
"type": "neoforge:mod_loaded",
"modid": "create"
}
]

View file

@ -9,7 +9,7 @@
"result": "superbwarfare:silver_ingot",
"conditions": [
{
"type": "forge:mod_loaded",
"type": "neoforge:mod_loaded",
"modid": "create"
}
]

View file

@ -14,7 +14,7 @@
],
"conditions": [
{
"type": "forge:mod_loaded",
"type": "neoforge:mod_loaded",
"modid": "create"
}
]

View file

@ -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"
}
]

View file

@ -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"
}
]

View file

@ -10,7 +10,7 @@
"tag": "superbwarfare:ingots/steel"
},
"b": {
"tag": "forge:dyes/black"
"tag": "c:dyes/black"
},
"c": {
"item": "superbwarfare:steel_ingot"

View file

@ -8,7 +8,7 @@
],
"key": {
"a": {
"tag": "forge:plates/copper"
"tag": "c:plates/copper"
},
"b": {
"item": "minecraft:gunpowder"

View file

@ -11,7 +11,7 @@
"item": "minecraft:copper_ingot"
},
"b": {
"tag": "forge:plates/copper"
"tag": "c:plates/copper"
},
"c": {
"item": "minecraft:gunpowder"

View file

@ -11,7 +11,7 @@
"tag": "superbwarfare:ingots/steel"
},
"b": {
"tag": "forge:ingots/copper"
"tag": "c:ingots/copper"
},
"c": {
"item": "minecraft:gunpowder"

View file

@ -14,7 +14,7 @@
"item": "minecraft:sugar"
},
"c": {
"tag": "forge:sand"
"tag": "c:sand"
}
},
"result": {

View file

@ -7,7 +7,7 @@
],
"key": {
"a": {
"tag": "forge:ingots/steel"
"tag": "c:ingots/steel"
},
"b": {
"item": "minecraft:stick"

View file

@ -11,7 +11,7 @@
"item": "superbwarfare:lead_ingot"
},
"b": {
"tag":"forge:ingots/lead"
"tag": "neoforge:ingots/lead"
}
},
"result": {

View file

@ -3,7 +3,7 @@
"cookingtime": 100,
"experience": 0.3,
"ingredient": {
"tag": "forge:dusts/lead"
"tag": "c:dusts/lead"
},
"result": "superbwarfare:lead_ingot"
}

View file

@ -20,7 +20,7 @@
"item": "minecraft:amethyst_shard"
},
"e": {
"tag": "forge:glass_panes"
"tag": "c:glass_panes"
}
},
"result": {

View file

@ -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": {

View file

@ -1,7 +1,7 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"type": "neoforge:mod_loaded",
"modid": "dreamaticvoyage"
}
],

View file

@ -1,7 +1,7 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"type": "neoforge:mod_loaded",
"modid": "virtuarealcraft"
}
],

View file

@ -1,7 +1,7 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"type": "neoforge:mod_loaded",
"modid": "virtuarealcraft"
}
],

View file

@ -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": {

View file

@ -11,7 +11,7 @@
"item": "superbwarfare:empty_perk"
},
"b": {
"tag":"forge:storage_blocks/lead"
"tag": "neoforge:storage_blocks/lead"
},
"c": {
"item":"minecraft:spider_eye"

View file

@ -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": {

View file

@ -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": {

View file

@ -17,7 +17,7 @@
"item": "minecraft:lightning_rod"
},
"d": {
"tag": "forge:dusts/coal_coke"
"tag": "c:dusts/coal_coke"
},
"e": {
"item": "minecraft:iron_ingot"

View file

@ -7,7 +7,7 @@
],
"key": {
"a": {
"tag": "forge:plates/copper"
"tag": "c:plates/copper"
},
"b": {
"item": "minecraft:flint"

Some files were not shown because too many files have changed in this diff Show more