Skip to content

Commit

Permalink
Added tutorial settings and changed default shops value
Browse files Browse the repository at this point in the history
+ Added Tutorial and tutorial settings
+ Changed shops file default values to include a more comprehensive set of values
+ Updated to 0.10.4
  • Loading branch information
noahbclarkson committed Nov 15, 2020
1 parent 20c3210 commit f6ca724
Show file tree
Hide file tree
Showing 8 changed files with 338 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Auto-Tune/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>unprotesting.com.github</groupId>
<artifactId>Auto-Tune</artifactId>
<name>Auto-Tune</name>
<version>0.10.3</version>
<version>0.10.4</version>
<description>The automatic pricing plugin for minecraft</description>
<url>https://github.com/Unprotesting/Auto-Tune</url>
<issueManagement>
Expand Down
2 changes: 1 addition & 1 deletion Auto-Tune/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<!-- Project information -->
<groupId>unprotesting.com.github</groupId>
<artifactId>Auto-Tune</artifactId>
<version>0.10.3</version>
<version>0.10.4</version>
<!-- Info -->
<name>Auto-Tune</name>
<url>https://github.com/Unprotesting/Auto-Tune</url>
Expand Down
14 changes: 11 additions & 3 deletions Auto-Tune/src/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ email: '[email protected]'
web-server-enabled: true

## Port for integrated Web Server (If enabled)
## Make sure to port-forward and disable firewalls for this port.
port: 8123

## The maximum length in data points that the trade-short.html will show (this doesn't affect data)
Expand Down Expand Up @@ -65,7 +66,7 @@ auto-sell-profit-update-period: 1200
Volatility-Algorithim: 'Variable'

## Percentage difference in sell price to buy price
sell-price-difference: 2.5
sell-price-difference: 5.0

## Maximum Volatility per Time Period for the Fixed Volatility price calculation algorithim in economy units
Fixed-Max-Volatility: 2.00
Expand All @@ -88,7 +89,7 @@ data-selection-m: 0.05
## 'z' in equation: y=m(x^z)+c
data-selection-z: 1.6
## 'c' in equation: y=m(x^z)+c
data-selection-c: 1.25
data-selection-c: 1.05

## -- Other Econonomy Settings --

Expand Down Expand Up @@ -145,4 +146,11 @@ checksum-header-bypass: false
economy-shop-config: 'default'

## Percentage value sell prices have on new price when converting GUIShop to Auto-Tune
shop-config-guishop-sell-value: 20.00
shop-config-guishop-sell-value: 20.00

## Enable the Auto-Tune tutorial for players
## Keep this on to encourage purchasing turn it off if its distracting
tutorial: true

## Time in seconds between messages
tutorial-message-period: 300
8 changes: 8 additions & 0 deletions Auto-Tune/src/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,28 @@ permssions:
description: Login to an Auto-Tune account |(active soon)|
at.shop:
description: Open the GUI shop
default: true
at.sell:
description: Open the sell GUI
default: true
at.autosell:
description: Open the Auto-Sell GUI and Auto-Sell
default: true
at.loan:
description: Loan money from the bank
default: true
at.increase:
description: Increase price of an item
at.decrease:
description: Decrease price of an item
at.gdp:
description: View GDP info
default: true
at.atconfig:
description: View and change plugin config settings
at.tutorial:
description: Allow players to view tutorial messages
default: true



Expand Down
250 changes: 246 additions & 4 deletions Auto-Tune/src/resources/shops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,252 @@
## Options: "locked: <boolean>" set the price to be locked or variable (variable by default).
## Options: "sell-difference: <double>" set a custom sell-price-difference (default set in config).

## Example:
## GRASS_BLOCK:
## price: 50.00
## locked: true <- Example of a locked item
## sell-difference: 0.0 <- Example of a set sell-difference item

