Team-EnderIO/EnderIO
1
0
Fork 0
Code Issues 114 Pull requests 13 Projects Releases 79 Packages Wiki Activity Actions

Remove Simple Machines and Rework Capacitors #72

Merged
Rover656 merged 27 commits from bye-simple-machines into dev/1.19.x 2022-08-29 00:17:03 +00:00
Conversation 3 Commits 27 Files changed 252 +1173 -3747
Rover656 commented 2022-07-31 22:39:47 +00:00 (Migrated from github.com)
Copy link

Description

Applies the changes discussed in our meeting. Removes simple and enhanced machinery and reworks capacitors to be significantly simpler under the hood.
Also implements the primitive alloy smelter, a coal powered alloy smelter for starting the mod off.

Todo

  • Capacitor tooltips
  • Loot capacitor modifier tooltips
  • General tidying
  • Clean up the progress widget.
  • Clean up the primitive alloy smelter.
  • Decide primitive alloy smelter recipe
  • Texture/Model primitive alloy smelter. (Furnace with old simple alloy smelter front for now)
  • Rename/re-add machine chassis and parts.
  • Fix machine particles

Checklist:

  • My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you)
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
# Description Applies the changes discussed in our meeting. Removes simple and enhanced machinery and reworks capacitors to be significantly simpler under the hood. Also implements the primitive alloy smelter, a coal powered alloy smelter for starting the mod off. # Todo <!-- Remove this section if you're submitting an already-complete PR --> - [x] Capacitor tooltips - [x] Loot capacitor modifier tooltips - [x] General tidying - [x] Clean up the progress widget. - [x] Clean up the primitive alloy smelter. - [x] Decide primitive alloy smelter recipe - [x] Texture/Model primitive alloy smelter. (Furnace with old simple alloy smelter front for now) - [ ] Rename/re-add machine chassis and parts. - [x] Fix machine particles # Checklist: - [x] My code follows the style guidelines of this project (.editorconfig, most IDEs will use this for you) - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [x] I have made corresponding changes to the documentation <!-- Thanks to: https://embeddedartistry.com/blog/2017/08/04/a-github-pull-request-template-for-your-projects/ for the building blocks of this template -->
justliliandev (Migrated from github.com) reviewed 2022-08-03 12:08:47 +00:00
src/api/java/com/enderio/api/capacitor/ScalableValue.java
justliliandev (Migrated from github.com) commented 2022-08-03 10:33:19 +00:00
Copy link

turn to javadoc

turn to javadoc
src/main/java/com/enderio/base/common/capacitor/LootCapacitorData.java
justliliandev (Migrated from github.com) commented 2022-08-03 12:07:48 +00:00
Copy link

use Map#getOrDefault

use Map#getOrDefault
src/main/java/com/enderio/base/data/recipe/BlockRecipes.java
justliliandev (Migrated from github.com) commented 2022-08-03 11:32:52 +00:00
Copy link

remove completly

remove completly
src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java
justliliandev (Migrated from github.com) commented 2022-08-03 11:32:24 +00:00
Copy link

remove completly

remove completly
Rover656 (Migrated from github.com) reviewed 2022-08-03 13:17:24 +00:00
src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java
Rover656 (Migrated from github.com) commented 2022-08-03 13:17:24 +00:00
Copy link

I was thinking of leaving all of these recipes in while we properly decide what frames stay and go. It'll be dealt with before merge though :)

I was thinking of leaving all of these recipes in while we properly decide what frames stay and go. It'll be dealt with before merge though :)
justliliandev (Migrated from github.com) reviewed 2022-08-16 16:01:41 +00:00
src/main/java/com/enderio/base/common/item/capacitors/LootCapacitorItem.java
@ -25,7 +32,15 @@ public class LootCapacitorItem extends Item implements IMultiCapabilityItem {
@Override
justliliandev (Migrated from github.com) commented 2022-08-16 15:59:53 +00:00
Copy link

I have the feeling, that this might cause this:
can you check that pls?
https://github.com/MinecraftForge/MinecraftForge/issues/3521
https://bugs.mojang.com/browse/MC-2595
https://github.com/SlimeKnights/TinkersConstruct/issues/2608

I have the feeling, that this might cause this: can you check that pls? https://github.com/MinecraftForge/MinecraftForge/issues/3521 https://bugs.mojang.com/browse/MC-2595 https://github.com/SlimeKnights/TinkersConstruct/issues/2608
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Area-Assets

   
Area-Backend

Backend work not usually visible to players.

  
Area-Conduits

Everything involving conduits

  
Area-Datapacks

   
Area-Lang

   
Area-Mod Compat

   
Area-Parity

1.12.2 missing features

  
Area-Rendering

Rendering code, might be shaders specific or general.

  
Good first issue

   
MC-1.19.2

   
MC-1.20.1

   
MC-1.20.4

   
MC-1.20.6

   
MC-1.21

   
MC-1.21.1

   
Modtoberfest

   
P-0-High

High priority, crash/breaking.

  
P-1-Medium

Medium priority. Potentially deleting items or breaking functionality.

  
P-2-Low

Low priority. Not hurting anyone, just annoying.

  
Status-Awaiting Response

Waiting for OP to respond

  
Status-Behind-Flag

This change is available but is placed behind a feature flag.

  
Status-Blocked

Blocked by a specific issue or protocol.

  
Status-Cannot Reproduce

   
Status-Duplicate

This issue or pull request already exists

  
Status-Help Wanted

We need some help to try and track this thing down..

  
Status-Incomplete Report

   
Status-Invalid

This doesn't seem right

  
Status-Needs LTS Backport

Fixed in latest but requires LTS backport.

  
Status-Needs Updating

Needs updating to a newer Minecraft version.

  
Status-Stale

This may not be updated by the OP any further.

  
Status-To Implement

   
Status-Triage

A Triage Member should take a look at this

  
Status-Wontfix

This will not be worked on

  
Status-Wontmerge

This PR won't be merged, but is left now for reference of ongoing or future works.

  
Type-Backport

   
Type-Bug

There is a problem.

  
Type-Documentation

Improvements or additions to documentation

  
Type-Enhancement

New feature or enhancement to existing feature.

  
Type-Question

Further information is requested

  
Type-RFC

Request for comments.

  
Type-Suggestion
No labels
Area-Assets
Area-Backend
Area-Conduits
Area-Datapacks
Area-Lang
Area-Mod Compat
Area-Parity
Area-Rendering
Good first issue
MC-1.19.2
MC-1.20.1
MC-1.20.4
MC-1.20.6
MC-1.21
MC-1.21.1
Modtoberfest
P-0-High
P-1-Medium
P-2-Low
Status-Awaiting Response
Status-Behind-Flag
Status-Blocked
Status-Cannot Reproduce
Status-Duplicate
Status-Help Wanted
Status-Incomplete Report
Status-Invalid
Status-Needs LTS Backport
Status-Needs Updating
Status-Stale
Status-To Implement
Status-Triage
Status-Wontfix
Status-Wontmerge
Type-Backport
Type-Bug
Type-Documentation
Type-Enhancement
Type-Question
Type-RFC
Type-Suggestion
Milestone
Clear milestone
No items
No milestone
First Alpha Release (v6.0)
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Team-EnderIO/EnderIO#72
No description provided.
Delete branch "bye-simple-machines"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?