From a8dd8af2f8471a3d2d113bb74b4b3e721c7ac7bb Mon Sep 17 00:00:00 2001 From: Mikhail Oleynikov Date: Mon, 22 Jul 2019 13:38:21 +0300 Subject: [PATCH] Update to 1.14.4; semi-fix Energy Conduits --- build.gradle | 116 +++++++++--------- readme.md | 10 +- .../vivatech/block/AbstractMachineBlock.java | 2 +- .../vivatech/entity/EnergyConduitEntity.java | 3 +- .../java/vivatech/init/VivatechBlocks.java | 6 +- .../resources/assets/vivatech/lang/en_us.json | 24 ++-- .../resources/assets/vivatech/lang/ru_ru.json | 24 ++-- .../data/vivatech/oregen/config.json | 3 + ...ive.json => cobalt_gear_alternative.json1} | 0 src/main/resources/fabric.mod.json | 12 +- 10 files changed, 104 insertions(+), 96 deletions(-) create mode 100644 src/main/resources/data/vivatech/oregen/config.json rename src/main/resources/data/vivatech/recipes/{cobalt_gear_alternative.json => cobalt_gear_alternative.json1} (100%) diff --git a/build.gradle b/build.gradle index b3ed851..4172069 100644 --- a/build.gradle +++ b/build.gradle @@ -1,91 +1,87 @@ plugins { - id 'fabric-loom' version '0.2.4-SNAPSHOT' + id 'fabric-loom' version '0.2.4-SNAPSHOT' } sourceCompatibility = 1.8 targetCompatibility = 1.8 archivesBaseName = "vivatech" -version = "1.0.0-alpha.10" +version = "1.0.0-alpha.10+1.14.4" repositories { - jcenter() - maven { - name = "Fabric" - url = "http://maven.fabricmc.net" - } - maven { - name = "Cotton (Snapshot)" - url = "http://server.bbkr.space:8081/artifactory/libs-snapshot" - } - maven { - name = "Cotton" - url "http://server.bbkr.space:8081/artifactory/libs-release" - } - maven { - name = "BuildCraft" - url = "https://mod-buildcraft.com/maven" - } - maven { - name = "BuildCraft" - url = "https://minecraft.curseforge.com/api/maven" - } + jcenter() + maven { + name = "Fabric" + url = "http://maven.fabricmc.net" + } + maven { + name = "Cotton (Snapshot)" + url = "http://server.bbkr.space:8081/artifactory/libs-snapshot" + } + maven { + name = "Cotton" + url "http://server.bbkr.space:8081/artifactory/libs-release" + } + maven { + name = "BuildCraft" + url = "https://mod-buildcraft.com/maven" + } + maven { + name = "BuildCraft" + url = "https://minecraft.curseforge.com/api/maven" + } } dependencies { - minecraft "com.mojang:minecraft:1.14.3" - mappings "net.fabricmc:yarn:1.14.3+build.12" - modImplementation "net.fabricmc:fabric-loader:0.4.8+build.155" - modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.194" + minecraft "com.mojang:minecraft:1.14.4" + mappings "net.fabricmc:yarn:1.14.4+build.2" + modImplementation "net.fabricmc:fabric-loader:0.4.8+build.157" + modImplementation "net.fabricmc.fabric-api:fabric-api:0.3.0+build.200" - // javax.annotations.* - compileOnly "com.google.code.findbugs:jsr305:3.0.2" + // javax.annotations.* + compileOnly "com.google.code.findbugs:jsr305:3.0.2" - modApi "alexiil.mc.lib:libblockattributes-all:0.4.7" - modApi "io.github.cottonmc:LibGui:1.1.0" - modApi "io.github.cottonmc:Jankson:1.0.0-j1.1.2" - modApi "io.github.cottonmc.cotton:cotton-logging:1.0.0-rc.1" - modApi "io.github.cottonmc.cotton:cotton-config:1.0.0-rc.1" - modApi "io.github.cottonmc.cotton:cotton-datapack:1.0.0-rc.1" - modApi "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" - modApi "io.github.cottonmc:cotton-resources:1.2.2+1.14.2" + modApi "alexiil.mc.lib:libblockattributes-all:0.4.9" + modApi "io.github.cottonmc:LibGui:1.1.0" + modApi "io.github.cottonmc:Jankson:1.0.0-j1.1.2" + modApi "io.github.cottonmc.cotton:cotton-logging:1.0.0-rc.1" + modApi "io.github.cottonmc.cotton:cotton-config:1.0.0-rc.1" + modApi "io.github.cottonmc.cotton:cotton-datapack:1.0.0-rc.1" + modApi "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" + modApi "io.github.cottonmc:cotton-resources:1.3.3+1.14.3" - include "alexiil.mc.lib:libblockattributes-all:0.4.7" - include "io.github.cottonmc:LibGui:1.1.0" - include "io.github.cottonmc:Jankson:1.0.0-j1.1.2" - include "io.github.cottonmc.cotton:cotton-logging:1.0.0-rc.1" - include "io.github.cottonmc.cotton:cotton-config:1.0.0-rc.1" - include "io.github.cottonmc.cotton:cotton-datapack:1.0.0-rc.1" - include "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" - include "io.github.cottonmc:cotton-resources:1.2.2+1.14.2" + include "alexiil.mc.lib:libblockattributes-all:0.4.9" + include "io.github.cottonmc:LibGui:1.1.0" + include "io.github.cottonmc:cotton-energy:1.5.0+1.14.3-SNAPSHOT" + include "io.github.cottonmc:cotton-resources:1.3.3+1.14.3" - // Integration tests - modImplementation ("me.shedaniel:RoughlyEnoughItems:2.9.6+build.139") { transitive = false } - modImplementation ("io.github.prospector:modmenu:1.6.3+build.101") { transitive = false } + // Integration tests + modImplementation ("me.shedaniel:RoughlyEnoughItems:2.9.7+build.140") { transitive = false } +// modImplementation ("io.github.prospector:modmenu:1.6.3+build.101") { transitive = false } } processResources { - inputs.property "version", project.version + inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" - expand "version": project.version - } + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } } tasks.withType(JavaCompile) { - options.encoding = "UTF-8" + options.encoding = "UTF-8" } task sourcesJar(type: Jar, dependsOn: classes) { - classifier = "sources" - from sourceSets.main.allSource + classifier = "sources" + from sourceSets.main.allSource } jar { - from "LICENSE" + from "LICENSE" } diff --git a/readme.md b/readme.md index 38608fd..5281579 100644 --- a/readme.md +++ b/readme.md @@ -9,9 +9,9 @@ cool abilities in making armor, tools and in farming. ### Requirements * [Fabric API](https://github.com/FabricMC/fabric) -* [Cotton](https://github.com/CottonMC/cotton) -* [Cotton Energy](https://github.com/CottonMC/cotton-energy) -* [Cotton Resources](https://github.com/CottonMC/cotton-resources) +* [Cotton](https://github.com/CottonMC/Cotton) +* [Cotton Energy](https://github.com/CottonMC/CottonEnergy) +* [Cotton Resources](https://github.com/CottonMC/CottonResources) * [LibBlockAttributes](https://github.com/AlexIIL/LibBlockAttributes) ### Downloads @@ -21,6 +21,6 @@ cool abilities in making armor, tools and in farming. ### License -This project is licensed under MIT license. You should give a proper contact to the initial project. +This project is licensed under MIT license. You should give a proper credit to the initial project. -2019, [Vivatech](https://github.com/CottonMC/Vivatech) by [The Cotton Project](https://github.com/CottonMC) +2019, [Vivatech](https://github.com/CottonMC/Vivatech) by [Cotton](https://github.com/CottonMC) diff --git a/src/main/java/vivatech/block/AbstractMachineBlock.java b/src/main/java/vivatech/block/AbstractMachineBlock.java index d2c2927..bd72d0b 100644 --- a/src/main/java/vivatech/block/AbstractMachineBlock.java +++ b/src/main/java/vivatech/block/AbstractMachineBlock.java @@ -36,7 +36,7 @@ protected void appendProperties(StateFactory.Builder builder) @Override public BlockState getPlacementState(ItemPlacementContext context) { - return getDefaultState().with(FACING, context.getPlayerLookDirection().getOpposite()); + return getDefaultState().with(FACING, context.getPlayerFacing().getOpposite()); } @Override diff --git a/src/main/java/vivatech/entity/EnergyConduitEntity.java b/src/main/java/vivatech/entity/EnergyConduitEntity.java index 3eb4cbc..428eae8 100644 --- a/src/main/java/vivatech/entity/EnergyConduitEntity.java +++ b/src/main/java/vivatech/entity/EnergyConduitEntity.java @@ -5,13 +5,14 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Tickable; +import vivatech.Vivatech; import vivatech.init.VivatechEntities; import vivatech.util.EnergyHelper; public class EnergyConduitEntity extends BlockEntity implements Tickable { protected static final int TRANSFER_PER_TICK = 4; - protected SimpleEnergyAttribute energy = new SimpleEnergyAttribute(20); + protected SimpleEnergyAttribute energy = new SimpleEnergyAttribute(20, Vivatech.INFINITE_VOLTAGE); public EnergyConduitEntity() { super(VivatechEntities.ENERGY_CONDUIT); diff --git a/src/main/java/vivatech/init/VivatechBlocks.java b/src/main/java/vivatech/init/VivatechBlocks.java index 4bffa83..08d1a31 100644 --- a/src/main/java/vivatech/init/VivatechBlocks.java +++ b/src/main/java/vivatech/init/VivatechBlocks.java @@ -39,9 +39,9 @@ public class VivatechBlocks { COAL_GENERATOR = new CoalGeneratorBlock(); ENERGY_BANK = new EnergyBankBlock(); - ELECTRIC_FURNACE = TierHelper.fillTieredBlockArray(ElectricFurnaceBlock::new); - PRESS = TierHelper.fillTieredBlockArray(PressBlock::new); - CRUSHER = TierHelper.fillTieredBlockArray(CrusherBlock::new); + ELECTRIC_FURNACE = TierHelper.fillTieredBlockArray(ElectricFurnaceBlock::new); + PRESS = TierHelper.fillTieredBlockArray(PressBlock::new); + CRUSHER = TierHelper.fillTieredBlockArray(CrusherBlock::new); } public static void initialize() { diff --git a/src/main/resources/assets/vivatech/lang/en_us.json b/src/main/resources/assets/vivatech/lang/en_us.json index 6684b11..510a86c 100644 --- a/src/main/resources/assets/vivatech/lang/en_us.json +++ b/src/main/resources/assets/vivatech/lang/en_us.json @@ -1,28 +1,30 @@ { "itemGroup.vivatech.item_group": "Vivatech", - "block.vivatech.minimal_machine_chassis" : "Minimal Machine Chassis", + "block.vivatech.minimal_machine_chassis": "Minimal Machine Chassis", "block.vivatech.normal_machine_chassis": "Normal Machine Chassis", - "block.vivatech.advanced_machine_chassis" : "Advanced Machine Chassis", + "block.vivatech.advanced_machine_chassis": "Advanced Machine Chassis", "block.vivatech.coal_generator": "Coal Generator", "block.vivatech.crusher": "Crusher", "block.vivatech.electric_furnace": "Electric Furnace", - "block.vivatech.press": "Press", "block.vivatech.energy_bank": "Energy Bank", "block.vivatech.energy_conduit": "Energy Conduit", + "block.vivatech.press": "Press", - "item.vivatech.battery" : "Battery", + "item.vivatech.battery": "Battery", + "item.vivatech.screwdriver": "Screwdriver", - "gui.vivatech.crushing" : "Crushing", - "gui.vivatech.pressing" : "Pressing", + "gui.vivatech.cutting": "Cutting", + "gui.vivatech.crushing": "Crushing", + "gui.vivatech.pressing": "Pressing", "info.vivatech.energy": "%d J", + "info.vivatech.energy_cost": "Energy: %d J", "info.vivatech.energy_with_max": "%d/%d J", - "info.vivatech.energy_cost" : "Energy: %d J", - "info.vivatech.tier" : "Tier: %s", - "info.vivatech.tier.minimal" : "Minimal", - "info.vivatech.tier.normal" : "Normal", - "info.vivatech.tier.advanced" : "Advanced" + "info.vivatech.tier": "Tier: %s", + "info.vivatech.tier.minimal": "Minimal", + "info.vivatech.tier.normal": "Normal", + "info.vivatech.tier.advanced": "Advanced" } diff --git a/src/main/resources/assets/vivatech/lang/ru_ru.json b/src/main/resources/assets/vivatech/lang/ru_ru.json index 589beb5..5de809f 100644 --- a/src/main/resources/assets/vivatech/lang/ru_ru.json +++ b/src/main/resources/assets/vivatech/lang/ru_ru.json @@ -1,28 +1,30 @@ { "itemGroup.vivatech.item_group": "Vivatech", - "block.vivatech.minimal_machine_chassis" : "Минимальный Корпус Машины", + "block.vivatech.minimal_machine_chassis": "Минимальный Корпус Машины", "block.vivatech.normal_machine_chassis": "Обычный Корпус Машины", - "block.vivatech.advanced_machine_chassis" : "Продвинутый Корпус Машины", + "block.vivatech.advanced_machine_chassis": "Продвинутый Корпус Машины", "block.vivatech.coal_generator": "Угольный Генератор", "block.vivatech.crusher": "Дробитель", "block.vivatech.electric_furnace": "Электропечь", - "block.vivatech.press": "Пресс", "block.vivatech.energy_bank": "Энергохранилище", "block.vivatech.energy_conduit": "Труба для Энергии", + "block.vivatech.press": "Пресс", - "item.vivatech.battery" : "Батарея", + "item.vivatech.battery": "Батарея", + "item.vivatech.screwdriver": "Отвёртка", - "gui.vivatech.crushing" : "Дробление", - "gui.vivatech.pressing" : "Прессование", + "gui.vivatech.cutting": "Резка", + "gui.vivatech.crushing": "Дробление", + "gui.vivatech.pressing": "Прессование", "info.vivatech.energy": "%d Дж", - "info.vivatech.energy_with_max": "%d/%d Дж", "info.vivatech.energy_cost" : "Энергия: %d Дж", + "info.vivatech.energy_with_max": "%d/%d Дж", - "info.vivatech.tier" : "Уровень: %s", - "info.vivatech.tier.minimal" : "Минимальный", - "info.vivatech.tier.normal" : "Обычный", - "info.vivatech.tier.advanced" : "Продвинутый" + "info.vivatech.tier": "Уровень: %s", + "info.vivatech.tier.minimal": "Минимальный", + "info.vivatech.tier.normal": "Обычный", + "info.vivatech.tier.advanced": "Продвинутый" } diff --git a/src/main/resources/data/vivatech/oregen/config.json b/src/main/resources/data/vivatech/oregen/config.json new file mode 100644 index 0000000..8c5798e --- /dev/null +++ b/src/main/resources/data/vivatech/oregen/config.json @@ -0,0 +1,3 @@ +{ + "ores": [ "cobalt", "copper", "steel", "tungsten" ] +} \ No newline at end of file diff --git a/src/main/resources/data/vivatech/recipes/cobalt_gear_alternative.json b/src/main/resources/data/vivatech/recipes/cobalt_gear_alternative.json1 similarity index 100% rename from src/main/resources/data/vivatech/recipes/cobalt_gear_alternative.json rename to src/main/resources/data/vivatech/recipes/cobalt_gear_alternative.json1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 332ca0d..4f68d90 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Vivatech", "description": "Classic technologies rethought", - "authors": ["The Cotton Project"], + "authors": ["falseresync", "Cotton"], "contact": { "homepage": "https://curseforge.com/minecraft/mc-mods/vivatech", "issues": "https://github.com/CottonMC/Vivatech/issues" @@ -29,10 +29,14 @@ "depends": { "fabricloader": ">=0.4.0", "fabric": "*", - "cotton": "*", + "cotton-logging": "*", + "cotton-config": "*", + "cotton-datapack": "*", "cotton-energy": ">=1.4.0+1.14.2", - "cotton-resources": ">=1.2.0+1.14.2", - "libblockattributes": "*" + "cotton-resources": ">=1.3.2+1.14.3", + "libblockattributes-base": "*", + "libblockattributes-items": "*", + "libblockattributes-fluids": "*" } }