shops:
COAL:
price: 8.00
COAL_ORE:
price: 30.00
IRON_INGOT:
price: 15.00
IRON_ORE:
price: 12.00
GOLD_INGOT:
price: 40.00
GOLD_ORE:
price: 30.00
DIAMOND:
price: 250.00
DIAMOND_ORE:
price: 600.00
LAPIS_LAZULI:
price: 8.00
LAPIS_ORE:
price: 60.00
EMERALD:
price: 100.00
EMERALD_ORE:
price: 270.00
QUARTZ:
price: 10.00
NETHER_QUARTZ_ORE:
price: 40.00
REDSTONE:
price: 4.00
REDSTONE_ORE:
price: 40.00
NETHERITE_INGOT:
price: 6500.00
NETHERITE_SCRAP:
price: 2000.00
GLOWSTONE_DUST:
price: 5.00
DIRT:
price: 1.00
GRASS_BLOCK:
price: 4.00
MYCELIUM:
price: 8.00
COBBLESTONE:
price: 1.00
STONE:
price: 2.00
GRANITE:
price: 0.80
DIORITE:
price: 0.80
ANDESITE:
price: 1.00
GRAVEL:
price: 3.00
SAND:
price: 1.00
SANDSTONE:
price: 4.00
GLASS:
price: 3.00
SNOWBALL:
price: 1.50
CLAY_BALL:
price: 2.50
ICE:
price: 5.50
PRISMARINE:
price: 9.00
PRISMARINE_BRICKS:
price: 10.00
DARK_PRISMARINE:
price: 12.50
OBSIDIAN:
price: 15.00
END_STONE:
price: 3.50
NETHERRACK:
price: 1.00
NETHER_BRICKS:
price: 8.00
BLACKSTONE:
price: 2.25
SOUL_SAND:
price: 4.00
WHITE_WOOL:
price: 6.50
OAK_LOG:
price: 8.00
SPRUCE_LOG:
price: 8.50
BIRCH_LOG:
price: 8.50
DARK_OAK_LOG:
price: 8.75
ACACIA_LOG:
price: 8.25
JUNGLE_LOG:
price: 8.25
CACTUS:
price: 3.00
VINE:
price: 2.00
CARROT:
price: 4.00
EGG:
price: 3.50
MELON_SLICE:
price: 1.75
APPLE:
price: 100.00 ## <- Example of a variable item
STICK:
price: 6.00
WHEAT:
price: 2.00
SUGAR_CANE:
price: 1.50
BEEF:
price: 2.50
PORKCHOP:
price: 2.25
CHICKEN:
price: 1.45
RABBIT:
price: 2.50
MUTTON:
price: 2.00
PUMPKIN:
price: 8.00
RED_MUSHROOM:
price: 6.00
BROWN_MUSHROOM:
price: 6.00
WHEAT_SEEDS:
price: 1.25
NETHER_WART:
price: 4.00
FLINT:
price: 4.00
GUNPOWDER:
price: 12.50
LEATHER:
price: 20.00
INK_SAC:
price: 2.50
FEATHER:
price: 4.00
BONE:
price: 6.00
BONE_MEAL:
price: 2.00
STRING:
price: 4.00
ROTTEN_FLESH:
price: 0.50
SPIDER_EYE:
price: 7.00
SLIME_BALL:
price: 25.00
ENDER_PEARL:
price: 35.00
NETHER_STAR:
price: 20000.00
GHAST_TEAR:
price: 125.00
MAGMA_CREAM:
price: 50.00
##locked: true <- Example of a locked item
##sell-difference: 0.0 <- Example of a set sell-difference item
BLAZE_ROD:
price: 45.00
ARROW:
price: 2.00
SADDLE:
price: 100.00
NAME_TAG:
price: 50.00
CHORUS_FRUIT:
price: 1.25
HONEY_BOTTLE:
price: 5.00
CHEST:
price: 20.00
MINECART:
price: 110.00
TORCH:
price: 4.0
NOTE_BLOCK:
price: 36.0
BUCKET:
price: 40.0
FURNACE:
price: 8.5
TNT:
price: 125.0
SPONGE:
price: 60.00
PHANTOM_MEMBRANE:
price: 45.00
OAK_LEAVES:
price: 1.0
BIRCH_LEAVES:
price: 1.0
SPRUCE_LEAVES:
price: 1.0
JUNGLE_LEAVES:
price: 1.0
DARK_OAK_LEAVES:
price: 1.0
ACACIA_LEAVES:
price: 1.0
OAK_PLANKS:
price: 0.5
BIRCH_PLANKS:
price: 0.5
SPRUCE_PLANKS:
price: 0.5
JUNGLE_PLANKS:
price: 0.5
DARK_OAK_PLANKS:
price: 0.5
ACACIA_PLANKS:
price: 0.5
OAK_SAPLING:
price: 2.5
BIRCH_SAPLING:
price: 2.5
SPRUCE_SAPLING:
price: 2.5
JUNGLE_SAPLING:
price: 2.5
DARK_OAK_SAPLING:
price: 2.5
ACACIA_SAPLING:
price: 2.5
DISPENSER:
price: 58.0
CAKE:
price: 180.0
MILK_BUCKET:
price: 60.00
STICK:
price: 0.25
BOOK:
price: 45.0
3 changes: 3 additions & 0 deletions Auto-Tune/src/unprotesting/com/github/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import unprotesting.com.github.util.MathHandler;
import unprotesting.com.github.util.StaticFileHandler;
import unprotesting.com.github.util.TextHandler;
import unprotesting.com.github.util.TutorialHandler;

public final class Main extends JavaPlugin implements Listener {

Expand Down Expand Up @@ -212,6 +213,7 @@ public void onEnable() {
if (vaildAPIKey) {
log("API-Key found in database. Continuing to load Auto-Tune on " + Config.getServerName());
}
TutorialHandler.loadMessages();
this.getCommand("at").setExecutor(new AutoTuneCommand());
this.getCommand("shop").setExecutor(new AutoTuneGUIShopUserCommand());
this.getCommand("sell").setExecutor(new AutoTuneSellCommand());
Expand All @@ -231,6 +233,7 @@ public void onEnable() {
scheduler.scheduleSyncRepeatingTask(this, new AutoTunePlayerAutoSellEventHandler(),
Config.getAutoSellProfitUpdatePeriod() + 20, Config.getAutoSellProfitUpdatePeriod());
}
scheduler.scheduleAsyncRepeatingTask(this, new TutorialHandler(), (Config.getTutorialMessagePeriod()*20), (Config.getTutorialMessagePeriod()*20));
scheduler.scheduleAsyncRepeatingTask(this, new LoanEventHandler(), Config.getIntrestRateUpdateRate(),
Config.getIntrestRateUpdateRate());
runnable();
Expand Down
Loading

0 comments on commit f6ca724

Please sign in to comment.