minecraft
/
PhysicalConnectivity
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Compare commits

base: minecraft:815a9ab8afb664c8e5054f40765a8625393cffa2
Branches Tags
minecraft:main
minecraft:future
minecraft:cacao
minecraft:v0.2.0
minecraft:v0.1.0
..
compare: minecraft:81005326787d0a98eb7fe8228dad2fd24e721f8d
Branches Tags
minecraft:future
minecraft:main
minecraft:cacao
minecraft:v0.2.0
minecraft:v0.1.0

No commits in common. "815a9ab8afb664c8e5054f40765a8625393cffa2" and "81005326787d0a98eb7fe8228dad2fd24e721f8d" have entirely different histories.
815a9ab8af ... 8100532678

20 changed files with 9 additions and 316 deletions
Show Stats Expand all files Collapse all files

22
build.gradle
View File

@ -17,9 +17,12 @@ minecraft {
}
repositories {
maven { url "https://mod-buildcraft.com/maven" }
maven { url "http://server.bbkr.space:8081/artifactory/libs-release/" }
maven { url "https://maven.terraformersmc.com/releases" }
maven {
url = "https://mod-buildcraft.com/maven"
}
maven {
url = "http://server.bbkr.space:8081/artifactory/libs-release/"
}
jcenter()
}
@ -39,15 +42,10 @@ dependencies {
include "alexiil.mc.lib:libblockattributes-core:${project.libblockattributes_version}"
include "alexiil.mc.lib:libblockattributes-items:${project.libblockattributes_version}"
compile project(":kiwi-java")
modImplementation "io.github.cottonmc:cotton-resources:${project.cotton_resources_version}"
shadow project(":kiwi-java")
runtimeOnly project(":plugin:rei")
include project(":plugin:rei")
modRuntime "io.github.cottonmc:cotton-resources:${project.cotton_resources_version}"
modRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
testImplementation "org.junit.jupiter:junit-jupiter:${project.junit_version}"
}
@ -66,10 +64,6 @@ tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
compileKotlin {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8
}
java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.

1
gradle.properties
View File

@ -14,6 +14,5 @@ fabric_kotlin_version=1.4.30+build.2
libblockattributes_version=0.8.5
cotton_resources_version=1.7.4
modmenu_version=1.16.8
junit_version = 5.4.0

66
plugin/rei/build.gradle
View File

@ -1,66 +0,0 @@
plugins {
id "fabric-loom"
id "org.jetbrains.kotlin.jvm"
}
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group
minecraft {
log4jConfigs.from "PhyConDebugLogging.xml"
}
repositories {
maven {
url = "https://maven.shedaniel.me/"
}
jcenter()
}
dependencies {
//to change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
implementation project(":")
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${project.rei_version}"
modRuntime "me.shedaniel:RoughlyEnoughItems:${project.rei_version}"
}
processResources {
inputs.property "version", project.version
filesMatching("fabric.mod.json") {
expand "version": project.version
}
}
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
}
jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}" }
}
}

3
plugin/rei/gradle.properties
View File

@ -1,3 +0,0 @@
archives_base_name=PhyCon-Plugin-REI
rei_version=5.10.184

27
plugin/rei/src/main/kotlin/net/shadowfacts/phycon/plugin/rei/PhyConPlugin.kt
View File

@ -1,27 +0,0 @@
package net.shadowfacts.phycon.plugin.rei
import me.shedaniel.math.Rectangle
import me.shedaniel.rei.api.BaseBoundsHandler
import me.shedaniel.rei.api.DisplayHelper
import me.shedaniel.rei.api.plugins.REIPluginV0
import net.minecraft.client.MinecraftClient
import net.minecraft.util.Identifier
import net.shadowfacts.phycon.block.terminal.TerminalScreen
/**
* @author shadowfacts
*/
object PhyConPlugin: REIPluginV0 {
const val MODID = "phycon_rei"
override fun getPluginIdentifier() = Identifier(MODID, "rei_plugin")
override fun registerBounds(helper: DisplayHelper) {
BaseBoundsHandler.getInstance().registerExclusionZones(TerminalScreen::class.java) {
val screen = MinecraftClient.getInstance().currentScreen as TerminalScreen
listOf(
Rectangle(screen.sortButtonX, screen.sortButtonY, 20, 20)
)
}
}
}

32
plugin/rei/src/main/resources/fabric.mod.json
View File

@ -1,32 +0,0 @@
{
"schemaVersion": 1,
"id": "phycon_rei",
"version": "${version}",
"name": "PhyCon REI Integration",
"description": "",
"authors": [
"Shadowfacts"
],
"contact": {
"homepage": "https://git.shadowfacts.net/minecraft/PhysicalConnectivity"
},
"license": "LGPL-3.0",
"environment": "client",
"entrypoints": {
"rei_plugins": [
{
"adapter": "kotlin",
"value": "net.shadowfacts.phycon.plugin.rei.PhyConPlugin"
}
]
},
"mixins": [
],
"depends": {
"fabricloader": ">=0.4.0",
"fabric": "*",
"fabric-language-kotlin": ">=1.3.50",
"phycon": "*"
}
}

