Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implementation of Module singularities #1685

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ indent_style = space
indent_size = 2
indent_style = space

[common/**.java]
indent_size = 4
indent_style = tab
ij_java_imports_layout = java.**,javax.**,|,net.minecraft.**,|,net.minecraftforge.**,|,*,|,logisticspipes.**,network.rs485.**

[src/**.java]
indent_size = 4
indent_style = space
Expand Down
58 changes: 58 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# A deployment template that works out of the box
# It supports these objectives:
# - Deploy to Maven (Build Job) [Secrets: MAVEN_USER, MAVEN_PASS]
# - Deploy to CurseForge (Upload Job) [Secrets: CURSEFORGE_TOKEN]
# - Deploy to Modrinth (Upload Job) [Secrets: MODRINTH_TOKEN]

name: Deploy

on:
push:
tags:
- '[0-9]+.[0-9]+'
- '[0-9]+.[0-9]+.[0-9]+'

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Grant Execute Permission for gradlew
run: chmod +x gradlew

- name: Read gradle.properties
uses: BrycensRanch/read-properties-action@v1
id: properties
with:
file: gradle.properties
all: true

- name: Setup Java
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'zulu'
cache: gradle

- name: Publish to Maven
if: steps.properties.outputs.publish_to_maven == 'true' && steps.properties.outputs.publish_to_local_maven == 'true'
uses: gradle/gradle-build-action@v2
with:
arguments: |
publish
-P${{ steps.properties.outputs.maven_name }}Username=${{ secrets.MAVEN_USER }}
-P${{ steps.properties.outputs.maven_name }}Password=${{ secrets.MAVEN_PASS }}

- name: Publish to CurseForge
if: steps.properties.outputs.publish_to_curseforge == 'true'
uses: gradle/gradle-build-action@v2
with:
arguments: curseforge

- name: Publish to Modrinth
if: steps.properties.outputs.publish_to_modrinth == 'true'
uses: gradle/gradle-build-action@v2
with:
arguments: modrinth
128 changes: 16 additions & 112 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,118 +1,22 @@
# IDEA project output path
/classes
/logs

# IDEA run configurations
.idea/runConfigurations

# Created by https://www.gitignore.io/api/java,gradle,kotlin,forgegradle,intellij+iml
# Edit at https://www.gitignore.io/?templates=java,gradle,kotlin,forgegradle,intellij+iml

### ForgeGradle ###
# Minecraft client/server files
run/*
run-server/*
run-server-test/*
!run/.gitkeep
!run-server/.gitkeep

### Intellij+iml ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
.idea/**/vcs.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
.idea/compiler.xml
.idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr
# eclipse
bin
*.launch
.settings
.metadata
.classpath
.project

# File-based project format
# idea
out
*.ipr
*.iws

# IntelliJ
out/

### Intellij+iml Patch ###
# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

*.iml
modules.xml
.idea/misc.xml
*.ipr

### Java ###
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt
.idea

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

### Gradle ###
# gradle
build
.gradle
**/build/
!src/**/build/

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

# Avoid ignore Gradle wrappper properties
!gradle-wrapper.properties

# Cache of project
.gradletasknamecache

# Eclipse Gradle plugin generated files
# Eclipse Core
.project
# JDT-specific (Eclipse Java Development Tools)
.classpath

### Gradle Patch ###
# Java heap dump
*.hprof

# End of https://www.gitignore.io/api/java,gradle,kotlin,forgegradle,intellij+iml
# other
eclipse
run
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Changelog

## [1.0] - 2023-09-15

### Added
- This is a default template changelog that follows the [KeepAChangelog Convention](https://keepachangelog.com/en/1.1.0/)
25 changes: 10 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,27 @@
# LogisticsPipes

[![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.rs485.network%2Fview%2Fall%2Fjob%2FLogisticsPipes-0.10-mc112)](https://ci.rs485.network/)
[//]: # ([![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.rs485.network%2Fview%2Fall%2Fjob%2FLogisticsPipes-0.10-mc112)](https://ci.rs485.network/))
![Lines of Code](https://tokei.rs/b1/github/RS485/LogisticsPipes?category=code)

Logistics Pipes is an extensive overhaul of the Buildcraft pipe system. It allows for better distribution of items via pipes, more organised stockkeeping and easier automated crafting.

Go to the [CurseForge Page](https://www.curseforge.com/minecraft/mc-mods/logistics-pipes) for more information and recent downloads.
We advise anyone who is not a developer to go there.
Please check out the original mod [CurseForge Page](https://www.curseforge.com/minecraft/mc-mods/logistics-pipes) for more information.

You are free to use this mod in your modpack without asking or noticing us.
This repo is not maintain by same author, please refrain from report issue to them. If the issue comes from the original mod, I ~~and other~~ will try cooperative and fix it if possible.

If you want to understand the sheer amount of changes we have made to the source, you can use [Gource](http://gource.io/)

Credits for the code goes to all [contributors](https://github.com/RS485/LogisticsPipes/contributors).
Credits to the original author and to all [contributors](https://github.com/RS485/LogisticsPipes/contributors).
Credits for the idea and basic code goes to Krapht.

## Translate

[//]: # (TODO change it to own repo if possible)
See [this repo](https://github.com/RS485/LogisticsPipes-Language) for translations.

## Builds

See our [Jenkins](https://ci.rs485.network/).

Our jar certificate fingerprint is `e0c86912b2f7cc0cc646ad57799574aea43dbd45`.

Our GPG key id is `C4E5 0DBF CE49 AC33 E052 B591 2669 A04F D19F 2F7A` and we sign our jars with the subkey `386B 2790 B001 3BF8 1ED2 2D81 0119 F8E9 56C4 E048`.

## Contact
Artifacts build using Github Action, which can be found from [here](https://github.com/JP-HellParadise/LogisticsPipes/actions)

Get in touch with us on [Matrix](https://matrix.to/#/#lp:rs485.network) or the [RS485 Discord](https://discord.gg/6vPP3A8)
[//]: # (## Contact)
[//]: # (TODO add new way for support)
[//]: # ()
[//]: # (Get in touch with us on [Matrix](https://matrix.to/#/#lp:rs485.network) or the [RS485 Discord](https://discord.gg/6vPP3A8))
Loading