diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json index be4f9c4..e4e981b 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json @@ -52,6 +52,7 @@ "config.jade.plugin_anvilcraft_pigsplus.electric_enchanting_table": "ǝןqɐ⟘ buıʇuɐɥɔuƎ ɔıɹʇɔǝןƎ", "config.jade.plugin_anvilcraft_pigsplus.enchanted_generator": "ɹoʇɐɹǝuǝ⅁ pǝʇuɐɥɔuƎ", "item.anvilcraft_pigsplus.chaotic_raw_ore": "ǝɹO ʍɐᴚ ɔıʇoɐɥƆ", + "item.anvilcraft_pigsplus.ender_component": "ʇuǝuodɯoƆ ɹǝpuƎ", "item.anvilcraft_pigsplus.karakuri_component": "ʇuǝuodɯoƆ ıɹnʞɐɹɐʞ", "item.anvilcraft_pigsplus.spiritual_component": "ʇuǝuodɯoƆ ןɐnʇıɹıdS", "itemGroup.anvilcraft_pigsplus.addon_items": "snןԀ sbıԀ :ʇɟɐɹƆןıʌuⱯ", diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json index 4dab7d6..ab298ba 100644 --- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json +++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json @@ -52,6 +52,7 @@ "config.jade.plugin_anvilcraft_pigsplus.electric_enchanting_table": "Electric Enchanting Table", "config.jade.plugin_anvilcraft_pigsplus.enchanted_generator": "Enchanted Generator", "item.anvilcraft_pigsplus.chaotic_raw_ore": "Chaotic Raw Ore", + "item.anvilcraft_pigsplus.ender_component": "Ender Component", "item.anvilcraft_pigsplus.karakuri_component": "Karakuri Component", "item.anvilcraft_pigsplus.spiritual_component": "Spiritual Component", "itemGroup.anvilcraft_pigsplus.addon_items": "AnvilCraft: Pigs Plus", diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/models/item/ender_component.json b/src/generated/resources/assets/anvilcraft_pigsplus/models/item/ender_component.json new file mode 100644 index 0000000..a2e77f8 --- /dev/null +++ b/src/generated/resources/assets/anvilcraft_pigsplus/models/item/ender_component.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "anvilcraft_pigsplus:item/ender_component" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft/advancement/recipes/time_warp/ender_component.json b/src/generated/resources/data/anvilcraft/advancement/recipes/time_warp/ender_component.json new file mode 100644 index 0000000..9f8bfff --- /dev/null +++ b/src/generated/resources/data/anvilcraft/advancement/recipes/time_warp/ender_component.json @@ -0,0 +1,21 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "anvilcraft:time_warp/ender_component" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "anvilcraft:time_warp/ender_component" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json b/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json new file mode 100644 index 0000000..8f7669f --- /dev/null +++ b/src/generated/resources/data/anvilcraft/recipe/time_warp/ender_component.json @@ -0,0 +1,28 @@ +{ + "type": "anvilcraft:time_warp", + "ingredients": [ + { + "items": "anvilcraft_pigsplus:karakuri_component" + }, + { + "items": "minecraft:ender_pearl" + }, + { + "count": 3, + "items": "minecraft:end_stone" + } + ], + "results": [ + { + "count": { + "type": "minecraft:binomial", + "n": 1.0, + "p": 0.2 + }, + "id": "anvilcraft_pigsplus:ender_component" + }, + { + "id": "anvilcraft:levitation_powder" + } + ] +} \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java b/src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java index 77520e8..7b058bf 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java +++ b/src/main/java/dev/anvilcraft/pigsplus/block/AdjustablePowerConverterBlock.java @@ -35,8 +35,8 @@ public class AdjustablePowerConverterBlock extends BetterBaseEntityBlock impleme public AdjustablePowerConverterBlock(Properties properties) { super(properties); this.registerDefaultState(this.stateDefinition.any() - .setValue(POWERED, false) - .setValue(OVERLOAD, true)); + .setValue(POWERED, false) + .setValue(OVERLOAD, true)); } @Override @@ -64,14 +64,23 @@ public InteractionResult use( } return InteractionResult.SUCCESS; } + @Nullable @Override public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { if (level.isClientSide) { - return null; + return createTickerHelper( + type, + AddonBlockEntities.ADJUSTABLE_POWER_CONVERTER.get(), + (level1, blockPos, blockState, blockEntity) -> blockEntity.clientTick() + ); + } else { + return createTickerHelper( + type, + AddonBlockEntities.ADJUSTABLE_POWER_CONVERTER.get(), + (level1, blockPos, blockState, blockEntity) -> blockEntity.tick() + ); } - return createTickerHelper(type, AddonBlockEntities.ADJUSTABLE_POWER_CONVERTER.get(), - (level1, blockPos, blockState, blockEntity) -> blockEntity.tick()); } @Override diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java index d9f9355..eeec6fd 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java +++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/AdjustablePowerConverterBlockEntity.java @@ -32,6 +32,8 @@ public class AdjustablePowerConverterBlockEntity extends BlockEntity @Setter private int powerTarget = 16; + private int time = 0; + public final EnergyStorage feEnergy = new EnergyStorage(128000000); public AdjustablePowerConverterBlockEntity(BlockEntityType type, BlockPos pos, BlockState blockState) { @@ -88,11 +90,15 @@ public int getInputPower() { public PowerComponentType getComponentType() { return this.power >= 0 ? PowerComponentType.PRODUCER : PowerComponentType.CONSUMER; } + @Override public int getRange() { return 2; } + public void clientTick() { + time += 1; + } public void tick() { if (level == null || level.isClientSide()) return; diff --git a/src/main/java/dev/anvilcraft/pigsplus/client/AnvilCraftPigsPlusClient.java b/src/main/java/dev/anvilcraft/pigsplus/client/AnvilCraftPigsPlusClient.java index 6c3c553..725ef26 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/client/AnvilCraftPigsPlusClient.java +++ b/src/main/java/dev/anvilcraft/pigsplus/client/AnvilCraftPigsPlusClient.java @@ -5,10 +5,9 @@ import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModContainer; import net.neoforged.fml.common.Mod; -import org.jetbrains.annotations.NotNull; @Mod(value = AnvilCraftPigsPlus.MOD_ID, dist = Dist.CLIENT) public class AnvilCraftPigsPlusClient { - public AnvilCraftPigsPlusClient(@NotNull IEventBus modBus, @NotNull ModContainer container) { + public AnvilCraftPigsPlusClient(IEventBus modBus, ModContainer container) { } } diff --git a/src/main/java/dev/anvilcraft/pigsplus/client/event/RegisterAdditionalEventListener.java b/src/main/java/dev/anvilcraft/pigsplus/client/event/RegisterAdditionalEventListener.java index d998034..a1abb41 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/client/event/RegisterAdditionalEventListener.java +++ b/src/main/java/dev/anvilcraft/pigsplus/client/event/RegisterAdditionalEventListener.java @@ -15,5 +15,6 @@ public class RegisterAdditionalEventListener { @SubscribeEvent public static void registerModels(ModelEvent.RegisterAdditional event) { event.register(ModelResourceLocation.standalone(AnvilCraftPigsPlus.of("block/enchanted_generator_head"))); + event.register(ModelResourceLocation.standalone(AnvilCraftPigsPlus.of("block/adjustable_power_converter_core"))); } } diff --git a/src/main/java/dev/anvilcraft/pigsplus/client/renderer/blockentity/AdjustablePowerConverterRenderer.java b/src/main/java/dev/anvilcraft/pigsplus/client/renderer/blockentity/AdjustablePowerConverterRenderer.java new file mode 100644 index 0000000..6d8ff21 --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/client/renderer/blockentity/AdjustablePowerConverterRenderer.java @@ -0,0 +1,27 @@ +package dev.anvilcraft.pigsplus.client.renderer.blockentity; + +import dev.anvilcraft.pigsplus.AnvilCraftPigsPlus; +import dev.anvilcraft.pigsplus.block.entity.AdjustablePowerConverterBlockEntity; +import dev.dubhe.anvilcraft.client.renderer.blockentity.PowerProducerRenderer; +import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; +import net.minecraft.client.resources.model.ModelResourceLocation; + +public class AdjustablePowerConverterRenderer extends PowerProducerRenderer { + public static final ModelResourceLocation MODEL = ModelResourceLocation.standalone( + AnvilCraftPigsPlus.of("block/adjustable_power_converter_core") + ); + + public AdjustablePowerConverterRenderer(BlockEntityRendererProvider.Context context) { + } + + @Override + protected float elevation() { + return 0.5f; + } + + + @Override + protected ModelResourceLocation getModel() { + return MODEL; + } +} diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java index 624781d..da71034 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java +++ b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/RecipeHandler.java @@ -2,7 +2,9 @@ import com.tterrag.registrate.providers.RegistrateRecipeProvider; import dev.anvilcraft.pigsplus.init.AddonBlocks; +import dev.anvilcraft.pigsplus.init.AddonItems; import dev.dubhe.anvilcraft.recipe.anvil.wrap.ItemInjectRecipe; +import dev.dubhe.anvilcraft.recipe.anvil.wrap.TimeWarpRecipe; import dev.dubhe.anvilcraft.recipe.mineral.MineralFountainRecipe; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; @@ -26,5 +28,11 @@ public static void init(RegistrateRecipeProvider provider) { .resultBlock(AddonBlocks.BUDDING_ECHO_SHARD) .save(provider); + TimeWarpRecipe.builder() + .requires(AddonItems.KARAKURI_COMPONENT) + .requires(Items.ENDER_PEARL) + .requires(Items.END_STONE,3) + .result(AddonItems.ENDER_COMPONENT,0.2f) + .save(provider); } } diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java index 8307585..7d3c7ab 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java @@ -9,6 +9,7 @@ import dev.anvilcraft.pigsplus.block.entity.EnchantedGeneratorBlockEntity; import dev.anvilcraft.pigsplus.block.entity.AdjustablePowerConverterBlockEntity; import dev.anvilcraft.pigsplus.block.entity.SculkExtractorBlockEntity; +import dev.anvilcraft.pigsplus.client.renderer.blockentity.AdjustablePowerConverterRenderer; import dev.anvilcraft.pigsplus.client.renderer.blockentity.EnchantedGeneratorRenderer; import dev.anvilcraft.pigsplus.client.renderer.blockentity.ElectricEnchantingTableRenderer; @@ -55,6 +56,7 @@ public class AddonBlockEntities { public static final BlockEntityEntry ADJUSTABLE_POWER_CONVERTER = REGISTRATE.blockEntity("adjustable_power_converter", AdjustablePowerConverterBlockEntity::new) .validBlock(AddonBlocks.ADJUSTABLE_POWER_CONVERTER) + .renderer(() -> AdjustablePowerConverterRenderer::new) .register(); public static void register() { diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java index bc5576b..382f5d3 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java +++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java @@ -32,6 +32,10 @@ public class AddonItems { .item("spiritual_component", Item::new) .register(); + public static final ItemEntry ENDER_COMPONENT = REGISTRATE + .item("ender_component", Item::new) + .register(); + public static final ItemEntry CHAOTIC_RAW_ORE = REGISTRATE .item("chaotic_raw_ore", Item::new) .recipe((ctx, provider) -> ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ctx.get(), 9) diff --git a/src/main/java/dev/anvilcraft/pigsplus/item/KarakuriComponentItem.java b/src/main/java/dev/anvilcraft/pigsplus/item/KarakuriComponentItem.java index b2bb50d..53c4903 100644 --- a/src/main/java/dev/anvilcraft/pigsplus/item/KarakuriComponentItem.java +++ b/src/main/java/dev/anvilcraft/pigsplus/item/KarakuriComponentItem.java @@ -1,6 +1,7 @@ package dev.anvilcraft.pigsplus.item; import dev.anvilcraft.pigsplus.init.AddonItems; +import dev.anvilcraft.pigsplus.util.MathUtil; import net.minecraft.core.Holder; import net.minecraft.core.component.DataComponents; import net.minecraft.util.Mth; @@ -31,13 +32,13 @@ public void onDestroyed(ItemEntity itemEntity, DamageSource damageSource) { List> enchantments = itemEnchantments.keySet().stream().toList(); float probability = 0.2f * Mth.clamp(enchantments.size(), 0, 5); - int count = 0; - for (int i = 0; i < itemStack.getCount(); i++) { - if (level.random.nextFloat() < probability) count++; - } + + int count = MathUtil.getCount(probability, itemStack.getCount(), level); + // 生成灵媒部件 ItemStack resultItem = AddonItems.SPIRITUAL_COMPONENT.asStack(); resultItem.setCount(count); level.addFreshEntity(new ItemEntity(level, itemEntity.getX(), itemEntity.getY(), itemEntity.getZ(), resultItem)); } + } \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/mixin/package-info.java b/src/main/java/dev/anvilcraft/pigsplus/mixin/package-info.java new file mode 100644 index 0000000..2eff6e0 --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/mixin/package-info.java @@ -0,0 +1,3 @@ +@net.minecraft.MethodsReturnNonnullByDefault +@javax.annotation.ParametersAreNonnullByDefault +package dev.anvilcraft.pigsplus.mixin; \ No newline at end of file diff --git a/src/main/java/dev/anvilcraft/pigsplus/util/MathUtil.java b/src/main/java/dev/anvilcraft/pigsplus/util/MathUtil.java new file mode 100644 index 0000000..144082c --- /dev/null +++ b/src/main/java/dev/anvilcraft/pigsplus/util/MathUtil.java @@ -0,0 +1,17 @@ +package dev.anvilcraft.pigsplus.util; + +import net.minecraft.world.level.Level; + +public class MathUtil { + public static int getCount(float probability, int num, Level level) { + float totalProbability = probability * num; + int baseCount = (int) totalProbability; + float fractionalPart = totalProbability - baseCount; + + int count = baseCount; + if (level.random.nextFloat() < fractionalPart) { + count++; + } + return count; + } +} diff --git a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/power/adjustable_power_converter.json b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/power/adjustable_power_converter.json new file mode 100644 index 0000000..8196378 --- /dev/null +++ b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/power/adjustable_power_converter.json @@ -0,0 +1,15 @@ +{ + "name": "可调式能量转换器", + "category": "anvilcraft:power_system", + "icon": "anvilcraft_pigsplus:adjustable_power_converter", + "sortnum": 22100, + "entry_color": "DD6666", + "pages": [ + "$(li)可以按1kW ⇔ 80FE/t 转换能量(可用config调整) $(li)可自选转换方向，瞬时转换量", + { + "type": "patchouli:crafting", + "recipe": "anvilcraft_pigsplus:adjustable_power_converter", + "text": "常规最大转换量8192kW $(br)电网范围：以自己为中心5x5x5 $(li)拥有128MFE容量" + } + ] +} diff --git a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/power/enchanted_generator.json b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/power/enchanted_generator.json index eafbeb1..61406de 100644 --- a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/power/enchanted_generator.json +++ b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/power/enchanted_generator.json @@ -2,13 +2,12 @@ "name": "附魔发电机", "category": "anvilcraft:power_system", "icon": "anvilcraft_pigsplus:enchanted_generator", - "sortnum": 22100, + "sortnum": 22101, "entry_color": "DD6666", "pages": [ "本章节将会讲述：如何借助$(item)附魔书$()与$(item)雕纹书架$()发电", { "type": "patchouli:crafting", - "anchor": "enchanted_generator", "recipe": "anvilcraft_pigsplus:enchanted_generator", "text": "常规最大发电量1024kW $(br)工作范围：以自己为中心3x3x3 $(li)可以识别工作范围内的，雕纹书架上的附魔书 $(li)每级附魔提供2kW能量" }, diff --git a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json index c237a99..ac7fd8b 100644 --- a/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json +++ b/src/main/resources/assets/anvilcraft/patchouli_books/guide/en_us/entries/smithing/pigs_materials.json @@ -8,16 +8,19 @@ "在此介绍由$(thing)铁砧工艺：猪+$()提供的材料", { "type": "patchouli:crafting", - "anchor": "karakuri_component", "recipe": "anvilcraft_pigsplus:karakuri_component", "text": "机巧部件具有优秀的红石传导能力与结构强度，被广泛用于智能生产设备中$()" }, { "type": "patchouli:spotlight", - "anchor": "spiritual_component", "item": "anvilcraft_pigsplus:spiritual_component", "link_recipe": true, "text": "携带$(thing)附魔$()的$(item)机巧部件$()被摧毁时，每条附魔提供20%%的概率，生成最多一个$(item)灵媒部件$() $(p)$(#888888)机魂大悦$()" + }, + { + "type": "anvilcraft:time_warp", + "recipe": "anvilcraft:time_warp/ender_component", + "text": "只有20%%成功合成率 $(p)蕴涵传送之力" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json index 59aa4e3..93d10d2 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/blockstates/adjustable_power_converter.json @@ -1,7 +1,7 @@ { "variants": { "": { - "model": "anvilcraft_pigsplus:block/adjustable_power_converter" + "model": "anvilcraft_pigsplus:block/adjustable_power_converter_frame" } } } \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json index 8c236be..1277039 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/lang/zh_cn.json @@ -52,6 +52,7 @@ "config.jade.plugin_anvilcraft_pigsplus.electric_enchanting_table": "电力附魔台", "config.jade.plugin_anvilcraft_pigsplus.enchanted_generator": "附魔发电机", "item.anvilcraft_pigsplus.chaotic_raw_ore": "混沌粗矿", + "item.anvilcraft_pigsplus.ender_component": "末影部件", "item.anvilcraft_pigsplus.karakuri_component": "机巧部件", "item.anvilcraft_pigsplus.spiritual_component": "灵媒部件", "itemGroup.anvilcraft_pigsplus.addon_items": "铁砧工艺：猪+", diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json index 12eaec3..6e869a8 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter.json @@ -1,4 +1,5 @@ { + "format_version": "1.9.0", "credit": "Made with Blockbench", "parent": "minecraft:block/cube", "render_type": "minecraft:cutout", @@ -21,16 +22,42 @@ } }, { - "from": [0.01, 15.99, 0.01], - "to": [15.99, 0.01, 15.99], + "from": [3, 3, 16], + "to": [13, 13, 0], "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, - "east": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, - "south": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, - "west": {"uv": [0, 0, 15.98, 16], "texture": "#0"}, - "up": {"uv": [0, 0, 15.98, 15.98], "texture": "#0"}, - "down": {"uv": [0, 0, 15.98, 15.98], "texture": "#0"} + "north": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "east": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "west": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "up": {"uv": [3, 0, 13, 16], "texture": "#0"}, + "down": {"uv": [3, 0, 13, 16], "texture": "#0"} + } + }, + { + "from": [16, 3, 3], + "to": [0, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "east": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "south": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "up": {"uv": [3, 0, 13, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 0, 13, 16], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [3, 16, 3], + "to": [13, 0, 13], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 3, 16, 13], "rotation": 270, "texture": "#0"}, + "east": {"uv": [3, 0, 13, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 3, 16, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [3, 0, 13, 16], "texture": "#0"}, + "up": {"uv": [3, 3, 13, 13], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 90, "texture": "#0"} } }, { diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter_core.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter_core.json new file mode 100644 index 0000000..fd44f2d --- /dev/null +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter_core.json @@ -0,0 +1,23 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "textures": { + "1": "anvilcraft_pigsplus:block/adjustable_power_converter_core", + "particle": "anvilcraft_pigsplus:block/adjustable_power_converter_core" + }, + "elements": [ + { + "from": [-4, -4, -4], + "to": [4, 4, 4], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#1"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter_frame.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter_frame.json new file mode 100644 index 0000000..0bdda00 --- /dev/null +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/adjustable_power_converter_frame.json @@ -0,0 +1,63 @@ +{ + "format_version": "1.9.0", + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "render_type": "minecraft:cutout", + "textures": { + "0": "anvilcraft_pigsplus:block/adjustable_power_converter_frame", + "particle": "anvilcraft_pigsplus:block/adjustable_power_converter_frame" + }, + "elements": [ + { + "from": [3, 16, 3], + "to": [13, 0, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 3, 16, 13], "rotation": 270, "texture": "#0"}, + "east": {"uv": [3, 0, 13, 16], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 3, 16, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [3, 0, 13, 16], "texture": "#0"}, + "up": {"uv": [3, 3, 13, 13], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 3, 13, 13], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + }, + { + "from": [3, 3, 16], + "to": [13, 13, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "east": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "south": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "west": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "up": {"uv": [3, 0, 13, 16], "texture": "#0"}, + "down": {"uv": [3, 0, 13, 16], "texture": "#0"} + } + }, + { + "from": [16, 3, 3], + "to": [0, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "east": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "south": {"uv": [0, 3, 16, 13], "texture": "#0"}, + "west": {"uv": [3, 3, 13, 13], "texture": "#0"}, + "up": {"uv": [3, 0, 13, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 0, 13, 16], "rotation": 270, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json index 96a00eb..4e88408 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table.json @@ -173,16 +173,16 @@ } }, { - "from": [5, 7, 5], - "to": [11, 13, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 7, 5]}, + "from": [4, 7, 4], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "up": {"uv": [6, 0, 12, 6], "texture": "#3"}, - "down": {"uv": [6, 6, 12, 12], "texture": "#3"} + "north": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#3"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#3"} } } ], diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json index 5484ff2..275914c 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/auto_royal_smithing_table_overload.json @@ -173,16 +173,16 @@ } }, { - "from": [5, 7, 5], - "to": [11, 13, 11], - "rotation": {"angle": 0, "axis": "y", "origin": [5, 7, 5]}, + "from": [4, 7, 4], + "to": [12, 15, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 11, 8]}, "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#3"}, - "up": {"uv": [6, 0, 12, 6], "texture": "#3"}, - "down": {"uv": [6, 6, 12, 12], "texture": "#3"} + "north": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#3"}, + "up": {"uv": [8, 0, 16, 8], "texture": "#3"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#3"} } } ], diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/chain_smithing_table.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/chain_smithing_table.json index 544effc..2287c25 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/chain_smithing_table.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/chain_smithing_table.json @@ -1,12 +1,12 @@ { - "credit": "Made by XeKr with Blockbench", + "credit": "Made with Blockbench", "parent": "minecraft:block/cube", "textures": { - "down": "anvilcraft:block/royal_smithing_table_bottom", - "particle": "anvilcraft:block/royal_smithing_table_front", - "south": "anvilcraft:block/royal_smithing_table_front", + "down": "anvilcraft_pigsplus:block/chain_smithing_table_bottom", + "particle": "anvilcraft_pigsplus:block/chain_smithing_table_front", + "south": "anvilcraft_pigsplus:block/chain_smithing_table_front", "up": "anvilcraft_pigsplus:block/chain_smithing_table_top", - "west": "anvilcraft:block/royal_smithing_table_side" + "west": "anvilcraft_pigsplus:block/chain_smithing_table_side" }, "elements": [ { diff --git a/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json b/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json index 036eacd..b5578a8 100644 --- a/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json +++ b/src/main/resources/assets/anvilcraft_pigsplus/models/block/enchanted_generator.json @@ -378,32 +378,37 @@ ], "display": { "thirdperson_righthand": { - "rotation": [26, 0, 0], - "scale": [0.4, 0.4, 0.4] + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] }, "thirdperson_lefthand": { - "rotation": [26, 0, 0], - "scale": [0.4, 0.4, 0.4] + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] }, "firstperson_righthand": { - "translation": [0, 0, -0.75], + "rotation": [0, 45, 0], "scale": [0.4, 0.4, 0.4] }, "firstperson_lefthand": { - "translation": [0, 0, -0.75], + "rotation": [0, -135, 0], "scale": [0.4, 0.4, 0.4] }, "ground": { - "translation": [0, -0.25, 0], - "scale": [0.4, 0.4, 0.4] + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, -135, 0], + "scale": [0.625, 0.625, 0.625] }, "head": { "translation": [0, 12.75, 0], "scale": [0.8, 0.8, 0.8] }, "fixed": { - "translation": [0, 0, 0.5], - "scale": [0.6, 0.6, 0.6] + "scale": [0.5, 0.5, 0.5] } }, "groups": [ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_frame.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_frame.png index 99dbc81..cd2fd33 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_frame.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/adjustable_power_converter_frame.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png index f133303..94842a7 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/auto_royal_smithing_table_core.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_front.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_front.png new file mode 100644 index 0000000..a4a092a Binary files /dev/null and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_front.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_side.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_side.png new file mode 100644 index 0000000..8310d85 Binary files /dev/null and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_side.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_top.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_top.png index dcfb5b7..ff96b47 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_top.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/block/chain_smithing_table_top.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/item/ender_component.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/item/ender_component.png new file mode 100644 index 0000000..23343d2 Binary files /dev/null and b/src/main/resources/assets/anvilcraft_pigsplus/textures/item/ender_component.png differ diff --git a/src/main/resources/assets/anvilcraft_pigsplus/textures/item/spiritual_component.png b/src/main/resources/assets/anvilcraft_pigsplus/textures/item/spiritual_component.png index 321e119..8548dca 100644 Binary files a/src/main/resources/assets/anvilcraft_pigsplus/textures/item/spiritual_component.png and b/src/main/resources/assets/anvilcraft_pigsplus/textures/item/spiritual_component.png differ