1
settings.gradle
View File

@ -10,4 +10,3 @@ pluginManagement {
}
include("kiwi-java")
include("plugin:rei")

8
src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreen.kt
View File

@ -43,10 +43,6 @@ class TerminalScreen(handler: TerminalScreenHandler, playerInv: PlayerInventory,
private lateinit var searchBox: TextFieldWidget
private lateinit var sortButton: SortButton
var sortButtonX: Int = 0
private set
var sortButtonY = 0
private set
private lateinit var amountBox: TextFieldWidget
private var dialogStack = ItemStack.EMPTY
private var showingAmountDialog = false
@ -99,9 +95,7 @@ class TerminalScreen(handler: TerminalScreenHandler, playerInv: PlayerInventory,
searchBox.setEditableColor(0xffffff)
addChild(searchBox)
sortButtonX = x + 256
sortButtonY = y
sortButton = SortButton(sortButtonX, sortButtonY, handler.sortMode, {
sortButton = SortButton(x + 256, y + 0, handler.sortMode, {
requestUpdatedItems()
}, ::renderTooltip)
addButton(sortButton)

4
src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
View File

@ -37,8 +37,6 @@ object PhyItems {
val SCREWDRIVER = ScrewdriverItem()
val CONSOLE = ConsoleItem()
val TWISTED_PAIR = Item(Item.Settings())
val SCREEN = Item(Item.Settings())
val SERIAL_CABLE = Item(Item.Settings())
fun init() {
register(InterfaceBlock.ID, INTERFACE)
@ -54,8 +52,6 @@ object PhyItems {
register(ScrewdriverItem.ID, SCREWDRIVER)
register(ConsoleItem.ID, CONSOLE)
register(Identifier(PhysicalConnectivity.MODID, "twisted_pair"), TWISTED_PAIR)
register(Identifier(PhysicalConnectivity.MODID, "screen"), SCREEN)
register(Identifier(PhysicalConnectivity.MODID, "serial_cable"), SERIAL_CABLE)
}
private fun register(id: Identifier, item: Item) {

2
src/main/resources/assets/phycon/lang/en_us.json
View File

@ -12,8 +12,6 @@
"item.phycon.screwdriver": "Screwdriver",
"item.phycon.console": "Console",
"item.phycon.twisted_pair": "Twisted Pair",
"item.phycon.screen": "Screen",
"item.phycon.serial_cable": "Serial Cable",
"gui.phycon.terminal_buffer": "Buffer",
"gui.phycon.console.details": "Device Details",

6
src/main/resources/assets/phycon/models/item/screen.json
View File

@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "phycon:item/screen"
}
}

6
src/main/resources/assets/phycon/models/item/serial_cable.json
View File

@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "phycon:item/serial_cable"
}
}

BIN
src/main/resources/assets/phycon/textures/item/screen.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

BIN
src/main/resources/assets/phycon/textures/item/serial_cable.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 828 B

32
src/main/resources/data/phycon/advancements/recipes/console.json
View File

@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"phycon:console"
]
},
"criteria": {
"has_serial_cable": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "phycon:serial_cable"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:console"
}
}
},
"requirements": [
[
"has_serial_cable",
"has_the_recipe"
]
]
}

32
src/main/resources/data/phycon/advancements/recipes/screen.json
View File

@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"phycon:screen"
]
},
"criteria": {
"has_glowstone": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:glowstone_dust"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:screen"
}
}
},
"requirements": [
[
"has_glowstone",
"has_the_recipe"
]
]
}

35
src/main/resources/data/phycon/advancements/recipes/serial_cable.json
View File

@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"phycon:serial_cable"
]
},
"criteria": {
"has_redstone_and_gold": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:redstone"
},
{
"tag": "c:gold_ingots"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "phycon:serial_cable"
}
}
},
"requirements": [
[
"has_redstone_and_gold",
"has_the_recipe"
]
]
}

16
src/main/resources/data/phycon/recipes/console.json
View File

@ -1,16 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" I ",
"ISI",
" C "
],
"key": {
"I": {"tag": "c:iron_ingots"},
"S": {"item": "phycon:screen"},
"C": {"item": "phycon:serial_cable"}
},
"result": {
"item": "phycon:console"
}
}

16
src/main/resources/data/phycon/recipes/screen.json
View File

@ -1,16 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"GGG",
"ggg",
"RRR"
],
"key": {
"G": {"item": "minecraft:glass_pane"},
"g": {"item": "minecraft:glowstone_dust"},
"R": {"item": "minecraft:redstone"}
},
"result": {
"item": "phycon:screen"
}
}

16
src/main/resources/data/phycon/recipes/serial_cable.json
View File

@ -1,16 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" C ",
"CRC",
"GC "
],
"key": {
"C": {"item": "minecraft:blue_carpet"},
"R": {"item": "minecraft:redstone"},
"G": {"tag": "c:gold_ingots"}
},
"result": {
"item": "phycon:serial_cable"
}
}